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/include/ui_fsm.hpp | |
| parent | db2e29a72d9b934e7b58f1d20ac3768eae484ab5 (diff) | |
| download | tangara-fw-6fd588e970470b15936187980829916d0dbe77bb.tar.gz | |
Add touchwheel -> encoder adapter
Diffstat (limited to 'src/ui/include/ui_fsm.hpp')
| -rw-r--r-- | src/ui/include/ui_fsm.hpp | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp index 2afcfa86..d4d23bb0 100644 --- a/src/ui/include/ui_fsm.hpp +++ b/src/ui/include/ui_fsm.hpp @@ -8,9 +8,9 @@ #include <memory> +#include "relative_wheel.hpp" #include "tinyfsm.hpp" -#include "database.hpp" #include "display.hpp" #include "screen.hpp" #include "storage.hpp" @@ -22,9 +22,8 @@ namespace ui { class UiState : public tinyfsm::Fsm<UiState> { public: static auto 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; virtual ~UiState() {} @@ -43,9 +42,8 @@ class UiState : public tinyfsm::Fsm<UiState> { protected: static drivers::GpioExpander* sGpioExpander; - static std::weak_ptr<drivers::TouchWheel> sTouchWheel; + static std::weak_ptr<drivers::RelativeWheel> sTouchWheel; static std::weak_ptr<drivers::Display> sDisplay; - static std::weak_ptr<database::Database> sDatabase; static std::shared_ptr<Screen> sCurrentScreen; }; |
