Add more devices via zigbee2mqtt

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

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
+            - type: custom:battery-entity
-            #   entity: sensor.master_bedroom_switch_power
+              entity: sensor.bathroom_switch_battery
-            # - type: custom:battery-entity
-            #   entity: sensor.bathroom_switch_power
             # - 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
+                - type: divider
-              cards:
+                - sensor.guest_bedroom_weather_lqi
-                - type: entities
+                - sensor.router_1_lqi
-                  entities:
+
-                    - sensor.zigbee2mqtt_devices_count
+            - type: entities
-                    - script.zigbee2mqtt_get_device_count
+              entities:
-                - type: custom:zigbee2mqtt-networkmap
+                - sensor.zigbee2mqtt_devices_count
-                  entity: sensor.zigbee2mqtt_networkmap
+                - script.zigbee2mqtt_get_device_count

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

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
+      platform: mqtt
-      event_type: zha_event
+      topic: "zigbee2mqtt/bathroom_switch"
-      event_data:
+    condition:
-        device_ieee: !secret bathroom_switch_ieee
+      - condition: state
-        command: single
+        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
+      platform: mqtt
-      event_type: zha_event
+      topic: "zigbee2mqtt/bathroom_switch"
-      event_data:
+    condition:
-        device_ieee: !secret bathroom_switch_ieee
+      - condition: state
-        command: double
+        entity_id: sensor.bathroom_switch_click
+        state: 'double'
     action:
       - service: media_player.volume_set
         entity_id: media_player.bathroom

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"

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 }}"

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: