From a7b3f68c075ce0a6c110576c4cba6c229947d034 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Sat, 18 Dec 2021 12:48:37 +0200 Subject: [PATCH] Add new hue lights --- .../advanced_dashboard/02_lights.yaml | 11 +- .../modules/lighting/areas/kitchen.yaml | 6 +- .../modules/lighting/setup/groups.yaml | 35 +--- .../packages/modules/lighting/setup/hue.yaml | 139 +++++++++++++- .../packages/modules/lighting/setup/mqtt.yaml | 176 ++---------------- 5 files changed, 156 insertions(+), 211 deletions(-) diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml index a8c9bcf..dca0767 100644 --- a/config/lovelace/advanced_dashboard/02_lights.yaml +++ b/config/lovelace/advanced_dashboard/02_lights.yaml @@ -157,16 +157,14 @@ cards: entities: - light.kitchen - type: divider - - light.kitchen_main - type: custom:fold-entity-row entity: light.kitchen_main name: Main lights entities: - - light.ledvance_1 + - light.hue_ambiance_6 - light.neo_1 - light.neo_2 - type: divider - - light.kitchen_secondary - type: custom:fold-entity-row entity: light.kitchen_secondary name: Secondary lights @@ -226,7 +224,6 @@ cards: - update: binary_sensor.hue_white_2_update_available - type: divider - - light.hallway_main - type: custom:fold-entity-row entity: light.hallway_main name: Main lights @@ -234,9 +231,9 @@ cards: - type: custom:decluttering-card template: light_with_update_and_lqi variables: - - light: light.hue_white_3 - - lqi: sensor.hue_white_3_lqi - - update: binary_sensor.hue_white_3_update_available + - light: light.hue_ambiance_5 + - lqi: sensor.hue_ambiance_5_lqi + - update: binary_sensor.hue_ambiance_5_update_available - type: custom:decluttering-card template: light_with_update_and_lqi variables: diff --git a/config/packages/modules/lighting/areas/kitchen.yaml b/config/packages/modules/lighting/areas/kitchen.yaml index 1bce8c1..62a5b7d 100644 --- a/config/packages/modules/lighting/areas/kitchen.yaml +++ b/config/packages/modules/lighting/areas/kitchen.yaml @@ -42,7 +42,7 @@ automation: default: - service: light.turn_on entity_id: - - light.ledvance_1 + - light.hue_ambiance_6 - light.hue_ambiance_1 - light.browser_kitchen data: @@ -65,13 +65,13 @@ automation: # Turn off in Night Mode - service: light.turn_on entity_id: - - light.ledvance_1 + - light.hue_ambiance_6 - light.hue_ambiance_1 data: brightness_pct: 100 - service: light.turn_off entity_id: - - light.ledvance_1 + - light.hue_ambiance_6 - light.hue_ambiance_1 - light.kitchen_main - light.kitchen_secondary diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml index f148600..60cc5cc 100644 --- a/config/packages/modules/lighting/setup/groups.yaml +++ b/config/packages/modules/lighting/setup/groups.yaml @@ -4,12 +4,14 @@ light: state_topic: "z2m_deconz/light_hallway_main" availability_topic: "z2m_deconz/bridge/state" brightness: true - color_temp: false + color_temp: true xy: false hs: false schema: "json" command_topic: "z2m_deconz/light_hallway_main/set" brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 - platform: "mqtt" name: "Hallway entrance" @@ -106,39 +108,12 @@ light: - light.bedside - light.bed_led - # - platform: group - # name: Kitchen main - # entities: - # - light.ledvance_1 - # - light.neo_2 - # - light.neo_1 - - # - platform: group - # name: Kitchen secondary - # entities: - # - light.hue_ambiance_1 - # - light.hue_ambiance_2 - # - light.hue_ambiance_3 - # - light.hue_ambiance_4 - - platform: group name: Kitchen entities: - light.kitchen_main - light.kitchen_secondary - # - platform: group - # name: Hallway entrance - # entities: - # - light.hue_white_1 - # - light.hue_white_2 - - # - platform: group - # name: Hallway main - # entities: - # - light.hue_white_3 - # - light.hue_1 - - platform: group name: Hallway entities: @@ -188,7 +163,7 @@ automation: payload: "" - service: mqtt.publish data: - topic: "z2m_deconz/ledvance_1/get" + topic: "z2m_deconz/hue_ambiance_6/get" payload: "" - alias: Lighting ยท Sync Kitchen Secondary states @@ -222,7 +197,7 @@ automation: - delay: "00:00:03" - service: mqtt.publish data: - topic: "z2m_deconz/hue_white_3/get" + topic: "z2m_deconz/hue_ambiance_5/get" payload: "" - service: mqtt.publish data: diff --git a/config/packages/modules/lighting/setup/hue.yaml b/config/packages/modules/lighting/setup/hue.yaml index a19254b..b3243fc 100644 --- a/config/packages/modules/lighting/setup/hue.yaml +++ b/config/packages/modules/lighting/setup/hue.yaml @@ -24,15 +24,27 @@ light: brightness_scale: 254 - platform: "mqtt" - name: "hue_white_3" - state_topic: "z2m_deconz/hue_white_3" + name: "hue_white_5" + state_topic: "z2m_deconz/hue_white_5" availability_topic: "z2m_deconz/bridge/state" brightness: true color_temp: false xy: false hs: false schema: "json" - command_topic: "z2m_deconz/hue_white_3/set" + command_topic: "z2m_deconz/hue_white_5/set" + brightness_scale: 254 + + - platform: "mqtt" + name: "hue_white_6" + state_topic: "z2m_deconz/hue_white_6" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: false + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/hue_white_6/set" brightness_scale: 254 - platform: "mqtt" @@ -131,6 +143,49 @@ light: - "channel_change" - "finish_effect" + - platform: "mqtt" + name: "hue_ambiance_5" + state_topic: "z2m_deconz/hue_ambiance_5" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/hue_ambiance_5/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + effect: true + effect_list: + - "blink" + - "breathe" + - "okay" + - "channel_change" + - "finish_effect" + + + - platform: "mqtt" + name: "hue_ambiance_6" + state_topic: "z2m_deconz/hue_ambiance_6" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/hue_ambiance_6/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + effect: true + effect_list: + - "blink" + - "breathe" + - "okay" + - "channel_change" + - "finish_effect" + - platform: "mqtt" name: "hue_1" state_topic: "z2m_deconz/hue_1" @@ -272,19 +327,35 @@ sensor: value_template: "{{ value_json['update']['state'] }}" - platform: "mqtt" - name: "hue_white_3_lqi" - state_topic: "z2m_deconz/hue_white_3" + name: "hue_white_5_lqi" + state_topic: "z2m_deconz/hue_white_5" availability_topic: "z2m_deconz/bridge/state" value_template: "{{ value_json.linkquality }}" unit_of_measurement: "lqi" icon: "mdi:signal" - platform: "mqtt" - name: "hue_white_3_update_state" - state_topic: "z2m_deconz/hue_white_3" + name: "hue_white_5_update_state" + state_topic: "z2m_deconz/hue_white_5" availability_topic: "z2m_deconz/bridge/state" icon: "mdi:update" value_template: "{{ value_json['update']['state'] }}" + + - platform: "mqtt" + name: "hue_white_6_lqi" + state_topic: "z2m_deconz/hue_white_6" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "hue_white_6_update_state" + state_topic: "z2m_deconz/hue_white_6" + availability_topic: "z2m_deconz/bridge/state" + icon: "mdi:update" + value_template: "{{ value_json['update']['state'] }}" + + - platform: "mqtt" name: "pc_lqi" state_topic: "z2m_deconz/hue_white_4" @@ -355,6 +426,34 @@ sensor: icon: "mdi:update" value_template: "{{ value_json['update']['state'] }}" + - platform: "mqtt" + name: "hue_ambiance_5_lqi" + state_topic: "z2m_deconz/hue_ambiance_5" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "hue_ambiance_5_update_state" + state_topic: "z2m_deconz/hue_ambiance_5" + availability_topic: "z2m_deconz/bridge/state" + icon: "mdi:update" + value_template: "{{ value_json['update']['state'] }}" + + - platform: "mqtt" + name: "hue_ambiance_6_lqi" + state_topic: "z2m_deconz/hue_ambiance_6" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "hue_ambiance_6_update_state" + state_topic: "z2m_deconz/hue_ambiance_6" + availability_topic: "z2m_deconz/bridge/state" + icon: "mdi:update" + value_template: "{{ value_json['update']['state'] }}" + - platform: "mqtt" name: "hue_1_lqi" state_topic: "z2m_deconz/hue_1" @@ -442,8 +541,15 @@ binary_sensor: payload_off: false value_template: "{{ value_json.update_available}}" - platform: "mqtt" - name: "hue_white_3_update_available" - state_topic: "z2m_deconz/hue_white_3" + name: "hue_white_5_update_available" + state_topic: "z2m_deconz/hue_white_5" + availability_topic: "z2m_deconz/bridge/state" + payload_on: true + payload_off: false + value_template: "{{ value_json.update_available}}" + - platform: "mqtt" + name: "hue_white_6_update_available" + state_topic: "z2m_deconz/hue_white_6" availability_topic: "z2m_deconz/bridge/state" payload_on: true payload_off: false @@ -484,6 +590,21 @@ binary_sensor: payload_on: true payload_off: false value_template: "{{ value_json.update_available}}" + - platform: "mqtt" + name: "hue_ambiance_5_update_available" + state_topic: "z2m_deconz/hue_ambiance_5" + availability_topic: "z2m_deconz/bridge/state" + payload_on: true + payload_off: false + value_template: "{{ value_json.update_available}}" + - platform: "mqtt" + name: "hue_ambiance_6_update_available" + state_topic: "z2m_deconz/hue_ambiance_6" + availability_topic: "z2m_deconz/bridge/state" + payload_on: true + payload_off: false + value_template: "{{ value_json.update_available}}" + - platform: "mqtt" name: "hue_1_update_available" diff --git a/config/packages/modules/lighting/setup/mqtt.yaml b/config/packages/modules/lighting/setup/mqtt.yaml index 5185126..3290ea5 100644 --- a/config/packages/modules/lighting/setup/mqtt.yaml +++ b/config/packages/modules/lighting/setup/mqtt.yaml @@ -1,29 +1,4 @@ light: - # - platform: mqtt - # name: "light_hama_1" - # state_topic: "stat/light_hama_1/RESULT" - # state_value_template: "{{ value_json.POWER }}" - # command_topic: "cmnd/light_hama_1/POWER" - # payload_on: "ON" - # payload_off: "OFF" - # availability_topic: "tele/light_hama_1/LWT" - # payload_available: "Online" - # payload_not_available: "Offline" - # on_command_type: "brightness" - # brightness_command_topic: "cmnd/light_hama_1/Dimmer" - # brightness_state_topic: "tele/light_hama_1/STATE" - # brightness_scale: 100 - # brightness_value_template: "{{ value_json.Dimmer }}" - # color_temp_command_topic: "cmnd/light_hama_1/CT" - # color_temp_state_topic: "tele/light_hama_1/STATE" - # color_temp_value_template: "{{ value_json.CT }}" - # rgb_command_topic: "cmnd/light_hama_1/Color" - # rgb_state_topic: "tele/light_hama_1/STATE" - # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - # rgb_value_template: "{{ (value_json.Color[0]|int(base=16),value_json.Color[1]|int(base=16),value_json.Color[2]|int(base=16)) | join(',')}}" - # qos: 1 - # retain: false - - platform: mqtt name: "light_le_1" state_topic: "tele/light_le_1/STATE" @@ -140,89 +115,6 @@ light: effect_value_template: "{{value_json.Scheme}}" effect_list: [0, 1, 2, 3, 4] - # - platform: mqtt - # name: "light_lohas_3" - # state_topic: "tele/light_lohas_3/STATE" - # state_value_template: "{{ value_json.POWER }}" - # command_topic: "cmnd/light_lohas_3/POWER" - # payload_on: "ON" - # payload_off: "OFF" - # availability_topic: "tele/light_lohas_3/LWT" - # payload_available: "Online" - # payload_not_available: "Offline" - # on_command_type: "brightness" - # brightness_command_topic: "cmnd/light_lohas_3/Dimmer" - # brightness_state_topic: "tele/light_lohas_3/STATE" - # brightness_scale: 100 - # brightness_value_template: "{{ value_json.Dimmer }}" - # hs_command_topic: "cmnd/light_lohas_3/HSBColor" - # hs_state_topic: "tele/light_lohas_3/STATE" - # hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" - # color_temp_command_topic: "cmnd/light_lohas_3/CT" - # color_temp_state_topic: "tele/light_lohas_3/STATE" - # color_temp_value_template: "{{ value_json.CT }}" - # rgb_command_topic: "cmnd/light_lohas_3/Color" - # rgb_state_topic: "tele/light_lohas_3/STATE" - # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" - # qos: 1 - # retain: false - - # - platform: mqtt - # name: "light_lohas_4" - # state_topic: "tele/light_lohas_4/STATE" - # state_value_template: "{{ value_json.POWER }}" - # command_topic: "cmnd/light_lohas_4/POWER" - # payload_on: "ON" - # payload_off: "OFF" - # availability_topic: "tele/light_lohas_4/LWT" - # payload_available: "Online" - # payload_not_available: "Offline" - # on_command_type: "brightness" - # brightness_command_topic: "cmnd/light_lohas_4/Dimmer" - # brightness_state_topic: "tele/light_lohas_4/STATE" - # brightness_scale: 100 - # brightness_value_template: "{{ value_json.Dimmer }}" - # hs_command_topic: "cmnd/light_lohas_4/HSBColor" - # hs_state_topic: "tele/light_lohas_4/STATE" - # hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" - # color_temp_command_topic: "cmnd/light_lohas_4/CT" - # color_temp_state_topic: "tele/light_lohas_4/STATE" - # color_temp_value_template: "{{ value_json.CT }}" - # rgb_command_topic: "cmnd/light_lohas_4/Color" - # rgb_state_topic: "tele/light_lohas_4/STATE" - # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" - # qos: 1 - # retain: false - - # - platform: mqtt - # name: "light_lohas_5" - # state_topic: "tele/light_lohas_5/STATE" - # state_value_template: "{{ value_json.POWER }}" - # command_topic: "cmnd/light_lohas_5/POWER" - # payload_on: "ON" - # payload_off: "OFF" - # availability_topic: "tele/light_lohas_5/LWT" - # payload_available: "Online" - # payload_not_available: "Offline" - # on_command_type: "brightness" - # brightness_command_topic: "cmnd/light_lohas_5/Dimmer" - # brightness_state_topic: "tele/light_lohas_5/STATE" - # brightness_scale: 100 - # brightness_value_template: "{{ value_json.Dimmer }}" - # hs_command_topic: "cmnd/light_lohas_5/HSBColor" - # hs_state_topic: "tele/light_lohas_5/STATE" - # hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" - # color_temp_command_topic: "cmnd/light_lohas_5/CT" - # color_temp_state_topic: "tele/light_lohas_5/STATE" - # color_temp_value_template: "{{ value_json.CT }}" - # rgb_command_topic: "cmnd/light_lohas_5/Color" - # rgb_state_topic: "tele/light_lohas_5/STATE" - # rgb_value_template: "{{ value_json.Color.split(',')[0:3]|join(',') }}" - # qos: 1 - # retain: false - - platform: mqtt name: "light_lohas_6" state_topic: "tele/light_lohas_6/STATE" @@ -270,16 +162,6 @@ light: min_mireds: 150 sensor: - # - platform: mqtt - # name: "light_hama_1_wifi" - # availability_topic: "tele/light_hama_1/LWT" - # device_class: signal_strength - # payload_available: "Online" - # payload_not_available: "Offline" - # state_topic: "tele/light_hama_1/STATE" - # unit_of_measurement: "%" - # value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt name: "light_le_1_wifi" availability_topic: "tele/light_le_1/LWT" @@ -330,26 +212,6 @@ sensor: unit_of_measurement: "%" value_template: "{{ value_json.Wifi.RSSI }}" - # - platform: mqtt - # name: "light_lohas_3_wifi" - # availability_topic: "tele/light_lohas_3/LWT" - # device_class: signal_strength - # payload_available: "Online" - # payload_not_available: "Offline" - # state_topic: "tele/light_lohas_3/STATE" - # unit_of_measurement: "%" - # value_template: "{{ value_json.Wifi.RSSI }}" - - # - platform: mqtt - # name: "light_lohas_4_wifi" - # availability_topic: "tele/light_lohas_4/LWT" - # device_class: signal_strength - # payload_available: "Online" - # payload_not_available: "Offline" - # state_topic: "tele/light_lohas_4/STATE" - # unit_of_measurement: "%" - # value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt name: "light_lohas_6_wifi" availability_topic: "tele/light_lohas_6/LWT" @@ -371,17 +233,6 @@ sensor: ## Switch switch: - # - platform: mqtt - # name: "light_hama_1_fade" - # availability_topic: "tele/light_hama_1/LWT" - # command_topic: "cmnd/light_hama_1/FADE" - # icon: mdi:gradient - # payload_available: "Online" - # payload_not_available: "Offline" - # qos: 1 - # state_topic: "stat/light_hama_1/RESULT" - # value_template: "{{ value_json.Fade }}" - - platform: mqtt name: "light_le_1_fade" availability_topic: "tele/light_le_1/LWT" @@ -448,17 +299,6 @@ switch: state_topic: "tele/light_lohas_3/STATE" value_template: "{{ value_json.Fade }}" - # - platform: mqtt - # name: "light_lohas_4_fade" - # availability_topic: "tele/light_lohas_4/LWT" - # command_topic: "cmnd/light_lohas_4/FADE" - # icon: mdi:gradient - # payload_available: "Online" - # payload_not_available: "Offline" - # qos: 1 - # state_topic: "stat/light_lohas_4/RESULT" - # value_template: "{{ value_json.Fade }}" - - platform: mqtt name: "light_lohas_6_fade" availability_topic: "tele/light_lohas_6/LWT" @@ -498,11 +338,15 @@ automation: payload: "" - service: mqtt.publish data: - topic: "z2m_deconz/hue_white_3/get" + topic: "z2m_deconz/hue_white_4/get" payload: "" - service: mqtt.publish data: - topic: "z2m_deconz/hue_white_4/get" + topic: "z2m_deconz/hue_white_5/get" + payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/hue_white_6/get" payload: "" - service: mqtt.publish data: @@ -520,6 +364,14 @@ automation: data: topic: "z2m_deconz/hue_ambiance_4/get" payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/hue_ambiance_5/get" + payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/hue_ambiance_6/get" + payload: "" - service: mqtt.publish data: topic: "z2m_deconz/hue_1/get"