Series-II @ HW v0.2 ready

Author: Apehaenger

src/drivers/ui/SaboCoverUI/sabo_cover_ui_cabo_driver_base.cpp

@@ -105,7 +105,7 @@ void SaboCoverUICaboDriverBase::ProcessLedStates() {
   current_led_mask_ |= leds_.fast_blink_state ? leds_.fast_blink_mask : 0;
 }
 
-void SaboCoverUICaboDriverBase::DebounceRawButtons(const uint16_t raw_buttons) {
+void SaboCoverUICaboDriverBase::DebounceRawButtons(uint16_t raw_buttons) {
   static uint16_t btn_last_raw_mask_ = 0xFFFF;  // Last raw button state
   static size_t btn_debounce_counter_ = 0;      // If >= DEBOUNCE_TICKS, the button state is stable/debounced
 
@@ -119,13 +119,18 @@ void SaboCoverUICaboDriverBase::DebounceRawButtons(const uint16_t raw_buttons) {
   btn_last_raw_mask_ = raw_buttons;
 }
 
-bool SaboCoverUICaboDriverBase::IsButtonPressed(const ButtonID btn) const {
+bool SaboCoverUICaboDriverBase::IsButtonPressed(ButtonID btn) const {
   if (!series_) return false;
   auto btn_mask = series_->MapButtonIDToMask(btn);
   if (btn_mask == 0) return false;                                       // Unknown button ID = "not pressed"
   return (btn_stable_raw_mask_ & series_->MapButtonIDToMask(btn)) == 0;  // low-active
 }
 
+bool SaboCoverUICaboDriverBase::IsAnyButtonPressed() const {
+  if (!series_) return false;
+  return (btn_stable_raw_mask_ & series_->AllButtonsMask()) != series_->AllButtonsMask();  // low-active
+}
+
 bool SaboCoverUICaboDriverBase::IsReady() const {
   return state_ == DriverState::READY;
 }

src/drivers/ui/SaboCoverUI/sabo_cover_ui_cabo_driver_base.hpp

@@ -7,8 +7,8 @@
 
 #include "ch.h"
 #include "hal.h"
+#include "sabo_cover_ui_defs.hpp"
 #include "sabo_cover_ui_series_interface.hpp"
-#include "sabo_cover_ui_types.hpp"
 
 namespace xbot::driver::ui {
 
@@ -18,23 +18,25 @@ class SaboCoverUICaboDriverBase {
  public:
   explicit SaboCoverUICaboDriverBase(CaboCfg cabo_cfg) : cabo_cfg_(cabo_cfg){};
 
-  // 4 * 10ms(tick) / 2(alternating button rows) = 20ms debounce time
-  // Series-I has no alternating button rows, so it will debounce in 40ms (who cares)
-  static constexpr uint8_t DEBOUNCE_TICKS = 4;
+  // 6 * 10ms(tick) / 2(alternating button rows) = 30ms debounce time
+  // Series-I has no alternating button rows, so it will debounce in 60ms (who cares)
+  static constexpr uint8_t DEBOUNCE_TICKS = 5;
 
   virtual bool Init();              // Init GPIOs, SPI and assign series_ driver
   virtual void LatchLoad() = 0;     // Latch data (LEDs, Button-rows, signals) and load inputs (buttons, signals, ...)
   virtual void PowerOnAnimation();  // KIT like anim
-  virtual bool IsButtonPressed(const ButtonID btn) const;  // Check if a specific button is pressed
-  virtual void Tick();  // Call this function every 1ms to update LEDs, read and debounce buttons, ...
+  virtual void Tick();              // Call this function every 1ms to update LEDs, read and debounce buttons, ...
+
+  bool IsButtonPressed(ButtonID btn) const;  // Check if a specific button is pressed
+  bool IsAnyButtonPressed() const;           // Check if any button is pressed
 
   bool IsReady() const;  // True if CoverUI detected, boot anim played and ready to serve requests
 
   void SetLED(LEDID id, LEDMode mode);  // Set state of a single LED
 
   // Debounce all raw buttons at once in one quick XOR operation
   // This Method needs to be called by driver implementation once it read the buttons
-  void DebounceRawButtons(const uint16_t raw_buttons);
+  void DebounceRawButtons(uint16_t raw_buttons);
 
  protected:
   CaboCfg cabo_cfg_;

src/drivers/ui/SaboCoverUI/sabo_cover_ui_cabo_driver_v02.hpp

@@ -34,7 +34,7 @@ class SaboCoverUICaboDriverV02 : public SaboCoverUICaboDriverBase {
   // Relevant input bits of 74HC165 parallel-input shift register
   static constexpr uint16_t INP_MASK_S1_CONNECTED_L  = (1 << 2);  // Series-I CoverUI /Connected
   static constexpr uint16_t INP_MASK_S2_CONNECTED_L  = (1 << 9);  // Series-II CoverUI /Connected
-  static constexpr uint16_t INP_MASK_JP3_L           = (1 << 11); // Mainboard solder jumper JP3
+  static constexpr uint16_t INP_MASK_JP3_L           = (1 << 11); // Carrierboard solder jumper JP3
 
   // See also LED and Button bits in sabo_cover_ui_series1_v02.hpp
 
@@ -70,7 +70,7 @@ class SaboCoverUICaboDriverV02 : public SaboCoverUICaboDriverBase {
     return true;
   }
 
-  // Latch LEDs (as well as button-row if existent) and load button columns
+  // Latch LEDs (as well as button-row if exists) and load button columns
   void LatchLoad() override {
     if (!series_) return;
 

src/drivers/ui/SaboCoverUI/sabo_cover_ui_controller.cpp

@@ -127,14 +127,19 @@ const char* SaboCoverUIController::ButtonIDToString(const ButtonID id) {
 
 void SaboCoverUIController::ThreadFunc() {
   if (display_) {
-    SaboCoverUIDisplayDriverUC1698::Instance().Start();
+    display_->Start();
     display_->WakeUp();
   }
 
+  ULOG_INFO("Controller-Thread: %p", chThdGetSelfX());
+
   while (true) {
     cabo_->Tick();
     UpdateStates();
-    if (display_) display_->Tick();
+    if (display_) {
+      display_->Tick();
+      if (cabo_->IsAnyButtonPressed()) display_->WakeUp();
+    }
 
     // ----- Debug -----
     static uint32_t last_debug_time = 0;

src/drivers/ui/SaboCoverUI/sabo_cover_ui_controller.hpp

@@ -8,8 +8,8 @@
 #include "ch.h"
 #include "sabo_cover_ui_cabo_driver_v01.hpp"
 #include "sabo_cover_ui_cabo_driver_v02.hpp"
+#include "sabo_cover_ui_defs.hpp"
 #include "sabo_cover_ui_display.hpp"
-#include "sabo_cover_ui_types.hpp"
 
 namespace xbot::driver::ui {
 
@@ -24,7 +24,7 @@ class SaboCoverUIController {
   static const char* ButtonIDToString(const ButtonID id);  // Get string for ButtonID
 
  private:
-  THD_WORKING_AREA(wa_, 8192);
+  THD_WORKING_AREA(wa_, 4096);  // AH20250714 In use = 2912. Let's be save for future LVGL GUI
   thread_t* thread_ = nullptr;
 
   bool configured_ = false;

src/drivers/ui/SaboCoverUI/sabo_cover_ui_types.hpp renamed to src/drivers/ui/SaboCoverUI/sabo_cover_ui_defs.hpp

@@ -2,8 +2,8 @@
 // Created by Apehaenger on 5/31/25.
 //
 
-#ifndef OPENMOWER_SABO_COVER_UI_TYPES_HPP
-#define OPENMOWER_SABO_COVER_UI_TYPES_HPP
+#ifndef OPENMOWER_SABO_COVER_UI_DEFS_HPP
+#define OPENMOWER_SABO_COVER_UI_DEFS_HPP
 
 #include "ch.h"
 
@@ -68,6 +68,15 @@ enum class ButtonID {
 
 enum class SeriesType { Series1, Series2 };
 
+namespace display {
+constexpr uint16_t LCD_WIDTH = 240;  // ATTENTION: LVGL I1 mode requires a multiple of 8 width
+constexpr uint16_t LCD_HEIGHT = 160;
+constexpr uint8_t BUFFER_FRACTION = 10;  // 1/10 screen size for buffers
+
+constexpr systime_t BACKLIGHT_TIMEOUT = TIME_S2I(120);  // 2 Minutes
+constexpr systime_t LCD_SLEEP_TIMEOUT = TIME_S2I(300);  // 5 Minutes
+}  // namespace display
+
 }  // namespace xbot::driver::ui::sabo
 
-#endif  // OPENMOWER_SABO_COVER_UI_TYPES_HPP
+#endif  // OPENMOWER_SABO_COVER_UI_DEFS_HPP