Merge pull request #3211 from bramstroker/feat/white-mode

Add support for white color mode

Author: bramstroker

custom_components/powercalc/strategy/lut.py

@@ -244,6 +244,8 @@ async def get_selected_color_mode(self, attrs: Mapping[str, Any], supported_mode
             color_mode = ColorMode(str(attrs.get(ATTR_COLOR_MODE, ColorMode.UNKNOWN)))
         except ValueError:
             color_mode = ColorMode.UNKNOWN
+        if color_mode == ColorMode.WHITE:
+            return ColorMode.BRIGHTNESS
         if color_mode == ColorMode.UNKNOWN:
             return color_mode
         if color_mode in COLOR_MODES_COLOR:

tests/strategy/test_lut.py

@@ -131,6 +131,28 @@ async def test_effect_lut(hass: HomeAssistant, effect: str, brightness: int, exp
     )
 
 
+async def test_color_mode_white(hass: HomeAssistant) -> None:
+    """Test LUT lookup in effect mode"""
+    strategy = await _create_lut_strategy(
+        hass,
+        "test",
+        "test",
+        custom_profile_dir=get_test_profile_dir("lut_white"),
+    )
+    await _calculate_and_assert_power(
+        strategy,
+        state=State(
+            "light.test",
+            STATE_ON,
+            {
+                ATTR_COLOR_MODE: ColorMode.WHITE,
+                ATTR_BRIGHTNESS: 10,
+            },
+        ),
+        expected_power=10,
+    )
+
+
 async def test_effect_mode_unsupported(hass: HomeAssistant) -> None:
     """
     Test light is set in effect mode, but effect is not supported by the profile.

tests/testing_config/powercalc_profiles/lut_white/brightness.csv

@@ -0,0 +1,4 @@
+1,1
+10,10,
+100,100
+255,255

tests/testing_config/powercalc_profiles/lut_white/model.json

@@ -0,0 +1,15 @@
+{
+  "measure_description": "Measured with utils/measure script",
+  "measure_device": "xx",
+  "measure_method": "script",
+  "measure_settings": {
+    "SAMPLE_COUNT": 2,
+    "SLEEP_TIME": 3,
+    "VERSION": "v1.9.8:docker"
+  },
+  "name": "Test",
+  "standby_power": 0.3,
+  "calculation_strategy": "lut",
+  "created_at": "2023-12-06T18:41:16",
+  "author": "test"
+}

utils/measure/measure/controller/light/const.py

@@ -9,6 +9,7 @@ class LutMode(str, Enum):
     COLOR_TEMP = "color_temp"
     BRIGHTNESS = "brightness"
     EFFECT = "effect"
+    WHITE = "white"
 
 
 class LightControllerType(str, Enum):

utils/measure/measure/controller/light/hass.py

@@ -39,6 +39,7 @@ def change_light_state(
             LutMode.COLOR_TEMP: self.build_ct_json_body,
             LutMode.BRIGHTNESS: self.build_bri_json_body,
             LutMode.EFFECT: self.build_effect_json_body,
+            LutMode.WHITE: self.build_white_json_body,
         }.get(lut_mode, self.build_bri_json_body)(**kwargs)
 
         try:
@@ -117,6 +118,12 @@ def build_effect_json_body(self, bri: int, effect: str) -> dict:
             "brightness": bri,
         }
 
+    def build_white_json_body(self, bri: int) -> dict:
+        return {
+            "entity_id": self._entity_id,
+            "white": bri,
+        }
+
     @staticmethod
     def kelvin_to_mired(kelvin_temperature: float) -> int:
         """Convert degrees kelvin to mired shift."""

utils/measure/measure/runner/light.py

@@ -95,6 +95,9 @@ def run(self, answers: dict[str, Any], export_directory: str) -> RunnerResult |
     def prepare_measurements_for_mode(self, export_directory: str, mode: LutMode) -> MeasurementRunInput:
         """Fetch all variations for the given color mode and prepare the measurement session."""
 
+        if mode == LutMode.WHITE:
+            mode = LutMode.BRIGHTNESS
+
         csv_file_path = f"{export_directory}/{mode.value}.csv"
 
         resume_at = None
@@ -119,6 +122,14 @@ def run_mode(
         """Run the measurement session for lights"""
 
         mode = measurement_info.mode
+        if mode == LutMode.WHITE:
+            self.light_controller.change_light_state(
+                mode,
+                on=True,
+                bri=255,
+            )
+            mode = LutMode.BRIGHTNESS
+
         file_write_mode = "w"
         write_header_row = True
         if measurement_info.is_resuming: