bugfix: brightness in single led

update: single_led_tab

Author: MrXMrQ

desktop_app/GUI/AnimationTab/__pycache__/animation_tab.cpython-312.pyc

@@ -166,12 +166,12 @@ def __init__(self, master, *args, **kwargs) -> None:
             progress_color="#C2C0BA",
             button_color="#E0DEDA",
             button_hover_color="#EAE9E6",
-            from_=0,
+            from_=-255,
             to=255,
-            number_of_steps=256,
+            number_of_steps=511,
             command=self._update_color_from_slider,
         )
-        self._brightness_slider.set(255)
+        self._brightness_slider.set(0)
         self._brightness_slider.grid(
             row=4, column=1, padx=ColorPickerRGB._PADX, pady=10
         )
@@ -221,16 +221,26 @@ def _update_color_from_slider(self, value: float = 0) -> None:
         self.update_command(self._rgb)
 
     def _set_rgb(self) -> None:
-        brightness = self._brightness_slider.get() / 255
-
-        self._rgb = (
-            int(round(self._red_slider.get()) * brightness),
-            int(round(self._green_slider.get()) * brightness),
-            int(round(self._blue_slider.get()) * brightness),
+        self._raw_rgb = (
+            int(round(self._red_slider.get())),
+            int(round(self._green_slider.get())),
+            int(round(self._blue_slider.get())),
         )
 
+        brightness = self._brightness_slider.get()
+
+        if brightness >= 0:
+            brightness_factor = 1 + (brightness / 255)
+            self._rgb = tuple(
+                min(255, int(c * brightness_factor)) for c in self._raw_rgb
+            )
+        else:
+            brightness_factor = 1 + (brightness / 255)
+            self._rgb = tuple(max(0, int(c * brightness_factor)) for c in self._raw_rgb)
+
     def update_from_animation_tab(self, value) -> None:
-        self._brightness_slider.set(value)
+        mapped_value = (value * 2) - 255
+        self._brightness_slider.set(mapped_value)
         self._update_color_from_slider()
 
     def _update_color_display(self, rgb: tuple[int, int, int]) -> None:
@@ -266,17 +276,24 @@ def _update_color_from_entry(self) -> None:
         self._update_entry_text(self._rgb)
         self._update_color_picker_hex_entry(self._rgb)
 
-    def update_rgb_from_hex(self, hex_code) -> None:
+    def update_rgb_from_hex(self, hex_code, brightness: int = None) -> None:
         hex_code = hex_code.lstrip("#")
         self._rgb = tuple(int(hex_code[i : i + 2], 16) for i in (0, 2, 4))
+        self._raw_rgb = self._rgb
 
         self._update_color_display(self._rgb)
         self._update_entry_text(self._rgb)
 
         self._red_slider.set(self._rgb[0])
         self._green_slider.set(self._rgb[1])
         self._blue_slider.set(self._rgb[2])
-        self._brightness_slider.set(255)
+
+        if brightness is not None:
+            mapped_brightness = (brightness * 2) - 255
+            self._brightness_slider.set(mapped_brightness)
+        else:
+            self._brightness_slider.set(0)
+
         self.update_command(self._rgb)
 
     def _update_color_picker_hex_entry(self, rgb: tuple[int, int, int]) -> None:
@@ -287,7 +304,8 @@ def _update_color_picker_hex_entry(self, rgb: tuple[int, int, int]) -> None:
 
     def _update_single_led(self, rgb: tuple[int, int, int]) -> None:
         if hasattr(self._master, "_single_led_display"):
-            self._master.change_single_led_color(self.convert_rgb_to_hex(rgb=rgb))
+            brightness_value = int(((self._brightness_slider.get() + 255) / 2))
+            self._master.change_single_led_color(rgb, brightness_value)
 
     def update_command(self, rgb: tuple[int, int, int]) -> None:
         self._master.command = f"ledOn?r={rgb[0]}&g={rgb[1]}&b={rgb[2]}"
@@ -298,4 +316,4 @@ def rgb(self) -> tuple[int, int, int]:
 
     @property
     def brightness_slider_value(self) -> float:
-        return self._brightness_slider.get()
+        return (self._brightness_slider.get() + 255) / 2

desktop_app/GUI/ColorTab/__pycache__/color_picker_rgb.cpython-312.pyc

@@ -20,7 +20,10 @@ def __init__(
         self._master = master
         self._top_menu_bar = self._master.top_menu_bar
         self._arduino_manager = self._master.arduino_manager
-        self._content_frame = ctk.CTkFrame(self)
+        self._content_frame = ctk.CTkFrame(
+            self,
+            fg_color="gray20",
+        )
         self._content_frame.grid_rowconfigure((0, 1), weight=1)
         self._content_frame.grid_columnconfigure(0, weight=1)
 

desktop_app/GUI/ColorTab/color_picker_rgb.py

@@ -85,7 +85,7 @@ def _post(self) -> None:
             self._master.top_menu_bar.active_tab, "_save_arduino_single_led_setting"
         ):
             self._master.top_menu_bar.active_tab._save_arduino_single_led_setting(
-                url.replace(f"http://{arduino.ip_address}/", ""), arduino
+                arduino
             )
 
         self._save_last_command(arduino, url)

desktop_app/GUI/DeviceTab/__pycache__/loading_frame.cpython-312.pyc

@@ -0,0 +1,37 @@
+import customtkinter as ctk
+
+
+class LED(ctk.CTkFrame):
+    def __init__(
+        self, master, rgb: tuple[int, int, int], brightness: int, *args, **kwargs
+    ) -> None:
+        super().__init__(
+            master,
+            corner_radius=15,
+            height=50,
+            width=50,
+            border_color="black",
+            fg_color="black",
+            border_width=4,
+            *args,
+            **kwargs
+        )
+
+        self._rgb = rgb
+        self._brightness = brightness
+
+    @property
+    def rgb(self) -> tuple[int, int, int]:
+        return self._rgb
+
+    @rgb.setter
+    def rgb(self, value: int) -> None:
+        self._rgb = value
+
+    @property
+    def brightness(self) -> int:
+        return self._brightness
+
+    @brightness.setter
+    def brightness(self, value: int) -> None:
+        self._brightness = value

desktop_app/GUI/DeviceTab/loading_frame.py

@@ -39,11 +39,18 @@ def __init__(self, master, top_menu_bar, *args, **kwargs) -> None:
             pady=SingleLEDControllTab._PADY,
         )
 
-    def change_single_led_color(self, value: str) -> None:
+    def change_single_led_color(
+        self, rgb: tuple[int, int, int], brightness: int
+    ) -> None:
         if self._single_led_display.led is None:
             return
 
-        self._single_led_display.led.configure(True, fg_color=value)
+        self._single_led_display.led.rgb = rgb
+        self._single_led_display.led.brightness = brightness
+
+        self._single_led_display.led.configure(
+            True, fg_color=self._color_picker_rgb.convert_rgb_to_hex(rgb)
+        )
         self._single_led_display.update_dict(
             self._single_led_display.led, self._single_led_display.key
         )
@@ -67,12 +74,14 @@ def update_command(self, value: dict) -> None:
 
         self._command = f"singleLED?singleLED={ziped_list}"
 
-    def _save_arduino_single_led_setting(self, value, arduino: Arduino) -> None:
+    def _save_arduino_single_led_setting(self, arduino: Arduino) -> None:
         if not self._options_menu.get() in self._options_menu.device_map:
             return
 
-        arduino.single_led = ast.literal_eval(value.replace("singleLED?singleLED=", ""))
+        arduino.single_led = ast.literal_eval(
+            self._command.replace("singleLED?singleLED=", "")
+        )
 
         self._options_menu.arduino_manager.update_arduino(
-            arduino, arduino.single_led, "single_led"
+            arduino, arduino.single_led, "_single_led"
         )

desktop_app/GUI/Menus/__pycache__/bot_menu_bar.cpython-312.pyc

@@ -5,6 +5,7 @@
 from ArduinoBackend.arduino import Arduino
 from GUI.ColorTab.color_picker_rgb import ColorPickerRGB
 from GUI.Menus.options_menu import OptionsMenu
+from GUI.SingleLEDControllTab.led import LED
 
 
 class SingleLEDDisplay(ctk.CTkFrame):
@@ -83,15 +84,7 @@ def draw_leds(self) -> None:
             if i % self._elements_per_row == 0:
                 row += 1
 
-            led = ctk.CTkFrame(
-                self._content_frame,
-                corner_radius=15,
-                height=50,
-                width=50,
-                border_color="black",
-                fg_color="black",
-                border_width=4,
-            )
+            led = LED(self._content_frame, (0, 0, 0), brightness=255)
             led.bind(
                 "<Button-1>", lambda event, led=led, key=i: self._on_click_led(led, key)
             )
@@ -132,10 +125,11 @@ def _on_click_led(self, led: ctk.CTkFrame, key: int) -> None:
             self._led.configure(True, border_color="black")
 
         led.configure(True, border_color="gray25")
-        self._led = led
+        self._led: LED = led
         self._key = key
         self._color_picker_rgb.update_rgb_from_hex(
-            "#000000" if self._led._fg_color == "black" else self._led._fg_color
+            "#000000" if self._led._fg_color == "black" else self._led._fg_color,
+            self._led.brightness,
         )
 
     def _request_led_count(self) -> None:
@@ -164,7 +158,7 @@ def update_dict(self, led: ctk.CTkFrame, key: int) -> None:
         self._master.update_command(self._led_dict)
 
     @property
-    def led(self) -> ctk.CTkFrame:
+    def led(self) -> LED:
         return self._led
 
     @property