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/include | |
| parent | a6ab1504058304012791281f9eb42c262745888f (diff) | |
| parent | 5ac4d3949cd7430e0d4c994bbc528e8e4fa91337 (diff) | |
| download | tangara-fw-da977aaa3feb397c426563da8897d51ebeba8d1f.tar.gz | |
Merge branch 'main' into state-machines
Diffstat (limited to 'src/ui/include')
| -rw-r--r-- | src/ui/include/lvgl_task.hpp | 3 | ||||
| -rw-r--r-- | src/ui/include/ui_fsm.hpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/ui/include/lvgl_task.hpp b/src/ui/include/lvgl_task.hpp index 32e01b7f..0d6e4cd3 100644 --- a/src/ui/include/lvgl_task.hpp +++ b/src/ui/include/lvgl_task.hpp @@ -13,7 +13,6 @@ namespace ui { auto StartLvgl(std::weak_ptr<drivers::TouchWheel> touch_wheel, - std::weak_ptr<drivers::Display> display, - std::atomic<bool>* quit) -> bool; + std::weak_ptr<drivers::Display> display) -> void; } // namespace ui diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp index 3c06b8a0..e902838e 100644 --- a/src/ui/include/ui_fsm.hpp +++ b/src/ui/include/ui_fsm.hpp @@ -35,7 +35,6 @@ class UiState : public tinyfsm::Fsm<UiState> { static std::weak_ptr<drivers::TouchWheel> sTouchWheel; static std::weak_ptr<drivers::Display> sDisplay; static std::weak_ptr<database::Database> sDatabase; - static std::atomic<bool> sTaskQuit; }; namespace states { |