diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-05-22 15:34:40 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-05-22 15:35:50 +1000 |
| commit | da977aaa3feb397c426563da8897d51ebeba8d1f (patch) | |
| tree | 3daf9278518b2cace7f26ec67e7eb486ba6adcf2 /src/ui/ui_fsm.cpp | |
| parent | a6ab1504058304012791281f9eb42c262745888f (diff) | |
| parent | 5ac4d3949cd7430e0d4c994bbc528e8e4fa91337 (diff) | |
| download | tangara-fw-da977aaa3feb397c426563da8897d51ebeba8d1f.tar.gz | |
Merge branch 'main' into state-machines
Diffstat (limited to 'src/ui/ui_fsm.cpp')
| -rw-r--r-- | src/ui/ui_fsm.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp index 8ca201e2..72d3f392 100644 --- a/src/ui/ui_fsm.cpp +++ b/src/ui/ui_fsm.cpp @@ -10,7 +10,6 @@ drivers::GpioExpander* UiState::sGpioExpander; std::weak_ptr<drivers::TouchWheel> UiState::sTouchWheel; std::weak_ptr<drivers::Display> UiState::sDisplay; std::weak_ptr<database::Database> UiState::sDatabase; -std::atomic<bool> UiState::sTaskQuit; auto UiState::Init(drivers::GpioExpander* gpio_expander, std::weak_ptr<drivers::TouchWheel> touchwheel, @@ -25,7 +24,7 @@ auto UiState::Init(drivers::GpioExpander* gpio_expander, namespace states { void PreBoot::react(const system_fsm::DisplayReady& ev) { - transit<Splash>([&]() { StartLvgl(sTouchWheel, sDisplay, &sTaskQuit); }); + transit<Splash>([&]() { StartLvgl(sTouchWheel, sDisplay); }); } void Splash::react(const system_fsm::BootComplete& ev) { |