summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/drivers/include/nvs.hpp3
-rw-r--r--src/drivers/include/relative_wheel.hpp4
-rw-r--r--src/drivers/nvs.cpp12
-rw-r--r--src/drivers/relative_wheel.cpp14
-rw-r--r--src/ui/encoder_input.cpp6
-rw-r--r--src/ui/include/encoder_input.hpp2
-rw-r--r--src/ui/include/ui_fsm.hpp2
-rw-r--r--src/ui/ui_fsm.cpp24
8 files changed, 63 insertions, 4 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;
diff --git a/src/ui/encoder_input.cpp b/src/ui/encoder_input.cpp
index 5a46cd05..3eebe16e 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_->SetThreshold(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..17e278b2 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;
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 6e4bbe6f..da8d8999 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 {
@@ -397,6 +416,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!");
@@ -460,6 +483,7 @@ void Lua::entry() {
sLua->bridge().AddPropertyModule("controls",
{
{"scheme", &sControlsScheme},
+ {"scroll_sensitivity", &sScrollSensitivity},
});
sLua->bridge().AddPropertyModule(
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-29 21:31:54 +0000