Update color space definition

Author: Breina

custom_components/dmx/entity/light/light_controller.py

@@ -1,12 +1,12 @@
 from typing import Dict, Any
 
 from custom_components.dmx.entity.light import ChannelType
-from custom_components.dmx.entity.light.light_state import LightState
+from custom_components.dmx.entity.light.light_state import LuvLightState
 from custom_components.dmx.io.dmx_io import DmxUniverse
 
 
 class LightController:
-    def __init__(self, state: LightState, universe: DmxUniverse):
+    def __init__(self, state: LuvLightState, universe: DmxUniverse):
         self.state = state
         self.universe = universe
         self.is_updating = False
@@ -44,21 +44,23 @@ async def _apply_updates(self, updates: Dict[ChannelType, int]):
     def _collect_updates_from_kwargs(self, kwargs: Dict[str, Any]) -> Dict[ChannelType, int]:
         updates = {}
 
-        if "brightness" in kwargs:
-            brightness = kwargs["brightness"]
-            updates.update(self.state.get_scaled_brightness_updates(brightness))
-
         if "rgb_color" in kwargs and self.state.has_rgb():
             r, g, b = kwargs["rgb_color"]
+            # Update the internal L*u*v* state
+            self.state.update_rgb(r, g, b)
             updates.update({ChannelType.RED: r, ChannelType.GREEN: g, ChannelType.BLUE: b})
 
         if "rgbw_color" in kwargs:
             r, g, b, w = kwargs["rgbw_color"]
+            # Update the internal L*u*v* state
+            self.state.update_rgbw(r, g, b, w)
             updates.update({ChannelType.RED: r, ChannelType.GREEN: g, ChannelType.BLUE: b, ChannelType.WARM_WHITE: w})
 
         if "rgbww_color" in kwargs:
             r, g, b, cw, ww = kwargs["rgbww_color"]
-            updates.update({ChannelType.RED: r, ChannelType.GREEN: g, ChannelType.BLUE: b,ChannelType.COLD_WHITE: cw, ChannelType.WARM_WHITE: ww})
+            # Update the internal L*u*v* state
+            self.state.update_rgbww(r, g, b, cw, ww)
+            updates.update({ChannelType.RED: r, ChannelType.GREEN: g, ChannelType.BLUE: b, ChannelType.COLD_WHITE: cw, ChannelType.WARM_WHITE: ww})
 
         if "color_temp_kelvin" in kwargs:
             kelvin = kwargs["color_temp_kelvin"]
@@ -71,6 +73,12 @@ def _collect_updates_from_kwargs(self, kwargs: Dict[str, Any]) -> Dict[ChannelTy
                 cw, ww = self.state.converter.temp_to_cw_ww(kelvin, brightness)
                 updates.update({ChannelType.COLD_WHITE: cw, ChannelType.WARM_WHITE: ww})
 
+        if "brightness" in kwargs:
+            brightness = kwargs["brightness"]
+            # Treat brightness as L* value and update accordingly
+            self.state.update_brightness(brightness)
+            updates.update(self.state.get_scaled_brightness_updates(brightness))
+
         return updates
 
     def _restore_previous_state(self) -> Dict[ChannelType, int]:
@@ -94,7 +102,7 @@ def _restore_previous_state(self) -> Dict[ChannelType, int]:
     def _capture_current_state(self) -> dict:
         return {
             'brightness': self.state.brightness,
-            'rgb': self.state.rgb,
+            'luv_color': self.state.luv_color,
             'cold_white': self.state.cold_white,
             'warm_white': self.state.warm_white,
             'color_temp_kelvin': self.state.color_temp_kelvin,
@@ -103,8 +111,8 @@ def _capture_current_state(self) -> dict:
 
     def _save_last_state(self, s: dict):
         self.state.last_brightness = s['brightness']
-        self.state.last_rgb = s['rgb']
+        self.state.set_last_luv_color(s['luv_color'])
         self.state.last_cold_white = s['cold_white']
         self.state.last_warm_white = s['warm_white']
         self.state.last_color_temp_kelvin = s['color_temp_kelvin']
-        self.state.last_color_temp_dmx = s['color_temp_dmx']
+        self.state.last_color_temp_dmx = s['color_temp_dmx']

custom_components/dmx/entity/light/light_entity.py

@@ -12,7 +12,7 @@
 from custom_components.dmx.entity.light import ChannelMapping, ChannelType
 from custom_components.dmx.entity.light.color_converter import ColorConverter
 from custom_components.dmx.entity.light.light_controller import LightController
-from custom_components.dmx.entity.light.light_state import LightState
+from custom_components.dmx.entity.light.light_state import LuvLightState
 from custom_components.dmx.io.dmx_io import DmxUniverse
 
 log = logging.getLogger(__name__)
@@ -53,7 +53,7 @@ def __init__(
         converter = ColorConverter(min_kelvin, max_kelvin)
 
         self.channel_map = {ch.channel_type: ch for ch in channels}
-        self._state = LightState(color_mode, converter, self.channel_map)
+        self._state = LuvLightState(color_mode, converter, self.channel_map)
         self._controller = LightController(self._state, universe)
 
         self._has_separate_dimmer = has_separate_dimmer
@@ -144,17 +144,19 @@ async def async_added_to_hass(self):
 
         if "brightness" in attrs:
             brightness = attrs["brightness"]
-            self._state.brightness = brightness
+            # Treat restored brightness as L* value
+            self._state.update_brightness(brightness)
             self._state.last_brightness = brightness
 
         if "rgb_color" in attrs:
             rgb = attrs["rgb_color"]
-            self._state.rgb = rgb
+            # Update L*u*v* state from restored RGB
+            self._state.update_rgb(*rgb)
             self._state.last_rgb = rgb
 
         if "color_temp" in attrs:
             color_temp = attrs["color_temp"]
-            self._state.color_temp_kelvin = color_temp
+            self._state.update_color_temp_kelvin(color_temp)
             self._state.last_color_temp_kelvin = color_temp
 
         # For color temp mode without dimmer, restore CW/WW values if available
@@ -165,7 +167,6 @@ async def async_added_to_hass(self):
             brightness = attrs["brightness"] or 100
             color_temp = attrs["color_temp"] or (self.min_color_temp_kelvin + self.max_color_temp_kelvin) / 2
             cold, warm = self._state.converter.temp_to_cw_ww(color_temp, brightness)
-            self._state.cold_white = cold
-            self._state.warm_white = warm
+            self._state.update_whites(cold, warm)
             self._state.last_cold_white = cold
-            self._state.last_warm_white = warm
+            self._state.last_warm_white = warm