From 8c4adb9cb84e98b2416e8deb09a464d576801e36 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Thu, 21 May 2020 17:45:34 +0200 Subject: [PATCH] Enabled zigbee2mqtt api integration & renamed devices according to this (device were previously removed from yaml) --- automations/doors.yaml | 2 +- automations/speech.yaml | 2 +- binary_sensor/doors.yaml.disabled | 4 ++-- customizations/xiaomi.yaml | 24 ++++++++++++++++++++++++ groups/doors.yaml | 2 +- log/history.yaml | 16 +++++++++------- log/logbook.yaml | 16 +++++++++------- log/recorder.yaml | 14 ++++++++------ sensor/switch.yaml.disabled | 10 ---------- sensor/xiaomi.yaml.disabled | 19 +++++++++++++------ ui-lovelace.yaml | 2 +- ui-settings.yaml | 6 +++--- 12 files changed, 72 insertions(+), 45 deletions(-) create mode 100644 customizations/xiaomi.yaml delete mode 100644 sensor/switch.yaml.disabled diff --git a/automations/doors.yaml b/automations/doors.yaml index d66b7efe..f38976bb 100644 --- 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 5d9acdd5..82ba181e 100644 --- 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 0ed9ae29..1440e07b 100644 --- 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 index 00000000..3b1c3bd4 --- /dev/null +++ b/customizations/xiaomi.yaml @@ -0,0 +1,24 @@ +###################################################################### +# Customization: Xiaomi +###################################################################### + +binary_sensor.main_door_contact: + friendly_name: "Porta Casa" +sensor.main_door_battery: + friendly_name: "Porta Casa: Batteria" +sensor.main_door_linkquality: + friendly_name: "Porta Casa: Stato Link" + +binary_sensor.spare_door_contact: + friendly_name: "Porta Casa 2" +sensor.spare_door_battery: + friendly_name: "Porta Casa 2: Batteria" +sensor.spare_door_linkquality: + friendly_name: "Porta Casa 2: Stato Link" + +sensor.wireless_switch_battery: + friendly_name: "Pulsante: Batteria" +sensor.wireless_switch_click: + friendly_name: "Pulsante" +sensor.wireless_switch_linkquality: + friendly_name: "Pulsante: Stato Link" diff --git a/groups/doors.yaml b/groups/doors.yaml index 263b1e37..23cb0f18 100644 --- 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 6290e06c..3920dc7d 100644 --- 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 93961d8d..0014277f 100644 --- 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 e006b9d5..875c0c97 100644 --- 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 index 135b29ee..00000000 --- a/sensor/switch.yaml.disabled +++ /dev/null @@ -1,10 +0,0 @@ -###################################################################### -# WXKG01LM - Xiaomi MiJia wireless switch -###################################################################### - -- platform: "mqtt" - name: "Pulsante: Stato" - state_topic: "zigbee2mqtt/wireless_switch" - availability_topic: "zigbee2mqtt/bridge/state" - icon: "mdi:toggle-switch" - value_template: "{{ value_json.click }}" diff --git a/sensor/xiaomi.yaml.disabled b/sensor/xiaomi.yaml.disabled index 9dd97ce2..dd4c00af 100644 --- 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 a55aaed7..b05ec0f6 100644 --- 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 5a92a9d5..9373a29f 100644 --- 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 -- 2.47.3