Enabled zigbee2mqtt api integration & renamed devices according to this (device were...

diff --git a/automations/doors.yaml b/automations/doors.yaml
index d66b7efe316d0b17fa0a599a5e133c428ee7a776..f38976bb7f0d31fd1289ce4b2bba8430d9c75ece 100644 (file)
--- a/automations/doors.yaml
+++ b/automations/doors.yaml
@@ -13,7 +13,7 @@
 
   trigger:
     - platform: state
-      entity_id: binary_sensor.porta_casa
+      entity_id: binary_sensor.main_door_contact
       to: 'on'
 
   condition:

diff --git a/automations/speech.yaml b/automations/speech.yaml
index 5d9acdd5381f70218767ce621ed082db215abc08..82ba181e9d449c8d93acb7ca4a42edbbd9753a08 100644 (file)
--- a/automations/speech.yaml
+++ b/automations/speech.yaml
@@ -59,7 +59,7 @@
 #      timeout: '00:30:00'
 #      continue_on_timeout: 'false'
 
-    - wait_template: "{{ is_state('binary_sensor.porta_casa', 'on') }}"
+    - wait_template: "{{ is_state('binary_sensor.main_door_contact', 'on') }}"
       timeout: '00:30:00'
       continue_on_timeout: 'false'
 

diff --git a/binary_sensor/doors.yaml.disabled b/binary_sensor/doors.yaml.disabled
index 0ed9ae29a31ed1f801cb26874aadd0ed1f15f994..1440e07b516034da98e842d6f573a038955c49ca 100644 (file)
--- a/binary_sensor/doors.yaml.disabled
+++ b/binary_sensor/doors.yaml.disabled
@@ -3,7 +3,7 @@
 ######################################################################
 
 - platform: "mqtt"
-  name: "Porta Casa"
+  name: "main_door_contact"
   state_topic: "zigbee2mqtt/main_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   payload_on: false
@@ -16,7 +16,7 @@
 ######################################################################
 
 - platform: "mqtt"
-  name: "Porta Casa 2"
+  name: "spare_door_contact"
   state_topic: "zigbee2mqtt/spare_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   payload_on: false

diff --git a/customizations/xiaomi.yaml b/customizations/xiaomi.yaml
new file mode 100644 (file)
index 0000000..3b1c3bd
--- /dev/null
+++ b/customizations/xiaomi.yaml
@@ -0,0 +1,24 @@
+######################################################################\r
+# Customization: Xiaomi\r
+######################################################################\r
+\r
+binary_sensor.main_door_contact:\r
+  friendly_name: "Porta Casa"\r
+sensor.main_door_battery:\r
+  friendly_name: "Porta Casa: Batteria"\r
+sensor.main_door_linkquality:\r
+  friendly_name: "Porta Casa: Stato Link"\r
+  \r
+binary_sensor.spare_door_contact:\r
+  friendly_name: "Porta Casa 2"\r
+sensor.spare_door_battery:\r
+  friendly_name: "Porta Casa 2: Batteria"\r
+sensor.spare_door_linkquality:\r
+  friendly_name: "Porta Casa 2: Stato Link"\r
+\r
+sensor.wireless_switch_battery:\r
+  friendly_name: "Pulsante: Batteria"\r
+sensor.wireless_switch_click:\r
+  friendly_name: "Pulsante"\r
+sensor.wireless_switch_linkquality:\r
+  friendly_name: "Pulsante: Stato Link"\r

diff --git a/groups/doors.yaml b/groups/doors.yaml
index 263b1e37a15142d65f99cec8cb03c227176e253e..23cb0f187af3cfded6f96e01dd469c5b5f548bd4 100644 (file)
--- a/groups/doors.yaml
+++ b/groups/doors.yaml
@@ -6,4 +6,4 @@ doors:
   name: Porte
   icon: mdi:door
   entities:
-    - binary_sensor.porta_casa
+    - binary_sensor.main_door_contact

diff --git a/log/history.yaml b/log/history.yaml
index 6290e06cb3dd989631bae22a4d0bd611548a5ef2..3920dc7d3f7858be815691b80b6d73beaaf5351d 100644 (file)
--- a/log/history.yaml
+++ b/log/history.yaml
@@ -23,7 +23,7 @@ exclude:
     - sensor.hacs
     # System
     - sensor.home_assistant_current_version
-    - sensor.cert_expiry_home_giorgioravera_it
+    - sensor.cert_expiry_server_giorgioravera_it
     # Shelly
     - sensor.shelly1_status
     - sensor.shelly2_status
@@ -44,12 +44,14 @@ exclude:
     - sensor.potenza_reattiva
     - sensor.tensione
     # Zigbee2mqtt
-    - sensor.porta_casa_batteria
-    - sensor.porta_casa_stato_link
-    - sensor.porta_casa_2_batteria
-    - sensor.porta_casa_2_stato_link
-    - sensor.pulsante_batteria
-    - sensor.pulsante_stato_link
+    - sensor.main_door_battery
+    - sensor.main_door_linkquality
+    - binary_sensor.spare_door_contact
+    - sensor.spare_door_battery
+    - sensor.spare_door_linkquality
+    - sensor.wireless_switch_battery
+    - sensor.wireless_switch_click
+    - sensor.wireless_switch_linkquality
     # pfSense
     #- sensor.freebsd_router_kib_s_received
     #- sensor.freebsd_router_kib_s_sent

diff --git a/log/logbook.yaml b/log/logbook.yaml
index 93961d8dbe86d0562f3675ce0ad8101ba278c948..0014277f318a50b4690b73ed61453ae8c322f91d 100644 (file)
--- a/log/logbook.yaml
+++ b/log/logbook.yaml
@@ -23,7 +23,7 @@ exclude:
     - sensor.hacs
     # System
     - sensor.home_assistant_current_version
-    - sensor.cert_expiry_home_giorgioravera_it
+    - sensor.cert_expiry_server_giorgioravera_it
     # Shelly
     - sensor.shelly1_status
     - sensor.shelly2_status
@@ -44,12 +44,14 @@ exclude:
     - sensor.potenza_reattiva
     - sensor.tensione
     # Zigbee2mqtt
-    - sensor.porta_casa_batteria
-    - sensor.porta_casa_stato_link
-    - sensor.porta_casa_2_batteria
-    - sensor.porta_casa_2_stato_link
-    - sensor.pulsante_batteria
-    - sensor.pulsante_stato_link
+    - sensor.main_door_battery
+    - sensor.main_door_linkquality
+    - binary_sensor.spare_door_contact
+    - sensor.spare_door_battery
+    - sensor.spare_door_linkquality
+    - sensor.wireless_switch_battery
+    - sensor.wireless_switch_click
+    - sensor.wireless_switch_linkquality
     # pfSense
     #- sensor.freebsd_router_kib_s_received
     #- sensor.freebsd_router_kib_s_sent

diff --git a/log/recorder.yaml b/log/recorder.yaml
index e006b9d569c830261c98ac504f2c629ce1ac11dd..875c0c978d81b55ced257a6e14cbd4a94e311807 100644 (file)
--- a/log/recorder.yaml
+++ b/log/recorder.yaml
@@ -46,12 +46,14 @@ exclude:
     - sensor.potenza_reattiva
     - sensor.tensione
     # Zigbee2mqtt
-    - sensor.porta_casa_batteria
-    - sensor.porta_casa_stato_link
-    - sensor.porta_casa_2_batteria
-    - sensor.porta_casa_2_stato_link
-    - sensor.pulsante_batteria
-    - sensor.pulsante_stato_link
+    - sensor.main_door_battery
+    - sensor.main_door_linkquality
+    - binary_sensor.spare_door_contact
+    - sensor.spare_door_battery
+    - sensor.spare_door_linkquality
+    - sensor.wireless_switch_battery
+    - sensor.wireless_switch_click
+    - sensor.wireless_switch_linkquality
     # pfSense
     #- sensor.freebsd_router_kib_s_received
     #- sensor.freebsd_router_kib_s_sent

diff --git a/sensor/switch.yaml.disabled b/sensor/switch.yaml.disabled
deleted file mode 100644 (file)
index 135b29e..0000000
--- a/sensor/switch.yaml.disabled
+++ /dev/null
@@ -1,10 +0,0 @@
-######################################################################\r
-# WXKG01LM - Xiaomi MiJia wireless switch\r
-######################################################################\r
-\r
-- platform: "mqtt"\r
-  name: "Pulsante: Stato"\r
-  state_topic: "zigbee2mqtt/wireless_switch"\r
-  availability_topic: "zigbee2mqtt/bridge/state"\r
-  icon: "mdi:toggle-switch"\r
-  value_template: "{{ value_json.click }}"\r

diff --git a/sensor/xiaomi.yaml.disabled b/sensor/xiaomi.yaml.disabled
index 9dd97ce2d5bb42d1f63d075c297bb17d24a03ecd..dd4c00af52307440e5e93de88639ad298e24833e 100644 (file)
--- a/sensor/xiaomi.yaml.disabled
+++ b/sensor/xiaomi.yaml.disabled
@@ -3,7 +3,7 @@
 ######################################################################
 
 - platform: "mqtt"
-  name: "Porta Casa: Batteria"
+  name: "main_door_battery"
   state_topic: "zigbee2mqtt/main_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "%"
@@ -11,7 +11,7 @@
   value_template: "{{ value_json.battery }}"
 
 - platform: "mqtt"
-  name: "Porta Casa: Stato Link"
+  name: "main_door_linkquality"
   state_topic: "zigbee2mqtt/main_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "%"
@@ -22,7 +22,7 @@
 ######################################################################
 
 - platform: "mqtt"
-  name: "Porta Casa 2: Batteria"
+  name: "spare_door_battery"
   state_topic: "zigbee2mqtt/spare_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "%"
@@ -30,7 +30,7 @@
   value_template: "{{ value_json.battery }}"
 
 - platform: "mqtt"
-  name: "Porta Casa 2: Stato Link"
+  name: "spare_door_linkquality"
   state_topic: "zigbee2mqtt/spare_door"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "%"
@@ -41,7 +41,7 @@
 ######################################################################
 
 - platform: "mqtt"
-  name: "Pulsante: Batteria"
+  name: "wireless_switch_battery"
   state_topic: "zigbee2mqtt/wireless_switch"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "%"
@@ -49,7 +49,14 @@
   value_template: "{{ value_json.battery }}"
 
 - platform: "mqtt"
-  name: "Pulsante: Stato Link"
+  name: "wireless_switch_click"
+  state_topic: "zigbee2mqtt/wireless_switch"
+  availability_topic: "zigbee2mqtt/bridge/state"
+  icon: "mdi:toggle-switch"
+  value_template: "{{ value_json.click }}"
+
+- platform: "mqtt"
+  name: "wireless_switch_linkquality"
   state_topic: "zigbee2mqtt/wireless_switch"
   availability_topic: "zigbee2mqtt/bridge/state"
   unit_of_measurement: "-"

diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index a55aaed7501382621f0d049fae1b82e1cf6c1bd9..b05ec0f62bb8fdb6555c5edbeb87d06c664363f0 100644 (file)
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -16,7 +16,7 @@ views:
       - person.laura
       - device_tracker.wdd1760081v167576    
       - sensor.time
-      - binary_sensor.porta_casa
+      - binary_sensor.main_door_contact
       - binary_sensor.home_mode
       - binary_sensor.guard_mode
       - binary_sensor.speech_notifications

diff --git a/ui-settings.yaml b/ui-settings.yaml
index 5a92a9d5e1552af2db55e01820469c820027f82c..9373a29f446a004581d59186ea5cf16ba653b5a5 100644 (file)
--- a/ui-settings.yaml
+++ b/ui-settings.yaml
@@ -143,11 +143,11 @@ views:
         show_header_toggle: false
         entities:
         - type: custom:battery-entity
-          entity: sensor.porta_casa_batteria
+          entity: sensor.main_door_battery
         - type: custom:battery-entity
-          entity: sensor.porta_casa_2_batteria
+          entity: sensor.spare_door_battery
         - type: custom:battery-entity
-          entity: sensor.pulsante_batteria
+          entity: sensor.wireless_switch_battery
 
       - type: custom:zigbee2mqtt-networkmap
         title: Zigbee2mqtt Network Map