From ed82063af5f83530afa5cfb5bf5bd516f3d05f2a Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Wed, 10 Apr 2024 16:56:10 +1000
Subject: WIP decompose our giant LVGL driver into smaller classes

---
 src/ui/include/ui_fsm.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/ui/include/ui_fsm.hpp')

diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index 2bab487d..c238a447 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -14,14 +14,13 @@
 #include "battery.hpp"
 #include "db_events.hpp"
 #include "display.hpp"
-#include "encoder_input.hpp"
 #include "gpios.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"
@@ -92,7 +91,7 @@ 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::stack<std::shared_ptr<Screen>> sScreens;
   static std::shared_ptr<Screen> sCurrentScreen;
-- 
cgit v1.2.3


From 33919e9e3f419e13318fa6b8217d8c8dcd86c1eb Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Thu, 11 Apr 2024 15:16:35 +1000
Subject: Migrate all existing control schemes to the cool new world

---
 src/ui/include/ui_fsm.hpp | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/ui/include/ui_fsm.hpp')

diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index c238a447..8eafc6e0 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -13,8 +13,12 @@
 #include "audio_events.hpp"
 #include "battery.hpp"
 #include "db_events.hpp"
+#include "device_factory.hpp"
 #include "display.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"
@@ -67,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&){};
@@ -91,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<input::LvglInputDriver> sInput;
+  static std::unique_ptr<input::DeviceFactory> sDeviceFactory;
 
   static std::stack<std::shared_ptr<Screen>> sScreens;
   static std::shared_ptr<Screen> sCurrentScreen;
@@ -125,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;
-- 
cgit v1.2.3