Add rgb status bar brightness control and rgb side bar dimming duration

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

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

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");

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()
     ,

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

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();
 

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();
+}

src/persistent_stores/store_instances/config_store/store_definition.hpp

@@ -330,6 +330,9 @@ 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;