Review Zigbee2mqtt due to big changes of software

diff --git a/.storage/lovelace.lovelace_settings b/.storage/lovelace.lovelace_settings
index 416976520398d9a92f38f169d5e09d508404c470..0f89af617a3466f520d837e7a736b20489d2d30a 100644 (file)
--- a/.storage/lovelace.lovelace_settings
+++ b/.storage/lovelace.lovelace_settings
@@ -1,5 +1,6 @@
 {
     "version": 1,
+    "minor_version": 1,
     "key": "lovelace.lovelace_settings",
     "data": {
         "config": {
@@ -221,10 +222,15 @@
                                         "background": "#62717b"
                                     }
                                 },
-                                "switch.zigbee2mqtt_abilita_join",
+                                {
+                                    "entity": "switch.zigbee2mqtt_abilita_join"
+                                },
                                 {
                                     "entity": "timer.zigbee_permit_join"
                                 },
+                                {
+                                    "entity": "input_number.zigbee2mqtt_join_minutes"
+                                },
                                 {
                                     "type": "divider",
                                     "style": {
@@ -257,6 +263,9 @@
                                 {
                                     "entity": "input_text.zigbee2mqtt_remove"
                                 },
+                                {
+                                    "entity": "input_boolean.zigbee2mqtt_force_remove"
+                                },
                                 {
                                     "entity": "script.zigbee2mqtt_remove"
                                 },
@@ -270,7 +279,9 @@
                                         "background": "#62717b"
                                     }
                                 },
-                                "input_select.zigbee2mqtt_log_level"
+                                {
+                                    "entity": "input_select.zigbee2mqtt_log_level"
+                                }
                             ],
                             "show_header_toggle": false,
                             "title": "Operazioni Sistema Zigbee2mqtt",

diff --git a/.storage/lovelace_resources b/.storage/lovelace_resources
index 705613a5e29c1ddc2ff23d629528c329585202c2..2ada66ed233bfbf938e312147e9b858ca5a09379 100644 (file)
--- a/.storage/lovelace_resources
+++ b/.storage/lovelace_resources
@@ -30,7 +30,7 @@
                 "url": "/hacsfiles/hass-shutter-card/hass-shutter-card.js?hacstag=269011342130"
             },
             {
-                "url": "/hacsfiles/battery-state-card/battery-state-card.js?hacstag=256292682201",
+                "url": "/hacsfiles/battery-state-card/battery-state-card.js?hacstag=256292682202",
                 "type": "module",
                 "id": "74408ca439a142a1838d883c03a0142c"
             },

diff --git a/packages/zigbee2mqtt.yaml b/packages/zigbee2mqtt.yaml
index f9780569edcc105bd0f0d4e9ce2e99a7428f03c8..723b33b80848a32f1d36138788cf377e1a0b63a2 100644 (file)
--- a/packages/zigbee2mqtt.yaml
+++ b/packages/zigbee2mqtt.yaml
@@ -1,3 +1,119 @@
+######################################################################\r
+# Zigbee2mqtt Package - Input select\r
+######################################################################\r
+\r
+input_select:\r
+  # Zigbee2mqtt log level\r
+  zigbee2mqtt_log_level:\r
+    name: "Zigbee2MQTT: Log Level"\r
+    options:\r
+      - debug\r
+      - info\r
+      - warn\r
+      - error\r
+    initial: info\r
+    icon: mdi:format-list-bulleted\r
+\r
+######################################################################\r
+# Zigbee2mqtt Package - Input Number\r
+######################################################################\r
+\r
+# Input number for joining time remaining (in minutes)\r
+input_number:\r
+  zigbee2mqtt_join_minutes:\r
+    name: "Zigbee2MQTT: Tempo per il join"\r
+    initial: 2\r
+    min: 1\r
+    max: 5\r
+    step: 1\r
+    mode: slider\r
+\r
+######################################################################\r
+# Zigbee2mqtt Package - Input Text\r
+######################################################################\r
+\r
+input_text:\r
+  zigbee2mqtt_old_name:\r
+    name: "Device da Rinominare"\r
+    initial: ""\r
+\r
+  zigbee2mqtt_new_name:\r
+    name: "Nuovo nome Device"\r
+    initial: ""\r
+\r
+  zigbee2mqtt_remove:\r
+    name: "Device da Rimuovere"\r
+    initial: ""\r
+\r
+######################################################################\r
+# Zigbee2mqtt Package - Input boolean\r
+######################################################################\r
+\r
+input_boolean:\r
+  zigbee2mqtt_force_remove:\r
+    name: "Zigbee2MQTT: Rimozione Forzata"\r
+    initial: false\r
+    icon: mdi:alert-remove\r
+\r
+######################################################################\r
+# Zigbee2mqtt Package - Script\r
+######################################################################\r
+\r
+script:\r
+  ######################################################################\r
+  # Restart Bridge\r
+  ######################################################################\r
+  zigbee2mqtt_restart:\r
+    alias: "Zigbee2MQTT: Riavvia Bridge"\r
+    sequence:\r
+      - service: shell_command.zigbee2mqtt_restart\r
+        data:\r
+          docker_host: !secret docker_host\r
+          docker_username: !secret docker_username\r
+    icon: mdi:restart\r
+\r
+  ######################################################################\r
+  # Rename Device\r
+  ######################################################################\r
+  zigbee2mqtt_rename:\r
+    alias: "Zigbee2MQTT: Rinomina Device"\r
+    sequence:\r
+      service: mqtt.publish\r
+      data_template:\r
+        topic: zigbee2mqtt/bridge/request/device/rename\r
+        payload_template: >-\r
+          {\r
+            "from": "{{ states.input_text.zigbee2mqtt_old_name.state | string }}",\r
+            "to": "{{ states.input_text.zigbee2mqtt_new_name.state | string }}"\r
+          }\r
+    icon: mdi:form-textbox\r
+\r
+  ######################################################################\r
+  # Delete Device\r
+  ######################################################################\r
+  zigbee2mqtt_remove:\r
+    alias: "Zigbee2MQTT: Rimuovi Device"\r
+    sequence:\r
+      service: mqtt.publish\r
+      data_template:\r
+        topic: zigbee2mqtt/bridge/request/device/remove\r
+        payload_template: >-\r
+          {\r
+            "id": "{{ states.input_text.zigbee2mqtt_remove.state | string }}",\r
+            "force": {% if states.input_boolean.zigbee2mqtt_force_remove.state == "off" %}false{% else %}true{% endif %}\r
+          }\r
+    icon: mdi:link-variant-remove\r
+\r
+######################################################################\r
+# Zigbee2mqtt Package - Timer\r
+######################################################################\r
+\r
+timer:\r
+  # Timer for joining time remaining (120 sec = 2 min)\r
+  zigbee_permit_join:\r
+    name: Tempo rimasto per il join\r
+    duration: 120\r
+\r
 ######################################################################\r
 # Zigbee2mqtt Package - Sensor\r
 ######################################################################\r
@@ -7,52 +123,61 @@ sensor:
   # Sensor for monitoring the bridge state\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Stato Bridge"\r
+    name: "Zigbee2MQTT: Stato Bridge"\r
     state_topic: "zigbee2mqtt/bridge/state"\r
     icon: mdi:router-wireless\r
 \r
   ######################################################################\r
-  # Sensor for monitoring the permit_join state\r
+  # Sensor for Showing the Zigbee2MQTT Version\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Stato permit join"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
-    value_template: "{{ value_json.permit_join }}"\r
-    icon: mdi:link-lock\r
+    name: "Zigbee2MQTT: Versione Bridge"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: "{{ value_json.version }}"\r
+    icon: mdi:zigbee\r
 \r
   ######################################################################\r
-  # Sensor for monitoring the log_level state\r
+  # Sensor for Showing the Coordinator Type\r
+  ######################################################################\r
+  #- platform: mqtt\r
+  #  name: "Zigbee2MQTT: Tipo Coordinator"\r
+  #  state_topic: "zigbee2mqtt/bridge/info"\r
+  #  value_template: "{{ value_json.coordinator.type }}"\r
+  #  icon: mdi:chip\r
+\r
+  ######################################################################\r
+  # Sensor for Showing the Coordinator Version\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Stato log level"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
-    value_template: "{{ value_json.log_level }}"\r
-    icon: mdi:file-document-outline\r
+    name: "Zigbee2MQTT: Versione Coordinator"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: "{{ value_json.coordinator.meta.revision }}"\r
+    icon: mdi:chip\r
 \r
   ######################################################################\r
-  # Sensor for Showing the Zigbee2mqtt Version\r
+  # Sensor for monitoring the permit_join state\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Versione Bridge"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
-    value_template: "{{ value_json.version }}"\r
-    icon: mdi:zigbee\r
+    name: "Zigbee2MQTT: Stato permit join"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: "{{ value_json.permit_join }}"\r
+    icon: mdi:link-lock\r
 \r
   ######################################################################\r
-  # Sensor for Showing the Coordinator Version\r
+  # Sensor for monitoring the log_level state\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Versione Coordinator"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
-    value_template: "{{ value_json.coordinator.meta.revision }}"\r
-    icon: mdi:chip\r
+    name: "Zigbee2MQTT: Stato log level"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: "{{ value_json.log_level }}"\r
+    icon: mdi:file-document-outline\r
 \r
   ######################################################################\r
   # Sensor for Showing the Channel\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Canale"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
+    name: "Zigbee2MQTT: Canale"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
     value_template: "{{ value_json.network.channel }}"\r
     icon: mdi:access-point-network\r
 \r
@@ -60,9 +185,9 @@ sensor:
   # Sensor for Showing the PanID\r
   ######################################################################\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: PanID"\r
-    state_topic: "zigbee2mqtt/bridge/config"\r
-    value_template: "{{ value_json.network.panID }}"\r
+    name: "Zigbee2MQTT: PanID"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: "{{ value_json.network.pan_id }}"\r
     icon: mdi:lan\r
 \r
   ######################################################################\r
@@ -70,15 +195,15 @@ sensor:
   ######################################################################\r
   #- platform: mqtt\r
   #  name: "Zigbee2mqtt: Extended PanID"\r
-  #  state_topic: "zigbee2mqtt/bridge/config"\r
-  #  value_template: "{{ value_json.network.extendedPanID }}"\r
+  #  state_topic: "zigbee2mqtt/bridge/info"\r
+  #  value_template: "{{ value_json.network.extended_pan_id }}"\r
   #  icon: mdi:lan\r
 \r
   ######################################################################\r
   # Zigbee2mqtt Networkmap\r
   ######################################################################\r
   - platform: mqtt\r
-    name: Zigbee2mqtt Networkmap\r
+    name: Zigbee2MQTT Networkmap\r
     state_topic: zigbee2mqtt/bridge/response/networkmap\r
     value_template: >-\r
       {{ now().strftime('%Y-%m-%d %H:%M:%S') }}\r
@@ -92,51 +217,13 @@ sensor:
 switch:\r
   # Switch for enabling joining\r
   - platform: mqtt\r
-    name: "Zigbee2mqtt: Abilita join"\r
-    state_topic: "zigbee2mqtt/bridge/config/permit_join"\r
-    command_topic: "zigbee2mqtt/bridge/config/permit_join"\r
+    name: "Zigbee2MQTT: Abilita join"\r
+    state_topic: "zigbee2mqtt/bridge/info"\r
+    value_template: '{{ value_json.permit_join | lower }}'\r
+    command_topic: "zigbee2mqtt/bridge/request/permit_join"\r
     payload_on: "true"\r
     payload_off: "false"\r
-\r
-######################################################################\r
-# Zigbee2mqtt Package - Input select\r
-######################################################################\r
-\r
-input_select:\r
-  # Zigbee2mqtt log level\r
-  zigbee2mqtt_log_level:\r
-    name: "Zigbee2mqtt Log Level"\r
-    options:\r
-      - debug\r
-      - info\r
-      - warn\r
-      - error\r
-    initial: info\r
-    icon: mdi:format-list-bulleted\r
-\r
-######################################################################\r
-# Zigbee2mqtt Package - Input Text\r
-######################################################################\r
-\r
-input_text:\r
-  zigbee2mqtt_old_name:\r
-    name: "Device da Rinominare"\r
-\r
-  zigbee2mqtt_new_name:\r
-    name: "Nuovo nome Device"\r
-\r
-  zigbee2mqtt_remove:\r
-    name: "Device da Rimuovere"\r
-\r
-######################################################################\r
-# Zigbee2mqtt Package - Timer\r
-######################################################################\r
-\r
-timer:\r
-  # Timer for joining time remaining (120 sec = 2 min)\r
-  zigbee_permit_join:\r
-    name: Tempo rimasto per il join\r
-    duration: 120\r
+    icon: mdi:link-lock\r
 \r
 ######################################################################\r
 # Zigbee2mqtt Package - Shell Command\r
@@ -145,48 +232,6 @@ timer:
 shell_command:\r
   zigbee2mqtt_restart: 'ssh {{ docker_username }}@{{ docker_host }} -oStrictHostKeyChecking=no -i /config/credentials/id_rsa docker container restart zigbee2mqtt'\r
 \r
-######################################################################\r
-# Zigbee2mqtt Package - Script\r
-######################################################################\r
-\r
-script:\r
-  ######################################################################\r
-  # Restart Bridge\r
-  ######################################################################\r
-  zigbee2mqtt_restart:\r
-    alias: "Zigbee2mqtt: Riavvia Bridge"\r
-    sequence:\r
-      - service: shell_command.zigbee2mqtt_restart\r
-        data:\r
-          docker_host: !secret docker_host\r
-          docker_username: !secret docker_username\r
-\r
-  ######################################################################\r
-  # Rename Device\r
-  ######################################################################\r
-  zigbee2mqtt_rename:\r
-    alias: "Zigbee2mqtt: Rinomina Device"\r
-    sequence:\r
-      service: mqtt.publish\r
-      data_template:\r
-        topic: zigbee2mqtt/bridge/config/rename\r
-        payload_template: >-\r
-          {\r
-            "old": "{{ states.input_text.zigbee2mqtt_old_name.state | string }}",\r
-            "new": "{{ states.input_text.zigbee2mqtt_new_name.state | string }}"\r
-          }\r
-\r
-  ######################################################################\r
-  # Delete Device\r
-  ######################################################################\r
-  zigbee2mqtt_remove:\r
-    alias: "Zigbee2mqtt: Rimuovi Device"\r
-    sequence:\r
-      service: mqtt.publish\r
-      data_template:\r
-        topic: zigbee2mqtt/bridge/config/remove\r
-        payload_template: "{{ states.input_text.zigbee2mqtt_remove.state | string }}"\r
-\r
 ######################################################################\r
 # Zigbee2mqtt Package - Automation\r
 ######################################################################\r
@@ -196,7 +241,7 @@ automation:
   # Automation to change log level\r
   ######################################################################\r
   - id: zigbee2mqtt_change_log_level\r
-    alias: "Zigbee2mqtt: Cambia Log Level"\r
+    alias: "Zigbee2MQTT: Cambia Log Level"\r
     trigger:\r
       platform: state\r
       entity_id: input_select.zigbee2mqtt_log_level\r
@@ -204,13 +249,13 @@ automation:
       - service: mqtt.publish\r
         data:\r
           payload_template: "{{ states('input_select.zigbee2mqtt_log_level') }}"\r
-          topic: zigbee2mqtt/bridge/config/log_level\r
+          topic: zigbee2mqtt/bridge/request/config/log_level\r
 \r
   ######################################################################\r
   # Automation to start timer when enable join is turned on\r
   ######################################################################\r
   - id: zigbee2mqtt_join_enabled\r
-    alias: "Zigbee2mqtt: Abilita Join"\r
+    alias: "Zigbee2MQTT: Abilita Join"\r
     trigger:\r
       platform: state\r
       entity_id: switch.zigbee2mqtt_abilita_join\r
@@ -218,12 +263,14 @@ automation:
     action:\r
       service: timer.start\r
       entity_id: timer.zigbee_permit_join\r
+      data_template:\r
+        duration: "{{ '00:0%i:00' % (states('input_number.zigbee2mqtt_join_minutes') | int ) }}"\r
 \r
   ######################################################################\r
   # Automation to stop timer when switch turned off and turn off switch when timer finished\r
   ######################################################################\r
   - id: zigbee2mqtt_join_disabled\r
-    alias: "Zigbee2mqtt: Disabilita Join"\r
+    alias: "Zigbee2MQTT: Disabilita Join"\r
     trigger:\r
       - platform: event\r
         event_type: timer.finished\r
@@ -243,24 +290,27 @@ automation:
   # Automation to notify when a device joined zigbee2mqtt network\r
   ######################################################################\r
   - id: "zigbee2mqtt_notification_on_successfull_interview"\r
-    alias: "Zigbee2mqtt: Device aggiunto alla rete Zigbee2mqtt"\r
+    alias: "Zigbee2MQTT: Device aggiunto alla rete Zigbee2mqtt"\r
     trigger:\r
       platform: mqtt\r
-      topic: 'zigbee2mqtt/bridge/log'\r
-    condition: '{{trigger.payload_json.type == "pairing" and trigger.payload_json.message == "interview_successful"}}'\r
+      topic: 'zigbee2mqtt/bridge/event'\r
+    condition:\r
+      condition: template\r
+      value_template: '{{trigger.payload_json.type == "device_interview" and trigger.payload_json.data.status == "successful" and trigger.payload_json.data.supported}}'\r
     action:\r
       - service: persistent_notification.create\r
         data_template:\r
           title: "Device aggiunto alla rete Zigbee2mqtt"\r
-          message: "Name: {{trigger.payload_json.meta.friendly_name}},\r
-                    Vendor: {{trigger.payload_json.meta.vendor}},\r
-                    Description: {{trigger.payload_json.meta.description}}"\r
+          message: "Name: {{trigger.payload_json.data.friendly_name}},\r
+                    Vendor: {{trigger.payload_json.data.definition.vendor}},\r
+                    Model: {{trigger.payload_json.data.definition.model}},\r
+                    Description: {{trigger.payload_json.data.definition.description}}"\r
 \r
   ######################################################################\r
   # Automation to restart zigbee2mqtt to refresh sensor state\r
   ######################################################################\r
   - id: zigbee2mqtt_startup_automation\r
-    alias: "Zigbee2mqtt: Startup Automation"\r
+    alias: "Zigbee2MQTT: Startup Automation"\r
     trigger:\r
       - platform: homeassistant\r
         event: start\r
@@ -271,7 +321,7 @@ automation:
   # Automation to restart zigbee2mqtt in case of bridge offline for 1m\r
   ######################################################################\r
   - id: zigbee2mqtt_restart_automation\r
-    alias: "Zigbee2mqtt: Restart Automation"\r
+    alias: "Zigbee2MQTT: Restart Automation"\r
     trigger:\r
       - platform: state\r
         entity_id: sensor.zigbee2mqtt_stato_bridge\r
@@ -296,7 +346,7 @@ history:
       - sensor.zigbee2mqtt_stato_log_level\r
       - sensor.zigbee2mqtt_versione_bridge\r
       - sensor.zigbee2mqtt_versione_coordinator\r
-      #- sensor.zigbee2mqtt_nuova_versione_disponibile\r
+      - sensor.zigbee2mqtt_tipo_coordinator\r
       - sensor.zigbee2mqtt_canale\r
       - sensor.zigbee2mqtt_panid\r
       - sensor.zigbee2mqtt_extended_panid\r
@@ -315,7 +365,7 @@ logbook:
       - sensor.zigbee2mqtt_stato_log_level\r
       - sensor.zigbee2mqtt_versione_bridge\r
       - sensor.zigbee2mqtt_versione_coordinator\r
-      #- sensor.zigbee2mqtt_nuova_versione_disponibile\r
+      - sensor.zigbee2mqtt_tipo_coordinator\r
       - sensor.zigbee2mqtt_canale\r
       - sensor.zigbee2mqtt_panid\r
       - sensor.zigbee2mqtt_extended_panid\r
@@ -334,7 +384,7 @@ recorder:
       - sensor.zigbee2mqtt_stato_log_level\r
       - sensor.zigbee2mqtt_versione_bridge\r
       - sensor.zigbee2mqtt_versione_coordinator\r
-      #- sensor.zigbee2mqtt_nuova_versione_disponibile\r
+      - sensor.zigbee2mqtt_tipo_coordinator\r
       - sensor.zigbee2mqtt_canale\r
       - sensor.zigbee2mqtt_panid\r
       - sensor.zigbee2mqtt_extended_panid\r