From ab5d93bf04f5c4cae26afa578fb626898101dbb3 Mon Sep 17 00:00:00 2001
From: "info@revskills.de" <info@revskills.de>
Date: Sat, 31 Aug 2024 12:59:16 +0200
Subject: [PATCH] Add rgb status bar brightness control, rgb side bar dimming
 duration and tool light brightness control

---
 include/leds/side_strip_control.hpp           |  3 +-
 src/gui/MItem_menus.cpp                       | 47 +++++++++++++++++++
 src/gui/MItem_menus.hpp                       | 30 ++++++++++++
 src/gui/screen_menu_enclosure.hpp             |  3 +-
 src/gui/screen_menu_user_interface.hpp        |  6 ++-
 src/guiapi/include/gui_leds.hpp               | 16 ++++++-
 src/guiapi/src/gui_leds.cpp                   | 14 +++++-
 src/leds/side_strip_control.cpp               | 10 +++-
 .../config_store/store_definition.hpp         |  4 ++
 src/puppies/Dwarf.cpp                         |  2 +-
 10 files changed, 126 insertions(+), 9 deletions(-)

diff --git a/include/leds/side_strip_control.hpp b/include/leds/side_strip_control.hpp
index 2769bc6bf4..c053fc3143 100644
--- a/include/leds/side_strip_control.hpp
+++ b/include/leds/side_strip_control.hpp
@@ -33,6 +33,8 @@ class SideStripControl {
 
     void SetEnable(bool isEnable);
     void set_dimming_enabled(bool set);
+    void set_dimming_duration(int duration_sec);
+    int get_dimming_duration();
 
     /**
      * @brief Quickly turn off LEDs.
@@ -145,7 +147,6 @@ class SideStripControl {
     freertos::Mutex mutex;
 
     // Active State
-    const int active_timeout_ms = 120 * 1000;
     std::optional<uint32_t> active_start_timestamp;
 
     // Custom Color State
diff --git a/src/gui/MItem_menus.cpp b/src/gui/MItem_menus.cpp
index 0edef23f5e..49dd329eb8 100644
--- a/src/gui/MItem_menus.cpp
+++ b/src/gui/MItem_menus.cpp
@@ -25,6 +25,7 @@
 #include <option/has_leds.h>
 #if HAS_LEDS()
     #include "led_animations/animator.hpp"
+    #include "gui_leds.hpp"
 #endif
 #include "img_resources.hpp"
 #include "power_panic.hpp"
@@ -536,6 +537,22 @@ void MI_LEDS_ENABLE::OnChange(size_t old_index) {
 }
 #endif
 
+#if HAS_LEDS()
+/**********************************************************************************************/
+// MI_LEDS_BRIGHTNESS
+static constexpr NumericInputConfig led_brightness_spin_config = {
+    .max_value = 100,
+};
+
+MI_LEDS_BRIGHTNESS::MI_LEDS_BRIGHTNESS()
+    : WiSpin(config_store().leds_statusbar_brightness.get(), led_brightness_spin_config, _(label), nullptr, is_enabled_t::yes, is_hidden_t::no) {
+}
+void MI_LEDS_BRIGHTNESS::OnClick() {
+    leds::SetBrightness(GetVal());
+    leds::store_statusbar_brightness(GetVal());
+}
+#endif
+
 #if HAS_SIDE_LEDS()
 /**********************************************************************************************/
 // MI_SIDE_LEDS_ENABLE
@@ -560,6 +577,23 @@ void MI_SIDE_LEDS_DIMMING::OnChange(size_t) {
 }
 #endif
 
+#if HAS_SIDE_LEDS()
+/**********************************************************************************************/
+// MI_SIDE_LEDS_DIMMING_DURATION
+static constexpr NumericInputConfig side_led_dimming_spin_config = {
+    .max_value = 60 * 60, // 60 Minutes
+};
+
+MI_SIDE_LEDS_DIMMING_DURATION::MI_SIDE_LEDS_DIMMING_DURATION()
+    : WiSpin(config_store().side_leds_dimming_duration.get(), side_led_dimming_spin_config, _(label), nullptr, is_enabled_t::yes, is_hidden_t::no) {
+}
+
+void MI_SIDE_LEDS_DIMMING_DURATION::OnClick() {
+    config_store().side_leds_dimming_duration.set(GetVal());
+    leds::side_strip_control.set_dimming_duration(GetVal());
+}
+#endif
+
 #if ENABLED(PRUSA_TOOLCHANGER)
 /**********************************************************************************************/
 // MI_TOOL_LEDS_ENABLE
@@ -573,6 +607,19 @@ void MI_TOOL_LEDS_ENABLE::OnChange(size_t old_index) {
     config_store().tool_leds_enabled.set(!old_index);
 }
 
+/**********************************************************************************************/
+// MI_TOOL_LEDS_BRIGHTNESS
+static constexpr NumericInputConfig tool_leds_brightness_spin_config = {
+    .max_value = 255,
+};
+
+MI_TOOL_LEDS_BRIGHTNESS::MI_TOOL_LEDS_BRIGHTNESS()
+    : WiSpin(config_store().tool_leds_brightness.get(), tool_leds_brightness_spin_config, _(label), nullptr, is_enabled_t::yes, is_hidden_t::no) {
+}
+void MI_TOOL_LEDS_BRIGHTNESS::OnClick() {
+    config_store().tool_leds_brightness.set(GetVal());
+}
+
 /*****************************************************************************/
 // MI_TOOLS_SETUP
 MI_TOOLS_SETUP::MI_TOOLS_SETUP()
diff --git a/src/gui/MItem_menus.hpp b/src/gui/MItem_menus.hpp
index bde6bf3457..fd61b2f573 100644
--- a/src/gui/MItem_menus.hpp
+++ b/src/gui/MItem_menus.hpp
@@ -413,6 +413,16 @@ class MI_LEDS_ENABLE : public WI_ICON_SWITCH_OFF_ON_t {
 };
 #endif
 
+#if HAS_LEDS()
+class MI_LEDS_BRIGHTNESS : public WiSpin {
+    static constexpr const char *const label = N_("RGB Status Bar Brightness");
+
+public:
+    MI_LEDS_BRIGHTNESS();
+    virtual void OnClick() override;
+};
+#endif
+
 #if HAS_SIDE_LEDS()
 class MI_SIDE_LEDS_ENABLE : public WI_ICON_SWITCH_OFF_ON_t {
     static constexpr const char *const label = N_("RGB Side Strip");
@@ -421,7 +431,9 @@ class MI_SIDE_LEDS_ENABLE : public WI_ICON_SWITCH_OFF_ON_t {
     MI_SIDE_LEDS_ENABLE();
     virtual void OnChange(size_t old_index) override;
 };
+#endif
 
+#if HAS_SIDE_LEDS()
 class MI_SIDE_LEDS_DIMMING : public WI_ICON_SWITCH_OFF_ON_t {
     static constexpr const char *const label = N_("RGB Side Strip Dimming");
 
@@ -431,6 +443,16 @@ class MI_SIDE_LEDS_DIMMING : public WI_ICON_SWITCH_OFF_ON_t {
 };
 #endif
 
+#if HAS_SIDE_LEDS()
+class MI_SIDE_LEDS_DIMMING_DURATION : public WiSpin {
+    static constexpr const char *const label = N_("RGB Side Strip Dimming Duration");
+
+public:
+    MI_SIDE_LEDS_DIMMING_DURATION();
+    virtual void OnClick() override;
+};
+#endif
+
 #if HAS_TOOLCHANGER()
 class MI_TOOL_LEDS_ENABLE : public WI_ICON_SWITCH_OFF_ON_t {
     static constexpr const char *const label = N_("Tool Light");
@@ -440,6 +462,14 @@ class MI_TOOL_LEDS_ENABLE : public WI_ICON_SWITCH_OFF_ON_t {
     virtual void OnChange(size_t old_index) override;
 };
 
+class MI_TOOL_LEDS_BRIGHTNESS : public WiSpin {
+    static constexpr const char *const label = N_("Tool Light Brightness");
+
+public:
+    MI_TOOL_LEDS_BRIGHTNESS();
+    virtual void OnClick() override;
+};
+
 class MI_TOOLS_SETUP : public IWindowMenuItem {
     static constexpr const char *const label = N_("Tools");
 
diff --git a/src/gui/screen_menu_enclosure.hpp b/src/gui/screen_menu_enclosure.hpp
index ba870bbc01..db9fd9e597 100644
--- a/src/gui/screen_menu_enclosure.hpp
+++ b/src/gui/screen_menu_enclosure.hpp
@@ -30,7 +30,8 @@ using ScreenMenuManualSetting = ScreenMenu<GuiDefaults::MenuFooter, MI_RETURN
 #endif
 #if HAS_TOOLCHANGER()
     ,
-    MI_TOOL_LEDS_ENABLE
+    MI_TOOL_LEDS_ENABLE,
+    MI_TOOL_LEDS_BRIGHTNESS
 #endif
     >;
 } // namespace detail
diff --git a/src/gui/screen_menu_user_interface.hpp b/src/gui/screen_menu_user_interface.hpp
index 34b90f7b3f..2f942a8a3d 100644
--- a/src/gui/screen_menu_user_interface.hpp
+++ b/src/gui/screen_menu_user_interface.hpp
@@ -30,7 +30,8 @@ using ScreenMenuUserInterface__ = ScreenMenu<GuiDefaults::MenuFooter, MI_RETURN,
 #endif
 #if HAS_LEDS()
     ,
-    MI_LEDS_ENABLE
+    MI_LEDS_ENABLE,
+    MI_LEDS_BRIGHTNESS
 #endif
 #if HAS_SIDE_LEDS()
     ,
@@ -39,7 +40,8 @@ using ScreenMenuUserInterface__ = ScreenMenu<GuiDefaults::MenuFooter, MI_RETURN,
 #endif
 #if HAS_TOOLCHANGER()
     ,
-    MI_TOOL_LEDS_ENABLE
+    MI_TOOL_LEDS_ENABLE,
+    MI_TOOL_LEDS_BRIGHTNESS
 #endif /*HAS_TOOLCHANGER()*/
 #if HAS_TOUCH()
     ,
diff --git a/src/guiapi/include/gui_leds.hpp b/src/guiapi/include/gui_leds.hpp
index 4f8c347492..726b2417dc 100644
--- a/src/guiapi/include/gui_leds.hpp
+++ b/src/guiapi/include/gui_leds.hpp
@@ -45,12 +45,26 @@ void TickLoop();
 void SetNth(Color clr, index n);
 
 /**
- * @brief Set the Brightness of display
+ * @brief Set the Brightness of the display RGB status bar
  *
  * @param percent Brightness in range 0 - 100
  */
 void SetBrightness(unsigned percent);
 
+/**
+ * @brief Read the Brightness of the display RGB status bar from ConfigStore
+ *
+ * @return percent Brightness in range 0 - 100
+ */
+uint8_t get_statusbar_brightness();
+
+/**
+ * @brief Store the Brightness of the display RGB status bar to ConfigStore
+ *
+ * @param percent Brightness in range 0 - 100
+ */
+void store_statusbar_brightness(uint8_t percent);
+
 /**
  * @brief Forces write on next call of tick loop
  * @param cnt How many leds to refresh
diff --git a/src/guiapi/src/gui_leds.cpp b/src/guiapi/src/gui_leds.cpp
index d83194d81d..7ce1fa180a 100644
--- a/src/guiapi/src/gui_leds.cpp
+++ b/src/guiapi/src/gui_leds.cpp
@@ -28,19 +28,29 @@ Neopixels &getNeopixels() {
 
 void leds::Init() {
     // Turn on LCD backlight
-    // TODO move SetBrightness to display
-    leds::SetBrightness(100);
     leds::TickLoop();
+    leds::SetBrightness(leds::get_statusbar_brightness());
 
 #if HAS_SIDE_LEDS()
     leds::side_strip_control.SetEnable(config_store().side_leds_enabled.get());
     leds::side_strip_control.set_dimming_enabled(config_store().side_leds_dimming_enabled.get());
+    leds::side_strip_control.set_dimming_duration(config_store().side_leds_dimming_duration.get());
 #endif
 }
+
 void leds::ForceRefresh(size_t cnt) {
     getNeopixels().ForceRefresh(cnt);
 }
 
+uint8_t leds::get_statusbar_brightness() {
+    return config_store().leds_statusbar_brightness.get();
+}
+
+void leds::store_statusbar_brightness(uint8_t percent) {
+    leds::SetBrightness(percent);
+    return config_store().leds_statusbar_brightness.set(percent);
+}
+
 void leds::TickLoop() {
     getNeopixels().Tick();
 
diff --git a/src/leds/side_strip_control.cpp b/src/leds/side_strip_control.cpp
index 2766d79ee9..a8fc2f0be2 100644
--- a/src/leds/side_strip_control.cpp
+++ b/src/leds/side_strip_control.cpp
@@ -31,7 +31,7 @@ void SideStripControl::Tick() {
         active = true;
 
     } else if (active_start_timestamp.has_value()) {
-        if (ticks_diff(ticks_ms(), active_start_timestamp.value()) > active_timeout_ms) {
+        if (ticks_diff(ticks_ms(), active_start_timestamp.value()) > (get_dimming_duration() * 1000)) {
             active_start_timestamp.reset();
         } else {
             active = true;
@@ -230,3 +230,11 @@ void SideStripControl::PanicOff() {
     std::unique_lock lock(mutex);
     state = State::Off;
 }
+
+void SideStripControl::set_dimming_duration(int duration_sec) {
+    config_store().side_leds_dimming_duration.set(duration_sec);
+}
+
+int SideStripControl::get_dimming_duration() {
+    return config_store().side_leds_dimming_duration.get();
+}
diff --git a/src/persistent_stores/store_instances/config_store/store_definition.hpp b/src/persistent_stores/store_instances/config_store/store_definition.hpp
index 5b60ce402d..6d9af319be 100644
--- a/src/persistent_stores/store_instances/config_store/store_definition.hpp
+++ b/src/persistent_stores/store_instances/config_store/store_definition.hpp
@@ -330,8 +330,12 @@ struct CurrentStore
 
     /// Whether the side leds should dim down a bit when user is not interacting with the printer or stay on full power the whole time
     StoreItem<bool, true, journal::hash("Enable Side LEDs dimming")> side_leds_dimming_enabled;
+    StoreItem<int, 120, journal::hash("Side LEDs dimming duration")> side_leds_dimming_duration;
+
+    StoreItem<uint8_t, 100, journal::hash("Display status bar RGB brightness")> leds_statusbar_brightness;
 
     StoreItem<bool, true, journal::hash("Enable Tool LEDs")> tool_leds_enabled;
+    StoreItem<uint8_t, 255, journal::hash("Tool LED brightness")> tool_leds_brightness;
 
     StoreItem<float, 0.0f, journal::hash("Odometer X")> odometer_x;
     StoreItem<float, 0.0f, journal::hash("Odometer Y")> odometer_y;
diff --git a/src/puppies/Dwarf.cpp b/src/puppies/Dwarf.cpp
index 0e376ffdd3..de81a97ef2 100644
--- a/src/puppies/Dwarf.cpp
+++ b/src/puppies/Dwarf.cpp
@@ -499,7 +499,7 @@ void Dwarf::set_cheese_led(uint8_t pwr_selected, uint8_t pwr_not_selected) {
 }
 
 void Dwarf::set_cheese_led() {
-    set_cheese_led(config_store().tool_leds_enabled.get() ? 0xff : 0x00, 0x00);
+    set_cheese_led(config_store().tool_leds_enabled.get() ? config_store().tool_leds_brightness.get() : 0x00, 0x00);
 }
 
 void Dwarf::set_status_led(dwarf_shared::StatusLed::Mode mode, uint8_t r, uint8_t g, uint8_t b) {