From ac4ac54c04d2a0a1413fdd138ad8a3ca3f995af4 Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 18 Apr 2025 14:15:04 +0200 Subject: [PATCH 1/6] fix: use device id for zha double press actions (#27) --- ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml index b3633dd..66d515a 100644 --- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml +++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml @@ -314,6 +314,7 @@ variables: off_double_press_exposed: !input off_double_press_exposed remote_devices: !input remote_devices remote_devices_names: "{{ remote_devices | map('device_attr', 'name') | list }}" + zha_device_id: "{{ trigger.event.data.device_id }}" condition: - condition: template value_template: >- @@ -345,7 +346,7 @@ actions: - trigger: event event_type: zha_event event_data: - device_id: "{{ remote_device }}" + device_id: "{{ zha_device_id }}" command: "on" cluster_id: 6 endpoint_id: 1 @@ -398,7 +399,7 @@ actions: - trigger: event event_type: zha_event event_data: - device_id: "{{ remote_device }}" + device_id: "{{ zha_device_id }}" command: "off" cluster_id: 6 endpoint_id: 1 From a018c70e93722c4bd027400afcab6993da059327 Mon Sep 17 00:00:00 2001 From: Damien Date: Fri, 18 Apr 2025 14:21:37 +0200 Subject: [PATCH 2/6] fix: use zha device id for to trigger release on hold actions (#28) --- ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml index 66d515a..f715fee 100644 --- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml +++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml @@ -469,7 +469,7 @@ actions: - trigger: event event_type: zha_event event_data: - device_id: "{{ remote_device }}" + device_id: "{{ zha_device_id }}" command: "stop_with_on_off" cluster_id: 8 endpoint_id: 1 @@ -527,7 +527,7 @@ actions: - trigger: event event_type: zha_event event_data: - device_id: "{{ remote_device }}" + device_id: "{{ zha_device_id }}" command: "stop_with_on_off" cluster_id: 8 endpoint_id: 1 From 1b131138fe0434f5ae8978a869915bb2a64f96b3 Mon Sep 17 00:00:00 2001 From: Jonathan Merlevede Date: Mon, 21 Apr 2025 09:36:17 +0200 Subject: [PATCH 3/6] fix: remove dependency on zha device id when using z2m (#29) --- ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml index f715fee..4910f45 100644 --- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml +++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml @@ -314,7 +314,7 @@ variables: off_double_press_exposed: !input off_double_press_exposed remote_devices: !input remote_devices remote_devices_names: "{{ remote_devices | map('device_attr', 'name') | list }}" - zha_device_id: "{{ trigger.event.data.device_id }}" + zha_device_id: "{{ trigger.event.data.device_id if is_zha }}" condition: - condition: template value_template: >- From c871ca820b102eec2f5064c61e306e901f7f441c Mon Sep 17 00:00:00 2001 From: Damien Date: Thu, 24 Apr 2025 10:23:52 +0200 Subject: [PATCH 4/6] chore: update CODEOWNERS --- .github/CODEOWNERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 2f61c46..d8dd4ab 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -@damru \ No newline at end of file +* @damru From 50f1bd966e775405b8f1bdabeeacd119ca73591b Mon Sep 17 00:00:00 2001 From: Damian Karzon Date: Sat, 3 May 2025 15:03:33 +1000 Subject: [PATCH 5/6] chore: add filter for RODRET wireless dimmer with different model name (#30) --- ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml index 4910f45..cc1fd47 100644 --- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml +++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml @@ -36,6 +36,9 @@ blueprint: - 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 From 49c5118dded3d3b06f510cea230805c5849ac0ed Mon Sep 17 00:00:00 2001 From: Damien Rubio Date: Thu, 10 Jul 2025 14:14:35 +0200 Subject: [PATCH 6/6] feat: add alternative Rodret name (#32) --- ...43-E2201-E2213_ZHA-Z2M_control-anything.yaml | 14 +++++++------- ...E1743-E2201-E2213_ZHA-Z2M_control-light.yaml | 17 ++++++++++------- 2 files changed, 17 insertions(+), 14 deletions(-) diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml index cc1fd47..a3cc1c1 100644 --- a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml +++ b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-anything.yaml @@ -30,9 +30,6 @@ blueprint: selector: device: filter: - - integration: zha - manufacturer: IKEA of Sweden - model: TRADFRI on/off switch - integration: zha manufacturer: IKEA of Sweden model: RODRET Dimmer @@ -42,8 +39,8 @@ blueprint: - 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 @@ -51,10 +48,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 @@ -63,6 +59,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 on_press_action: name: Press "on / 1 dot" action diff --git a/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml b/ikea_E1743-E2201-E2213_ZHA-Z2M_control-light.yaml index 447439f..9d24b29 100644 --- 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