diff options
| author | jacqueline <me@jacqueline.id.au> | 2023-06-01 15:28:32 +1000 |
|---|---|---|
| committer | jacqueline <me@jacqueline.id.au> | 2023-06-01 15:28:54 +1000 |
| commit | 6fd588e970470b15936187980829916d0dbe77bb (patch) | |
| tree | 1b1e73ef52bef2e41499ee5ceadc45efd408050b /src/ui/ui_fsm.cpp | |
| parent | db2e29a72d9b934e7b58f1d20ac3768eae484ab5 (diff) | |
| download | tangara-fw-6fd588e970470b15936187980829916d0dbe77bb.tar.gz | |
Add touchwheel -> encoder adapter
Diffstat (limited to 'src/ui/ui_fsm.cpp')
| -rw-r--r-- | src/ui/ui_fsm.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp index b08722aa..f12104e6 100644 --- a/src/ui/ui_fsm.cpp +++ b/src/ui/ui_fsm.cpp @@ -7,6 +7,7 @@ #include "ui_fsm.hpp" #include "display.hpp" #include "lvgl_task.hpp" +#include "relative_wheel.hpp" #include "screen.hpp" #include "screen_menu.hpp" #include "screen_splash.hpp" @@ -16,20 +17,17 @@ namespace ui { drivers::GpioExpander* UiState::sGpioExpander; -std::weak_ptr<drivers::TouchWheel> UiState::sTouchWheel; +std::weak_ptr<drivers::RelativeWheel> UiState::sTouchWheel; std::weak_ptr<drivers::Display> UiState::sDisplay; -std::weak_ptr<database::Database> UiState::sDatabase; std::shared_ptr<Screen> UiState::sCurrentScreen; auto UiState::Init(drivers::GpioExpander* gpio_expander, - std::weak_ptr<drivers::TouchWheel> touchwheel, - std::weak_ptr<drivers::Display> display, - std::weak_ptr<database::Database> database) -> void { + std::weak_ptr<drivers::RelativeWheel> touchwheel, + std::weak_ptr<drivers::Display> display) -> void { sGpioExpander = gpio_expander; sTouchWheel = touchwheel; sDisplay = display; - sDatabase = database; } namespace states { @@ -47,7 +45,7 @@ void Splash::react(const system_fsm::BootComplete& ev) { } void Interactive::entry() { - // sCurrentScreen.reset(new screens::Menu()); + //sCurrentScreen.reset(new screens::Menu()); } } // namespace states |
