Merge branch 'main' of codeberg.org:cool-tech-zone/tangara-fw

4 files changed, 33 insertions, 1 deletions

diff --git a/src/ui/encoder_input.cpp b/src/ui/encoder_input.cpp
index 5a46cd05..3b5af2c1 100644
--- a/src/ui/encoder_input.cpp
+++ b/src/ui/encoder_input.cpp
@@ -50,6 +50,7 @@ EncoderInput::EncoderInput(drivers::IGpios& gpios, drivers::TouchWheel& wheel)
       scroller_(std::make_unique<Scroller>()),
       mode_(drivers::NvsStorage::InputModes::kRotatingWheel),
       is_locked_(false),
+      scroll_sensitivity_(10),
       is_scrolling_wheel_(false) {
   lv_indev_drv_init(&driver_);
   driver_.type = LV_INDEV_TYPE_ENCODER;
@@ -272,6 +273,11 @@ auto EncoderInput::Read(lv_indev_data_t* data) -> void {
   }
 }
 
+auto EncoderInput::scroll_sensitivity(uint8_t val) -> void {
+  scroll_sensitivity_ = val;
+  relative_wheel_->SetSensitivity(scroll_sensitivity_);
+}
+
 auto EncoderInput::UpdateKeyState(Keys key, uint64_t ms, bool clicked) -> void {
   if (clicked) {
     if (!touch_time_ms_.contains(key)) {
diff --git a/src/ui/include/encoder_input.hpp b/src/ui/include/encoder_input.hpp
index fbd57f32..7dfac071 100644
--- a/src/ui/include/encoder_input.hpp
+++ b/src/ui/include/encoder_input.hpp
@@ -38,6 +38,7 @@ class EncoderInput {
   auto registration() -> lv_indev_t* { return registration_; }
 
   auto mode(drivers::NvsStorage::InputModes mode) { mode_ = mode; }
+  auto scroll_sensitivity(uint8_t val) -> void; // Value between 0-255, used to scale the threshold
   auto lock(bool l) -> void { is_locked_ = l; }
 
  private:
@@ -51,6 +52,7 @@ class EncoderInput {
 
   drivers::NvsStorage::InputModes mode_;
   bool is_locked_;
+  uint8_t scroll_sensitivity_;
 
   // Every kind of distinct input that we could map to an action.
   enum class Keys {
diff --git a/src/ui/include/ui_fsm.hpp b/src/ui/include/ui_fsm.hpp
index 52ab77a5..ffaff0bb 100644
--- a/src/ui/include/ui_fsm.hpp
+++ b/src/ui/include/ui_fsm.hpp
@@ -128,7 +128,7 @@ class UiState : public tinyfsm::Fsm<UiState> {
   static lua::Property sDisplayBrightness;
 
   static lua::Property sControlsScheme;
-  static lua::Property sControlSensitivity;
+  static lua::Property sScrollSensitivity;
 
   static lua::Property sDatabaseUpdating;
 };
diff --git a/src/ui/ui_fsm.cpp b/src/ui/ui_fsm.cpp
index 728c9756..24145ead 100644
--- a/src/ui/ui_fsm.cpp
+++ b/src/ui/ui_fsm.cpp
@@ -242,6 +242,25 @@ lua::Property UiState::sControlsScheme{
       return true;
     }};
 
+lua::Property UiState::sScrollSensitivity{
+    0, [](const lua::LuaValue& val) {
+      std::optional<int> sensitivity = 0;
+      std::visit(
+          [&](auto&& v) {
+            using T = std::decay_t<decltype(v)>;
+            if constexpr (std::is_same_v<T, int>) {
+              sensitivity = v;
+            }
+          },
+          val);
+      if (!sensitivity) {
+        return false;
+      }
+      sInput->scroll_sensitivity(*sensitivity);
+      sServices->nvs().ScrollSensitivity(*sensitivity);
+      return true;
+    }};
+
 lua::Property UiState::sDatabaseUpdating{false};
 
 auto UiState::InitBootSplash(drivers::IGpios& gpios) -> bool {
@@ -403,6 +422,10 @@ void Splash::react(const system_fsm::BootComplete& ev) {
     sInput->mode(mode);
     sControlsScheme.Update(static_cast<int>(mode));
 
+    auto sensitivity = sServices->nvs().ScrollSensitivity();
+    sInput->scroll_sensitivity(sensitivity);
+    sScrollSensitivity.Update(static_cast<int>(sensitivity));
+
     sTask->input(sInput);
   } else {
     ESP_LOGE(kTag, "no input devices initialised!");
@@ -466,6 +489,7 @@ void Lua::entry() {
     sLua->bridge().AddPropertyModule("controls",
                                      {
                                          {"scheme", &sControlsScheme},
+                                         {"scroll_sensitivity", &sScrollSensitivity},
                                      });
 
     sLua->bridge().AddPropertyModule(