Scroll sensitivity configurable, but inverted

4 files changed, 30 insertions, 3 deletions

diff --git a/src/drivers/include/nvs.hpp b/src/drivers/include/nvs.hpp
index 1184b72c..560cdefd 100644
--- a/src/drivers/include/nvs.hpp
+++ b/src/drivers/include/nvs.hpp
@@ -38,6 +38,9 @@ class NvsStorage {
   auto ScreenBrightness() -> uint_fast8_t;
   auto ScreenBrightness(uint_fast8_t) -> bool;
 
+  auto ScrollSensitivity() -> uint_fast8_t;
+  auto ScrollSensitivity(uint_fast8_t) -> bool;
+
   auto AmpMaxVolume() -> uint16_t;
   auto AmpMaxVolume(uint16_t) -> bool;
 
diff --git a/src/drivers/include/relative_wheel.hpp b/src/drivers/include/relative_wheel.hpp
index 88077d08..a44e3598 100644
--- a/src/drivers/include/relative_wheel.hpp
+++ b/src/drivers/include/relative_wheel.hpp
@@ -25,6 +25,9 @@ class RelativeWheel {
   auto Update() -> void;
   auto SetEnabled(bool) -> void;
 
+  auto SetThreshold(int) -> void;
+  auto GetThreshold() -> int;
+
   auto is_clicking() const -> bool;
   auto ticks() const -> std::int_fast16_t;
 
@@ -36,6 +39,7 @@ class RelativeWheel {
   TouchWheel& touch_;
 
   bool is_enabled_;
+  int threshold_;
 
   bool is_clicking_;
   bool was_clicking_;
diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp
index ab623d01..7f764852 100644
--- a/src/drivers/nvs.cpp
+++ b/src/drivers/nvs.cpp
@@ -34,6 +34,7 @@ static constexpr char kKeyAmpCurrentVolume[] = "hp_vol";
 static constexpr char kKeyAmpLeftBias[] = "hp_bias";
 static constexpr char kKeyOnboarded[] = "intro";
 static constexpr char kKeyPrimaryInput[] = "in_pri";
+static constexpr char kKeyScrollSensitivity[] = "scroll";
 static constexpr char kKeyLockPolarity[] = "lockpol";
 
 auto NvsStorage::OpenSync() -> NvsStorage* {
@@ -164,6 +165,17 @@ auto NvsStorage::ScreenBrightness(uint_fast8_t val) -> bool {
   return nvs_commit(handle_) == ESP_OK;
 }
 
+auto NvsStorage::ScrollSensitivity() -> uint_fast8_t {
+  uint8_t out = 10;
+  nvs_get_u8(handle_, kKeyScrollSensitivity, &out);
+  return out;
+}
+
+auto NvsStorage::ScrollSensitivity(uint_fast8_t val) -> bool {
+  nvs_set_u8(handle_, kKeyScrollSensitivity, val);
+  return nvs_commit(handle_) == ESP_OK;
+}
+
 auto NvsStorage::AmpMaxVolume() -> uint16_t {
   uint16_t out = wm8523::kDefaultMaxVolume;
   nvs_get_u16(handle_, kKeyAmpMaxVolume, &out);
diff --git a/src/drivers/relative_wheel.cpp b/src/drivers/relative_wheel.cpp
index 2b8c9b20..056c80c9 100644
--- a/src/drivers/relative_wheel.cpp
+++ b/src/drivers/relative_wheel.cpp
@@ -16,6 +16,7 @@ namespace drivers {
 RelativeWheel::RelativeWheel(TouchWheel& touch)
     : touch_(touch),
       is_enabled_(true),
+      threshold_(10),
       is_clicking_(false),
       was_clicking_(false),
       is_first_read_(true),
@@ -47,12 +48,11 @@ auto RelativeWheel::Update() -> void {
 
   int delta = 128 - last_angle_;
   uint8_t rotated_angle = new_angle + delta;
-  int threshold = 10;
 
-  if (rotated_angle < 128 - threshold) {
+  if (rotated_angle < 128 - threshold_) {
     ticks_ = 1;
     last_angle_ = new_angle;
-  } else if (rotated_angle > 128 + threshold) {
+  } else if (rotated_angle > 128 + threshold_) {
     ticks_ = -1;
     last_angle_ = new_angle;
   } else {
@@ -64,6 +64,14 @@ auto RelativeWheel::SetEnabled(bool en) -> void {
   is_enabled_ = en;
 }
 
+auto RelativeWheel::SetThreshold(int val) -> void {
+  threshold_ = val;
+}
+
+auto RelativeWheel::GetThreshold() -> int {
+  return threshold_;
+}
+
 auto RelativeWheel::is_clicking() const -> bool {
   if (!is_enabled_) {
     return false;