fix(HueDimmerController): Fix ZHA mapping

related to #110
xaviml · Aug 8, 2020 · b0f55de · b0f55de
1 parent 0274db5
commit b0f55de
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 7 deletions.
diff --git a/apps/controllerx/cx_devices/philips.py b/apps/controllerx/cx_devices/philips.py
@@ -42,15 +42,23 @@ def get_deconz_actions_mapping(self) -> TypeActionsMapping:
 
     def get_zha_actions_mapping(self) -> TypeActionsMapping:
         return {
-            "on": Light.ON,
-            "step_0_30_9": Light.CLICK_BRIGHTNESS_UP,
-            "step_0_56_9": Light.HOLD_BRIGHTNESS_UP,
-            "step_1_30_9": Light.CLICK_BRIGHTNESS_DOWN,
-            "step_1_56_9": Light.HOLD_BRIGHTNESS_DOWN,
-            "off_with_effect_0_0": Light.OFF,
-            "stop": Light.RELEASE,
+            "off_long_release": Light.RELEASE,
+            "off_hold": Light.HOLD_COLOR_DOWN,
+            "off_short_release": Light.OFF,
+            "down_long_release": Light.RELEASE,
+            "down_hold": Light.HOLD_BRIGHTNESS_DOWN,
+            "down_short_release": Light.CLICK_BRIGHTNESS_DOWN,
+            "up_long_release": Light.RELEASE,
+            "up_hold": Light.HOLD_BRIGHTNESS_UP,
+            "up_short_release": Light.CLICK_BRIGHTNESS_UP,
+            "on_long_release": Light.RELEASE,
+            "on_hold": Light.HOLD_COLOR_UP,
+            "on_short_release": Light.ON,
         }
 
+    def get_zha_action(self, data: dict) -> str:
+        return data["command"]
+
 
 class Niko91004LightController(LightController):
     def get_deconz_actions_mapping(self) -> TypeActionsMapping:

diff --git a/docs/_data/controllers/E1744.yml b/docs/_data/controllers/E1744.yml
@@ -49,3 +49,6 @@ integrations:
       - "toggle 🠖 1 click"
       - "step_0_1_0 🠖 2 click"
       - "step_1_1_0 🠖 3 click"
+note: >-
+  If you want to use the default controller, you will need to set `legacy: false` in the Zigbee2MQTT configuration.
+  Read more in <a href="https://www.zigbee2mqtt.io/devices/E1744.html#legacy-integration">here</a>.
diff --git a/tests/cx_devices/phillips_test.py b/tests/cx_devices/phillips_test.py
@@ -0,0 +1,16 @@
+import pytest
+from cx_devices.philips import HueDimmerController
+
+
+@pytest.mark.parametrize(
+    "data, expected_action",
+    [
+        ({"command": "on_long_release"}, "on_long_release"),
+        ({"command": "down_press"}, "down_press"),
+        ({"command": "off_hold"}, "off_hold"),
+    ],
+)
+def test_zha_action_HueDimmerController(data, expected_action):
+    sut = HueDimmerController()
+    action = sut.get_zha_action(data)
+    assert action == expected_action