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/input/include/lvgl_input_driver.hpp | 53 +++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)
 create mode 100644 src/input/include/lvgl_input_driver.hpp

(limited to 'src/input/include/lvgl_input_driver.hpp')

diff --git a/src/input/include/lvgl_input_driver.hpp b/src/input/include/lvgl_input_driver.hpp
new file mode 100644
index 00000000..be452368
--- /dev/null
+++ b/src/input/include/lvgl_input_driver.hpp
@@ -0,0 +1,53 @@
+/*
+ * Copyright 2023 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include <stdint.h>
+#include <deque>
+#include <memory>
+#include <set>
+
+#include "core/lv_group.h"
+#include "feedback_device.hpp"
+#include "gpios.hpp"
+#include "hal/lv_hal_indev.h"
+
+#include "input_device.hpp"
+#include "nvs.hpp"
+#include "service_locator.hpp"
+#include "touchwheel.hpp"
+
+namespace input {
+
+/*
+ * Implementation of an LVGL input device. This class composes multiple
+ * IInputDevice and IFeedbackDevice instances together into a single LVGL
+ * device.
+ */
+class LvglInputDriver {
+ public:
+  LvglInputDriver(std::shared_ptr<system_fsm::ServiceLocator>);
+
+  auto read(lv_indev_data_t* data) -> void;
+  auto feedback(uint8_t) -> void;
+
+  auto registration() -> lv_indev_t* { return registration_; }
+  auto lock(bool l) -> void { is_locked_ = l; }
+
+ private:
+  std::shared_ptr<system_fsm::ServiceLocator> services_;
+
+  lv_indev_drv_t driver_;
+  lv_indev_t* registration_;
+
+  std::vector<std::unique_ptr<IInputDevice>> inputs_;
+  std::vector<std::unique_ptr<IFeedbackDevice>> feedbacks_;
+
+  bool is_locked_;
+};
+
+}  // namespace input
-- 
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/input/include/lvgl_input_driver.hpp | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'src/input/include/lvgl_input_driver.hpp')

diff --git a/src/input/include/lvgl_input_driver.hpp b/src/input/include/lvgl_input_driver.hpp
index be452368..257ccb28 100644
--- a/src/input/include/lvgl_input_driver.hpp
+++ b/src/input/include/lvgl_input_driver.hpp
@@ -6,19 +6,20 @@
 
 #pragma once
 
-#include <stdint.h>
+#include <cstdint>
 #include <deque>
 #include <memory>
 #include <set>
 
 #include "core/lv_group.h"
+#include "device_factory.hpp"
 #include "feedback_device.hpp"
 #include "gpios.hpp"
 #include "hal/lv_hal_indev.h"
 
 #include "input_device.hpp"
 #include "nvs.hpp"
-#include "service_locator.hpp"
+#include "property.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
@@ -30,7 +31,9 @@ namespace input {
  */
 class LvglInputDriver {
  public:
-  LvglInputDriver(std::shared_ptr<system_fsm::ServiceLocator>);
+  LvglInputDriver(drivers::NvsStorage& nvs, DeviceFactory&);
+
+  auto mode() -> lua::Property& { return mode_; }
 
   auto read(lv_indev_data_t* data) -> void;
   auto feedback(uint8_t) -> void;
@@ -39,13 +42,15 @@ class LvglInputDriver {
   auto lock(bool l) -> void { is_locked_ = l; }
 
  private:
-  std::shared_ptr<system_fsm::ServiceLocator> services_;
+  drivers::NvsStorage& nvs_;
+  DeviceFactory& factory_;
 
+  lua::Property mode_;
   lv_indev_drv_t driver_;
   lv_indev_t* registration_;
 
-  std::vector<std::unique_ptr<IInputDevice>> inputs_;
-  std::vector<std::unique_ptr<IFeedbackDevice>> feedbacks_;
+  std::vector<std::shared_ptr<IInputDevice>> inputs_;
+  std::vector<std::shared_ptr<IFeedbackDevice>> feedbacks_;
 
   bool is_locked_;
 };
-- 
cgit v1.2.3