diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-07-25 17:42:36 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-07-25 17:43:12 +1000 |
| commit | 80d7df910987db5201402fe987124f29f09344f3 (patch) | |
| tree | 7e8c1e04ab40026087343efee95a771c7839b32f /src/system_fsm/system_fsm.cpp | |
| parent | 7b72e5479ee6d11f76c49f7463ba0e7f4e5165c5 (diff) | |
| download | tangara-fw-80d7df910987db5201402fe987124f29f09344f3.tar.gz | |
fuck off
Diffstat (limited to 'src/system_fsm/system_fsm.cpp')
| -rw-r--r-- | src/system_fsm/system_fsm.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/system_fsm/system_fsm.cpp b/src/system_fsm/system_fsm.cpp index 769d5e4a..c029c6bf 100644 --- a/src/system_fsm/system_fsm.cpp +++ b/src/system_fsm/system_fsm.cpp @@ -9,6 +9,7 @@ #include "event_queue.hpp" #include "relative_wheel.hpp" #include "system_events.hpp" +#include "tag_parser.hpp" #include "track_queue.hpp" namespace system_fsm { @@ -21,7 +22,9 @@ std::shared_ptr<drivers::RelativeWheel> SystemState::sRelativeTouch; std::shared_ptr<drivers::Battery> SystemState::sBattery; std::shared_ptr<drivers::SdStorage> SystemState::sStorage; std::shared_ptr<drivers::Display> SystemState::sDisplay; + std::shared_ptr<database::Database> SystemState::sDatabase; +std::shared_ptr<database::TagParserImpl> SystemState::sTagParser; std::shared_ptr<audio::TrackQueue> SystemState::sTrackQueue; @@ -37,14 +40,14 @@ void SystemState::react(const internal::GpioInterrupt& ev) { bool prev_key_up = sGpios->Get(drivers::Gpios::Pin::kKeyUp); bool prev_key_down = sGpios->Get(drivers::Gpios::Pin::kKeyDown); bool prev_key_lock = sGpios->Get(drivers::Gpios::Pin::kKeyLock); - bool prev_has_headphones = sGpios->Get(drivers::Gpios::Pin::kPhoneDetect); + bool prev_has_headphones = !sGpios->Get(drivers::Gpios::Pin::kPhoneDetect); sGpios->Read(); bool key_up = sGpios->Get(drivers::Gpios::Pin::kKeyUp); bool key_down = sGpios->Get(drivers::Gpios::Pin::kKeyDown); bool key_lock = sGpios->Get(drivers::Gpios::Pin::kKeyLock); - bool has_headphones = sGpios->Get(drivers::Gpios::Pin::kPhoneDetect); + bool has_headphones = !sGpios->Get(drivers::Gpios::Pin::kPhoneDetect); if (key_up != prev_key_up) { events::Dispatch<KeyUpChanged, audio::AudioState, ui::UiState>( |