From a80c998333ab2aa50582a4bc5bb14f1e7658a9f5 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Thu, 1 Dec 2022 16:02:00 +0200 Subject: [PATCH] Fix aqara switches --- blueprints/automation/aqara_switch.yaml | 6 +++--- packages/devices/bathroom/bathroom_switch.yaml | 2 +- packages/devices/bedroom/bedside_switch.yaml | 2 +- packages/devices/bedroom/bedside_switch_2.yaml | 2 +- packages/devices/guest_bedroom/guest_bedroom_switch.yaml | 2 +- packages/devices/living_room/desk_switch.yaml | 2 +- packages/modules/lighting/temperature.yaml | 1 + 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/blueprints/automation/aqara_switch.yaml b/blueprints/automation/aqara_switch.yaml index fd6d53e..0071420 100644 --- a/blueprints/automation/aqara_switch.yaml +++ b/blueprints/automation/aqara_switch.yaml @@ -16,11 +16,11 @@ trigger: action: - choose: - - conditions: "{{ trigger.payload_json.click == 'single' }}" + - conditions: "{{ trigger.payload == 'single' }}" sequence: !input click - - conditions: "{{ trigger.payload_json.click == 'double' }}" + - conditions: "{{ trigger.payload == 'double' }}" sequence: !input double_click - - conditions: "{{ trigger.payload_json.action == 'hold' }}" + - conditions: "{{ trigger.payload == 'hold' }}" sequence: !input hold diff --git a/packages/devices/bathroom/bathroom_switch.yaml b/packages/devices/bathroom/bathroom_switch.yaml index 3dfff0a..67403ba 100644 --- a/packages/devices/bathroom/bathroom_switch.yaml +++ b/packages/devices/bathroom/bathroom_switch.yaml @@ -26,7 +26,7 @@ automation: use_blueprint: path: aqara_switch.yaml input: - z2m_topic: "z2m_deconz/bathroom_switch" + z2m_topic: "z2m_deconz/bathroom_switch/action" click: - service: media_player.volume_set entity_id: media_player.bathroom diff --git a/packages/devices/bedroom/bedside_switch.yaml b/packages/devices/bedroom/bedside_switch.yaml index 65e7e6c..2afbb33 100644 --- a/packages/devices/bedroom/bedside_switch.yaml +++ b/packages/devices/bedroom/bedside_switch.yaml @@ -18,7 +18,7 @@ automation: use_blueprint: path: aqara_switch.yaml input: - z2m_topic: "z2m_deconz/bedside_switch" + z2m_topic: "z2m_deconz/bedside_switch/action" click: - service: light.toggle data_template: diff --git a/packages/devices/bedroom/bedside_switch_2.yaml b/packages/devices/bedroom/bedside_switch_2.yaml index ad9870e..57c4f96 100644 --- a/packages/devices/bedroom/bedside_switch_2.yaml +++ b/packages/devices/bedroom/bedside_switch_2.yaml @@ -19,7 +19,7 @@ automation: use_blueprint: path: aqara_switch.yaml input: - z2m_topic: "z2m_deconz/bedroom_wall_switch" + z2m_topic: "z2m_deconz/bedroom_wall_switch/action" click: - service: light.toggle data_template: diff --git a/packages/devices/guest_bedroom/guest_bedroom_switch.yaml b/packages/devices/guest_bedroom/guest_bedroom_switch.yaml index 100d626..7e88d58 100644 --- a/packages/devices/guest_bedroom/guest_bedroom_switch.yaml +++ b/packages/devices/guest_bedroom/guest_bedroom_switch.yaml @@ -23,7 +23,7 @@ # use_blueprint: # path: aqara_switch.yaml # input: -# z2m_topic: "z2m_deconz/bedroom_wall_switch" +# z2m_topic: "z2m_deconz/bedroom_wall_switch/action" # click: # - choose: # - conditions: diff --git a/packages/devices/living_room/desk_switch.yaml b/packages/devices/living_room/desk_switch.yaml index 07b6f69..e96b0fa 100644 --- a/packages/devices/living_room/desk_switch.yaml +++ b/packages/devices/living_room/desk_switch.yaml @@ -19,7 +19,7 @@ automation: use_blueprint: path: aqara_switch.yaml input: - z2m_topic: "z2m_deconz/desk_switch" + z2m_topic: "z2m_deconz/desk_switch/action" click: - service: light.toggle data_template: diff --git a/packages/modules/lighting/temperature.yaml b/packages/modules/lighting/temperature.yaml index 87d38d9..3b6b38e 100644 --- a/packages/modules/lighting/temperature.yaml +++ b/packages/modules/lighting/temperature.yaml @@ -11,6 +11,7 @@ automation: mode: parallel trigger: platform: state + to: "on" entity_id: - light.living_room_main - light.pc