From 0426d245c8d863f18babdfbaf21c8673b0746feb Mon Sep 17 00:00:00 2001 From: ailurux Date: Mon, 12 Feb 2024 17:44:55 +1100 Subject: Scroll sensitivity configurable, but inverted --- src/drivers/nvs.cpp | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'src/drivers/nvs.cpp') 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); -- cgit v1.2.3 From bbbe3a3d5543bd4ffe218e45534dab64235b7e60 Mon Sep 17 00:00:00 2001 From: ailurux Date: Tue, 13 Feb 2024 10:42:47 +1100 Subject: Updated sensitivity nvs store --- src/drivers/nvs.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/drivers/nvs.cpp') diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp index bcfddd92..dd89a419 100644 --- a/src/drivers/nvs.cpp +++ b/src/drivers/nvs.cpp @@ -162,6 +162,7 @@ NvsStorage::NvsStorage(nvs_handle_t handle) : handle_(handle), lock_polarity_(kKeyLockPolarity), brightness_(kKeyBrightness), + sensitivity_(kKeyScrollSensitivity), amp_max_vol_(kKeyAmpMaxVolume), amp_cur_vol_(kKeyAmpCurrentVolume), amp_left_bias_(kKeyAmpLeftBias), @@ -180,6 +181,7 @@ auto NvsStorage::Read() -> void { std::lock_guard lock{mutex_}; lock_polarity_.read(handle_); brightness_.read(handle_); + sensitivity_.read(handle_); amp_max_vol_.read(handle_); amp_cur_vol_.read(handle_); amp_left_bias_.read(handle_); @@ -286,14 +288,13 @@ auto NvsStorage::ScreenBrightness(uint_fast8_t val) -> void { } auto NvsStorage::ScrollSensitivity() -> uint_fast8_t { - uint8_t out = 10; - nvs_get_u8(handle_, kKeyScrollSensitivity, &out); - return out; + std::lock_guard lock{mutex_}; + return std::clamp(sensitivity_.get().value_or(128), 0, 100); } -auto NvsStorage::ScrollSensitivity(uint_fast8_t val) -> bool { - nvs_set_u8(handle_, kKeyScrollSensitivity, val); - return nvs_commit(handle_) == ESP_OK; +auto NvsStorage::ScrollSensitivity(uint_fast8_t val) -> void { + std::lock_guard lock{mutex_}; + sensitivity_.set(val); } auto NvsStorage::AmpMaxVolume() -> uint16_t { -- cgit v1.2.3 From ffa0894e380874774fb13986b3ff1a48696d304e Mon Sep 17 00:00:00 2001 From: ailurux Date: Tue, 13 Feb 2024 11:35:18 +1100 Subject: Fixed clamp and write on scroll sensitivity --- src/drivers/nvs.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/drivers/nvs.cpp') diff --git a/src/drivers/nvs.cpp b/src/drivers/nvs.cpp index dd89a419..875059be 100644 --- a/src/drivers/nvs.cpp +++ b/src/drivers/nvs.cpp @@ -195,6 +195,7 @@ auto NvsStorage::Write() -> bool { std::lock_guard lock{mutex_}; lock_polarity_.write(handle_); brightness_.write(handle_); + sensitivity_.write(handle_); amp_max_vol_.write(handle_); amp_cur_vol_.write(handle_); amp_left_bias_.write(handle_); @@ -289,7 +290,7 @@ auto NvsStorage::ScreenBrightness(uint_fast8_t val) -> void { auto NvsStorage::ScrollSensitivity() -> uint_fast8_t { std::lock_guard lock{mutex_}; - return std::clamp(sensitivity_.get().value_or(128), 0, 100); + return std::clamp(sensitivity_.get().value_or(128), 0, 255); } auto NvsStorage::ScrollSensitivity(uint_fast8_t val) -> void { -- cgit v1.2.3