Merge branch 'main' of git.sr.ht:~jacqueline/tangara-fw

src/drivers/relative_wheel.cpp

@@ -27,8 +27,15 @@ auto RelativeWheel::Update() -> void {
 
   is_clicking_ = d.is_button_touched;
 
+  if (is_clicking_) {
+    ticks_ = 0;
+    return;
+  }
+
   if (!d.is_wheel_touched) {
+    ticks_ = 0;
     is_first_read_ = true;
+    return;
   }
 
   uint8_t new_angle = d.wheel_position;
@@ -38,33 +45,20 @@ auto RelativeWheel::Update() -> void {
     return;
   }
 
-  // Work out the magnitude of travel.
-  uint8_t change_cw = last_angle_ - new_angle;
-  uint8_t change_ccw = new_angle - last_angle_;
-  int change = std::min(change_cw, change_ccw);
+  int delta = 128 - last_angle_;
+  uint8_t rotated_angle = new_angle + delta;
+  int threshold = 15;
 
-  last_angle_ = new_angle;
-
-  // Round to eliminate noise.
-  if (change <= 2) {
+  if (rotated_angle < 128 - threshold) {
+    ticks_ = 1;
+    last_angle_ = new_angle;
+  } else if (rotated_angle > 128 + threshold) {
+    ticks_ = -1;
+    last_angle_ = new_angle;
+  } else {
     ticks_ = 0;
-    return;
   }
 
-  // Quantize into ticks.
-  change /= 4;
-
-  // Clamp to reliminate more noise.
-  if (change > 10) {
-    change = 0;
-  }
-
-  // Work out the direction of travel.
-  if (change_cw > change_ccw) {
-    change *= -1;
-  }
-
-  ticks_ = change;
 }
 
 auto RelativeWheel::is_clicking() -> bool {

src/ui/CMakeLists.txt

@@ -3,7 +3,7 @@
 # SPDX-License-Identifier: GPL-3.0-only
 
 idf_component_register(
-  SRCS "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp" "screen_menu.cpp" "wheel_encoder.cpp" "screen_track_browser.cpp" "screen_playing.cpp" "splash.c"
+  SRCS "lvgl_task.cpp" "ui_fsm.cpp" "screen_splash.cpp" "screen_menu.cpp" "wheel_encoder.cpp" "screen_track_browser.cpp" "screen_playing.cpp" "themes.cpp" "splash.c"
   INCLUDE_DIRS "include"
   REQUIRES "drivers" "lvgl" "tinyfsm" "events" "system_fsm" "database" "esp_timer")
 target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})

src/ui/include/lvgl_task.hpp

@@ -16,6 +16,7 @@
 #include "display.hpp"
 #include "relative_wheel.hpp"
 #include "touchwheel.hpp"
+#include "themes.hpp"
 
 namespace ui {
 

src/ui/include/themes.hpp

@@ -0,0 +1,18 @@
+#pragma once
+
+#include "lvgl.h"
+
+namespace ui {
+namespace themes {
+class Theme {
+ public:
+  Theme();
+  void Apply(void);
+  void Callback(lv_obj_t* obj);
+
+ private:
+  lv_style_t button_style_;
+  lv_theme_t theme_;
+};
+}  // namespace themes
+}  // namespace ui

src/ui/lvgl_task.cpp

@@ -54,8 +54,10 @@ void LvglMain(std::weak_ptr<drivers::RelativeWheel> weak_touch_wheel,
   ESP_LOGI(kTag, "init lvgl");
   lv_init();
 
-  lv_theme_t* theme = lv_theme_basic_init(NULL);
-  lv_disp_set_theme(NULL, theme);
+  lv_theme_t* base_theme = lv_theme_basic_init(NULL);
+  lv_disp_set_theme(NULL, base_theme);
+  static themes::Theme sTheme{};
+  sTheme.Apply();
 
   TouchWheelEncoder encoder(weak_touch_wheel);
 

src/ui/themes.cpp

@@ -0,0 +1,37 @@
+#include "themes.hpp"
+
+namespace ui {
+namespace themes {
+
+static void theme_apply_cb(lv_theme_t* th, lv_obj_t* obj) {
+  reinterpret_cast<Theme*>(th->user_data)->Callback(obj);
+}
+
+Theme::Theme() {
+  /*Initialize the styles*/
+  lv_style_init(&button_style_);
+  lv_style_set_bg_color(&button_style_, lv_palette_main(LV_PALETTE_GREEN));
+  lv_style_set_border_color(&button_style_,
+                            lv_palette_darken(LV_PALETTE_GREEN, 3));
+  lv_style_set_border_width(&button_style_, 1);
+
+  lv_theme_t* parent_theme = lv_disp_get_theme(NULL);
+  theme_ = *parent_theme;
+  theme_.user_data = this;
+
+  /*Set the parent theme and the style apply callback for the new theme*/
+  lv_theme_set_parent(&theme_, parent_theme);
+  lv_theme_set_apply_cb(&theme_, theme_apply_cb);
+}
+
+void Theme::Apply(void) {
+  lv_disp_set_theme(NULL, &theme_);
+}
+
+void Theme::Callback(lv_obj_t* obj) {
+  if (lv_obj_check_type(obj, &lv_btn_class) || lv_obj_check_type(obj, &lv_list_btn_class)) {
+    lv_obj_add_style(obj, &button_style_, 0);
+  }
+}
+}  // namespace themes
+}  // namespace ui

src/ui/wheel_encoder.cpp

@@ -25,7 +25,7 @@ TouchWheelEncoder::TouchWheelEncoder(
     std::weak_ptr<drivers::RelativeWheel> wheel)
     : last_key_(0), wheel_(wheel) {
   lv_indev_drv_init(&driver_);
-  driver_.type = LV_INDEV_TYPE_KEYPAD;
+  driver_.type = LV_INDEV_TYPE_ENCODER;
   driver_.read_cb = encoder_read;
   // driver_.feedback_cb = encoder_feedback;
   driver_.user_data = this;
@@ -41,19 +41,9 @@ auto TouchWheelEncoder::Read(lv_indev_data_t* data) -> void {
 
   lock->Update();
 
-  auto ticks = lock->ticks();
-  if (ticks > 0) {
-    data->key = LV_KEY_PREV;
-    data->state = LV_INDEV_STATE_PRESSED;
-  } else if (ticks < 0) {
-    data->key = LV_KEY_NEXT;
-    data->state = LV_INDEV_STATE_PRESSED;
-  } else if (lock->is_clicking()) {
-    data->key = LV_KEY_ENTER;
-    data->state = LV_INDEV_STATE_PRESSED;
-  } else {
-    data->state = LV_INDEV_STATE_RELEASED;
-  }
+  data->enc_diff = lock->ticks();
+  data->state =
+      lock->is_clicking() ? LV_INDEV_STATE_PRESSED : LV_INDEV_STATE_RELEASED;
 }
 
 }  // namespace ui