diff options
| author | cooljqln <cooljqln@noreply.codeberg.org> | 2024-04-11 07:02:53 +0000 |
|---|---|---|
| committer | cooljqln <cooljqln@noreply.codeberg.org> | 2024-04-11 07:02:53 +0000 |
| commit | dd1ea595a7753706d4fa5f19b66f3dc1cbd56a02 (patch) | |
| tree | 60bfa4569af0f9506ccffe85f19e89bbe2a83332 /src/ui/include/ui_fsm.hpp | |
| parent | f580928cbab797e4e8a3eae5ae1c0b18b8066066 (diff) | |
| parent | 33919e9e3f419e13318fa6b8217d8c8dcd86c1eb (diff) | |
| download | tangara-fw-dd1ea595a7753706d4fa5f19b66f3dc1cbd56a02.tar.gz | |
Merge pull request 'jqln/input-devices' (#62) from jqln/input-devices into main
Reviewed-on: https://codeberg.org/cool-tech-zone/tangara-fw/pulls/62
Reviewed-by: ailurux <ailurux@noreply.codeberg.org>
Diffstat (limited to 'src/ui/include/ui_fsm.hpp')
| -rw-r--r-- | src/ui/include/ui_fsm.hpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp index 2bab487d..8eafc6e0 100644 --- a/src/ui/include/ui_fsm.hpp +++ b/src/ui/include/ui_fsm.hpp @@ -13,15 +13,18 @@ #include "audio_events.hpp" #include "battery.hpp" #include "db_events.hpp" +#include "device_factory.hpp" #include "display.hpp" -#include "encoder_input.hpp" +#include "feedback_haptics.hpp" #include "gpios.hpp" +#include "input_touch_wheel.hpp" +#include "input_volume_buttons.hpp" #include "lua_thread.hpp" +#include "lvgl_input_driver.hpp" #include "lvgl_task.hpp" #include "modal.hpp" #include "nvs.hpp" #include "property.hpp" -#include "relative_wheel.hpp" #include "screen.hpp" #include "service_locator.hpp" #include "storage.hpp" @@ -68,7 +71,6 @@ class UiState : public tinyfsm::Fsm<UiState> { void react(const system_fsm::SamdUsbStatusChanged&); void react(const internal::DismissAlerts&); - void react(const internal::ControlSchemeChanged&); void react(const database::event::UpdateStarted&); void react(const database::event::UpdateProgress&){}; @@ -92,7 +94,9 @@ class UiState : public tinyfsm::Fsm<UiState> { static std::unique_ptr<UiTask> sTask; static std::shared_ptr<system_fsm::ServiceLocator> sServices; static std::unique_ptr<drivers::Display> sDisplay; - static std::shared_ptr<EncoderInput> sInput; + + static std::shared_ptr<input::LvglInputDriver> sInput; + static std::unique_ptr<input::DeviceFactory> sDeviceFactory; static std::stack<std::shared_ptr<Screen>> sScreens; static std::shared_ptr<Screen> sCurrentScreen; @@ -126,8 +130,6 @@ class UiState : public tinyfsm::Fsm<UiState> { static lua::Property sDisplayBrightness; - static lua::Property sControlsScheme; - static lua::Property sScrollSensitivity; static lua::Property sLockSwitch; static lua::Property sDatabaseUpdating; |