8 files changed, 154 insertions, 9 deletions
diff --git a/src/input/include/device_factory.hpp b/src/input/include/device_factory.hpp
new file mode 100644
index 00000000..dd9c7133
--- /dev/null
+++ b/src/input/include/device_factory.hpp
@@ -0,0 +1,39 @@
+/*
+ * Copyright 2023 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <memory>
+
+#include "feedback_device.hpp"
+#include "input_device.hpp"
+#include "input_touch_wheel.hpp"
+#include "nvs.hpp"
+#include "service_locator.hpp"
+
+namespace input {
+
+class DeviceFactory {
+ public:
+  DeviceFactory(std::shared_ptr<system_fsm::ServiceLocator>);
+
+  auto createInputs(drivers::NvsStorage::InputModes mode)
+      -> std::vector<std::shared_ptr<IInputDevice>>;
+
+  auto createFeedbacks() -> std::vector<std::shared_ptr<IFeedbackDevice>>;
+
+  auto touch_wheel() -> std::shared_ptr<TouchWheel> { return wheel_; }
+
+ private:
+  std::shared_ptr<system_fsm::ServiceLocator> services_;
+
+  // HACK: the touchwheel is current a special case, since it's the only input
+  // device that has some kind of setting/configuration; scroll sensitivity.
+  std::shared_ptr<TouchWheel> wheel_;
+};
+
+}  // namespace input
diff --git a/src/input/include/input_device.hpp b/src/input/include/input_device.hpp
index 09cf9193..5fc3e066 100644
--- a/src/input/include/input_device.hpp
+++ b/src/input/include/input_device.hpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include "hal/lv_hal_indev.h"
+#include "property.hpp"
 
 namespace input {
 
@@ -28,6 +29,11 @@ class IInputDevice {
 
   // TODO: Add hooks and configuration (or are hooks just one kind of
   // configuration?)
+
+  virtual auto settings()
+      -> std::vector<std::pair<std::string, lua::Property>> {
+    return {};
+  }
 };
 
 }  // namespace input
diff --git a/src/input/include/input_nav_buttons.hpp b/src/input/include/input_nav_buttons.hpp
new file mode 100644
index 00000000..29a19a16
--- /dev/null
+++ b/src/input/include/input_nav_buttons.hpp
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2024 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include <cstdint>
+
+#include "gpios.hpp"
+#include "hal/lv_hal_indev.h"
+
+#include "haptics.hpp"
+#include "input_device.hpp"
+#include "input_trigger.hpp"
+#include "touchwheel.hpp"
+
+namespace input {
+
+class NavButtons : public IInputDevice {
+ public:
+  NavButtons(drivers::IGpios&);
+
+  auto read(lv_indev_data_t* data) -> void override;
+
+ private:
+  drivers::IGpios& gpios_;
+
+  Trigger up_;
+  Trigger down_;
+};
+
+}  // namespace input
diff --git a/src/input/include/input_touch_dpad.hpp b/src/input/include/input_touch_dpad.hpp
index fdb52db9..03936acb 100644
--- a/src/input/include/input_touch_dpad.hpp
+++ b/src/input/include/input_touch_dpad.hpp
@@ -13,6 +13,7 @@
 
 #include "haptics.hpp"
 #include "input_device.hpp"
+#include "input_trigger.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
@@ -25,6 +26,11 @@ class TouchDPad : public IInputDevice {
 
  private:
   drivers::TouchWheel& wheel_;
+
+  Trigger up_;
+  Trigger right_;
+  Trigger down_;
+  Trigger left_;
 };
 
 }  // namespace input
diff --git a/src/input/include/input_touch_wheel.hpp b/src/input/include/input_touch_wheel.hpp
index a4923f21..c81cbb1a 100644
--- a/src/input/include/input_touch_wheel.hpp
+++ b/src/input/include/input_touch_wheel.hpp
@@ -6,29 +6,43 @@
 
 #pragma once
 
+#include <sys/_stdint.h>
 #include <cstdint>
 
 #include "hal/lv_hal_indev.h"
 
 #include "haptics.hpp"
 #include "input_device.hpp"
+#include "input_trigger.hpp"
+#include "nvs.hpp"
+#include "property.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
 
 class TouchWheel : public IInputDevice {
  public:
-  TouchWheel(drivers::TouchWheel&);
+  TouchWheel(drivers::NvsStorage&, drivers::TouchWheel&);
 
   auto read(lv_indev_data_t* data) -> void override;
 
+  auto sensitivity() -> lua::Property&;
+
  private:
-  auto calculate_ticks(const drivers::TouchWheelData& data) -> int8_t;
+  auto calculateTicks(const drivers::TouchWheelData& data) -> int8_t;
+  auto calculateThreshold(uint8_t sensitivity) -> uint8_t;
 
+  drivers::NvsStorage& nvs_;
   drivers::TouchWheel& wheel_;
 
+  lua::Property sensitivity_;
+
+  Trigger up_;
+  Trigger right_;
+  Trigger down_;
+  Trigger left_;
+
   bool is_scrolling_;
-  uint8_t sensitivity_;
   uint8_t threshold_;
   bool is_first_read_;
   uint8_t last_angle_;
diff --git a/src/input/include/input_trigger.hpp b/src/input/include/input_trigger.hpp
new file mode 100644
index 00000000..599b796b
--- /dev/null
+++ b/src/input/include/input_trigger.hpp
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2024 jacqueline <me@jacqueline.id.au>
+ *
+ * SPDX-License-Identifier: GPL-3.0-only
+ */
+
+#pragma once
+
+#include <cstdint>
+#include <optional>
+
+#include "hal/lv_hal_indev.h"
+
+namespace input {
+
+const uint16_t kLongPressDelayMs = LV_INDEV_DEF_LONG_PRESS_TIME;
+const uint16_t kRepeatDelayMs = LV_INDEV_DEF_LONG_PRESS_REP_TIME;
+
+class Trigger {
+ public:
+  enum class State {
+    kNone,
+    kClick,
+    kLongPress,
+    kRepeatPress,
+  };
+
+  Trigger();
+
+  auto update(bool is_pressed) -> State;
+
+ private:
+  std::optional<uint64_t> touch_time_ms_;
+  uint16_t times_fired_;
+};
+
+}  // namespace input
diff --git a/src/input/include/input_volume_buttons.hpp b/src/input/include/input_volume_buttons.hpp
index 4ca8c16b..162ca8d9 100644
--- a/src/input/include/input_volume_buttons.hpp
+++ b/src/input/include/input_volume_buttons.hpp
@@ -13,6 +13,7 @@
 
 #include "haptics.hpp"
 #include "input_device.hpp"
+#include "input_trigger.hpp"
 #include "touchwheel.hpp"
 
 namespace input {
@@ -25,6 +26,9 @@ class VolumeButtons : public IInputDevice {
 
  private:
   drivers::IGpios& gpios_;
+
+  Trigger up_;
+  Trigger down_;
 };
 
 }  // namespace input
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_;
 };