From 4e78b2f4ecfd755884c88fefd9bbbece82d55766 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Wed, 24 Jun 2020 22:38:36 +0300 Subject: [PATCH] Add more devices via zigbee2mqtt --- config/advanced-lovelace.yaml | 1 + .../advanced_dashboard/10_system.yaml | 23 ++++----- .../advanced_dashboard/14_zigbeemap.yaml | 8 +++ .../devices/bathroom/bathroom_switch.yaml | 51 +++++++++++++++---- config/packages/devices/bedroom/bed_led.yaml | 4 +- config/packages/modules/climate/climate.yaml | 37 ++++++++++++++ config/packages/modules/network.yaml | 7 +++ 7 files changed, 107 insertions(+), 24 deletions(-) create mode 100644 config/lovelace/advanced_dashboard/14_zigbeemap.yaml diff --git a/config/advanced-lovelace.yaml b/config/advanced-lovelace.yaml index 01d2f41..2e56d20 100644 --- a/config/advanced-lovelace.yaml +++ b/config/advanced-lovelace.yaml @@ -20,3 +20,4 @@ views: - !include lovelace/advanced_dashboard/10_system.yaml - !include lovelace/advanced_dashboard/12_test.yaml - !include lovelace/advanced_dashboard/13_dev.yaml + - !include lovelace/advanced_dashboard/14_zigbeemap.yaml diff --git a/config/lovelace/advanced_dashboard/10_system.yaml b/config/lovelace/advanced_dashboard/10_system.yaml index 22f1162..adc63d8 100644 --- a/config/lovelace/advanced_dashboard/10_system.yaml +++ b/config/lovelace/advanced_dashboard/10_system.yaml @@ -77,10 +77,8 @@ cards: entity: sensor.bedside_switch_battery - type: custom:battery-entity entity: sensor.bedroom_wall_switch_battery - # - type: custom:battery-entity - # entity: sensor.master_bedroom_switch_power - # - type: custom:battery-entity - # entity: sensor.bathroom_switch_power + - type: custom:battery-entity + entity: sensor.bathroom_switch_battery # - type: custom:battery-entity # entity: sensor.cube_power - type: vertical-stack @@ -104,14 +102,15 @@ cards: - sensor.kitchen_motion_lqi - type: divider - sensor.bathroom_weather_lqi + - sensor.bathroom_switch_lqi - sensor.front_door_lqi - sensor.hallway_weather_lqi - sensor.hallway_motion_lqi - - type: custom:vertical-stack-in-card - cards: - - type: entities - entities: - - sensor.zigbee2mqtt_devices_count - - script.zigbee2mqtt_get_device_count - - type: custom:zigbee2mqtt-networkmap - entity: sensor.zigbee2mqtt_networkmap + - type: divider + - sensor.guest_bedroom_weather_lqi + - sensor.router_1_lqi + + - type: entities + entities: + - sensor.zigbee2mqtt_devices_count + - script.zigbee2mqtt_get_device_count diff --git a/config/lovelace/advanced_dashboard/14_zigbeemap.yaml b/config/lovelace/advanced_dashboard/14_zigbeemap.yaml new file mode 100644 index 0000000..b937d1b --- /dev/null +++ b/config/lovelace/advanced_dashboard/14_zigbeemap.yaml @@ -0,0 +1,8 @@ +title: Zigbee +path: zigbee +icon: "mdi:z-wave" +panel: true +cards: + - type: custom:zigbee2mqtt-networkmap + entity: sensor.zigbee2mqtt_networkmap + height: 800 diff --git a/config/packages/devices/bathroom/bathroom_switch.yaml b/config/packages/devices/bathroom/bathroom_switch.yaml index 2a9dd9b..c514f36 100644 --- a/config/packages/devices/bathroom/bathroom_switch.yaml +++ b/config/packages/devices/bathroom/bathroom_switch.yaml @@ -1,11 +1,41 @@ +sensor: + - platform: mqtt + name: "Bathroom switch click" + state_topic: "zigbee2mqtt/bathroom_switch" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:toggle-switch" + value_template: "{{ value_json.click }}" + - platform: mqtt + name: "Bathroom switch battery" + state_topic: "zigbee2mqtt/bathroom_switch" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "%" + device_class: "battery" + value_template: "{{ value_json.battery }}" + - platform: mqtt + name: "Bathroom switch action" + state_topic: "zigbee2mqtt/bathroom_switch" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:gesture-double-tap" + value_template: "{{ value_json.action }}" + - platform: mqtt + name: "Bathroom switch LQI" + state_topic: "zigbee2mqtt/bathroom_switch" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:signal" + unit_of_measurement: "lqi" + value_template: "{{ value_json.linkquality }}" + + automation: - alias: Media · Sonos · Volume up on bathroom switch click trigger: - platform: event - event_type: zha_event - event_data: - device_ieee: !secret bathroom_switch_ieee - command: single + platform: mqtt + topic: "zigbee2mqtt/bathroom_switch" + condition: + - condition: state + entity_id: sensor.bathroom_switch_click + state: 'single' action: - service: media_player.volume_set entity_id: media_player.bathroom @@ -20,11 +50,12 @@ automation: - alias: Youtube · play latest pds on bathroom switch dobule click trigger: - platform: event - event_type: zha_event - event_data: - device_ieee: !secret bathroom_switch_ieee - command: double + platform: mqtt + topic: "zigbee2mqtt/bathroom_switch" + condition: + - condition: state + entity_id: sensor.bathroom_switch_click + state: 'double' action: - service: media_player.volume_set entity_id: media_player.bathroom diff --git a/config/packages/devices/bedroom/bed_led.yaml b/config/packages/devices/bedroom/bed_led.yaml index ff9a515..cf01bf7 100644 --- a/config/packages/devices/bedroom/bed_led.yaml +++ b/config/packages/devices/bedroom/bed_led.yaml @@ -1,5 +1,5 @@ light: - - platform: "mqtt" + - platform: mqtt name: "Bed LED" state_topic: "zigbee2mqtt/bed_led" availability_topic: "zigbee2mqtt/bridge/state" @@ -11,7 +11,7 @@ light: brightness_scale: 254 sensor: - - platform: "mqtt" + - platform: mqtt name: "Bed LED LQI" state_topic: "zigbee2mqtt/bed_led" availability_topic: "zigbee2mqtt/bridge/state" diff --git a/config/packages/modules/climate/climate.yaml b/config/packages/modules/climate/climate.yaml index ec22ee9..94a94a2 100644 --- a/config/packages/modules/climate/climate.yaml +++ b/config/packages/modules/climate/climate.yaml @@ -167,3 +167,40 @@ sensor: icon: "mdi:signal" unit_of_measurement: "lqi" value_template: "{{ value_json.linkquality }}" + + # Guest bedroom weather sensor + - platform: mqtt + name: "Guest bedroom weather temperature" + state_topic: "zigbee2mqtt/guest_bedroom_weather" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "°C" + device_class: "temperature" + value_template: "{{ value_json.temperature }}" + - platform: mqtt + name: "Guest bedroom weather humidity" + state_topic: "zigbee2mqtt/guest_bedroom_weather" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "%" + device_class: "humidity" + value_template: "{{ value_json.humidity }}" + - platform: mqtt + name: "Guest bedroom weather pressure" + state_topic: "zigbee2mqtt/guest_bedroom_weather" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "hPa" + device_class: "pressure" + value_template: "{{ value_json.pressure }}" + - platform: mqtt + name: "Guest bedroom weather battery" + state_topic: "zigbee2mqtt/guest_bedroom_weather" + availability_topic: "zigbee2mqtt/bridge/state" + unit_of_measurement: "%" + device_class: "battery" + value_template: "{{ value_json.battery }}" + - platform: mqtt + name: "Guest bedroom weather LQI" + state_topic: "zigbee2mqtt/guest_bedroom_weather" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:signal" + unit_of_measurement: "lqi" + value_template: "{{ value_json.linkquality }}" diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml index fe0dcc9..61ff0cf 100644 --- a/config/packages/modules/network.yaml +++ b/config/packages/modules/network.yaml @@ -123,6 +123,13 @@ sensor: state_topic: "zigbee2mqtt/bridge/config/devices" value_template: "{{ value_json | count }}" icon: "mdi:counter" + - platform: mqtt + name: "Router 1 LQI" + state_topic: "zigbee2mqtt/router_1" + availability_topic: "zigbee2mqtt/bridge/state" + icon: "mdi:signal" + unit_of_measurement: "lqi" + value_template: "{{ value_json.linkquality }}" script: zigbee2mqtt_get_device_count: