Fix L3-5M-P control issues #1394

AlexxIT · Sep 8, 2024 · b2ee4f5 · b2ee4f5
1 parent cc10931
commit b2ee4f5
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 1 deletion.
diff --git a/custom_components/sonoff/light.py b/custom_components/sonoff/light.py
@@ -752,6 +752,14 @@ def set_state(self, params: dict):
                 None,
             )
 
+    def get_params(self, brightness, color_temp, rgb_color, effect) -> dict:
+        # fix https://github.com/AlexxIT/SonoffLAN/issues/1394
+        if brightness is not None and rgb_color is None:
+            rgb_color = self.rgb_color
+        if brightness is None and rgb_color is not None:
+            brightness = self.brightness
+        return super().get_params(brightness, color_temp, rgb_color, effect)
+
 
 B02_MODE_PAYLOADS = {
     "nightLight": {"br": 5, "ct": 0},

diff --git a/tests/test_entity.py b/tests/test_entity.py
@@ -1920,7 +1920,18 @@ def test_zbminil2():
 
 def test_1394():
     # https://github.com/AlexxIT/SonoffLAN/issues/1394
-    entities = get_entitites({"extra": {"uiid": 173}})
+    device = {
+        "extra": {"uiid": 173},
+        "params": {
+            "bright": 50,
+            "colorB": 0,
+            "colorG": 0,
+            "colorR": 255,
+            "light_type": 1,
+            "mode": 1,
+        },
+    }
+    entities = get_entitites(device)
     light: XLightL3 = entities[0]
 
     # noinspection PyTypeChecker
@@ -1936,6 +1947,26 @@ def test_1394():
         "mode": 1,
     }
 
+    await_(light.async_turn_on(brightness=255))
+    assert registry.send_args[1] == {
+        "bright": 100,
+        "colorB": 0,
+        "colorG": 0,
+        "colorR": 255,
+        "light_type": 1,
+        "mode": 1,
+    }
+
+    await_(light.async_turn_on(rgb_color=(0, 255, 0)))
+    assert registry.send_args[1] == {
+        "bright": 50,
+        "colorB": 0,
+        "colorG": 255,
+        "colorR": 0,
+        "light_type": 1,
+        "mode": 1,
+    }
+
 
 def test_snzb_03p():
     device = {