Merge remote-tracking branch 'upstream/main'

2025-07-27 16:55:33 +01:00
parent 33bc6165c6 49c5118dde
commit b85e407afd
3 changed files with 21 additions and 15 deletions
--- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml
+++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml
@@ -32,17 +32,17 @@ blueprint:
      selector:
        device:
          filter:
-            - integration: zha
-              manufacturer: IKEA of Sweden
-              model: TRADFRI on/off switch
            - integration: zha
              manufacturer: IKEA of Sweden
              model: RODRET Dimmer
+            - integration: zha
+              manufacturer: IKEA of Sweden
+              model: RODRET wireless dimmer
            - integration: zha
              manufacturer: IKEA of Sweden
              model: SOMRIG shortcut button
-            - integration: mqtt
-              manufacturer: IKEA
+            - integration: zha
+              manufacturer: IKEA of Sweden
              model: TRADFRI on/off switch
            - integration: mqtt
              manufacturer: IKEA
@@ -50,10 +50,9 @@ blueprint:
            - integration: mqtt
              manufacturer: IKEA
              model: SOMRIG shortcut button
-            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
            - integration: mqtt
              manufacturer: IKEA
-              model: TRADFRI on/off switch (E1743)
+              model: TRADFRI on/off switch
            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
            - integration: mqtt
              manufacturer: IKEA
@@ -62,6 +61,10 @@ blueprint:
            - integration: mqtt
              manufacturer: IKEA
              model: SOMRIG shortcut button (E2213)
+            # DEPRECATED - for removal, keeping for z2m v1 backward compatibility
+            - integration: mqtt
+              manufacturer: IKEA
+              model: TRADFRI on/off switch (E1743)
          multiple: true
    light:
      name: Light