From fd3870c8de4ebf5862b6dd07396eb7e559bc0bb0 Mon Sep 17 00:00:00 2001 From: Giorgio Ravera Date: Sun, 29 Mar 2020 13:49:45 +0200 Subject: [PATCH] Added Package Zigbee2mqtt --- history.yaml | 1 - logbook.yaml | 1 - packages/zigbee2mqtt.yaml | 205 ++++++++++++++++++++++++++++++++++++++ recorder.yaml | 1 - sensor/zigbee.yaml | 10 -- ui-lovelace.yaml | 48 +++++++-- 6 files changed, 242 insertions(+), 24 deletions(-) create mode 100644 packages/zigbee2mqtt.yaml delete mode 100644 sensor/zigbee.yaml diff --git a/history.yaml b/history.yaml index 448fba7a..a280c42c 100644 --- a/history.yaml +++ b/history.yaml @@ -72,7 +72,6 @@ exclude: - sensor.potenza_reattiva - sensor.tensione # Zigbee2mqtt - - sensor.zigbee2mqtt_networkmap - sensor.porta_casa_batteria - sensor.porta_casa_stato_link - sensor.porta_casa_2_batteria diff --git a/logbook.yaml b/logbook.yaml index b26c4b20..8a8a5902 100644 --- a/logbook.yaml +++ b/logbook.yaml @@ -72,7 +72,6 @@ exclude: - sensor.potenza_reattiva - sensor.tensione # Zigbee2mqtt - - sensor.zigbee2mqtt_networkmap - sensor.porta_casa_batteria - sensor.porta_casa_stato_link - sensor.porta_casa_2_batteria diff --git a/packages/zigbee2mqtt.yaml b/packages/zigbee2mqtt.yaml new file mode 100644 index 00000000..0218a9dc --- /dev/null +++ b/packages/zigbee2mqtt.yaml @@ -0,0 +1,205 @@ +###################################################################### +# Zigbee2mqtt Package +###################################################################### + +###################################################################### +# Timer for joining time remaining (120 sec = 2 min) +###################################################################### +sensor: + +###################################################################### +# Sensor for monitoring the bridge state +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Stato Bridge" + state_topic: "zigbee2mqtt/bridge/state" + icon: mdi:router-wireless + +###################################################################### +# Sensor for monitoring the permit_join state +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Stato permit join" + state_topic: "zigbee2mqtt/bridge/config" + value_template: "{{ value_json.permit_join }}" + icon: mdi:link-lock + +###################################################################### +# Sensor for monitoring the log_level state +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Stato log level" + state_topic: "zigbee2mqtt/bridge/config" + value_template: "{{ value_json.log_level }}" + icon: mdi:file-document-outline + +###################################################################### +# Sensor for Showing the Zigbee2mqtt Version +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Versione Bridge" + state_topic: "zigbee2mqtt/bridge/config" + value_template: "{{ value_json.version }}" + icon: mdi:zigbee + +###################################################################### +# Sensor for Showing the Coordinator Version +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Versione Coordinator" + state_topic: "zigbee2mqtt/bridge/config" + value_template: "{{ value_json.coordinator.meta.revision }}" + icon: mdi:chip + +###################################################################### +# Sensor for Showing the new Zigbee2mqtt Version +###################################################################### +# - platform: command_line +# name: "Zigbee2mqtt: nuova versione disponibile" +# command: 'curl https://api.github.com/repos/Koenkk/zigbee2mqtt/releases/latest' +# scan_interval: 3600 +# value_template: '{{ value_json.tag_name }}' +# #icon: mdi:folder-download + +###################################################################### +# Zigbee2mqtt Networkmap +###################################################################### + - platform: mqtt + name: "Zigbee2mqtt: Networkmap" + state_topic: zigbee2mqtt/bridge/networkmap/raw + value_template: >- + {{ now().strftime('%Y-%m-%d %H:%M:%S') }} + json_attributes_topic: zigbee2mqtt/bridge/networkmap/raw + +###################################################################### +# Switch for enabling joining +###################################################################### +switch: + - platform: mqtt + name: "Zigbee2mqtt: Abilita join" + state_topic: "zigbee2mqtt/bridge/config/permit_join" + command_topic: "zigbee2mqtt/bridge/config/permit_join" + payload_on: "true" + payload_off: "false" + +###################################################################### +# Input select for Zigbee2mqtt log level +###################################################################### +input_select: + zigbee2mqtt_log_level: + name: "Zigbee2mqtt Log Level" + options: + - debug + - info + - warn + - error + initial: info + icon: mdi:format-list-bulleted + +###################################################################### +# Timer for joining time remaining (120 sec = 2 min) +###################################################################### +timer: + zigbee_permit_join: + name: Tempo rimasto per il join + duration: 120 + +###################################################################### +# Automations +###################################################################### +automation: + +###################################################################### +# Automation to change log level +###################################################################### + - id: zigbee2mqtt_change_log_level + alias: "Zigbee2mqtt: Cambia Log Level" + initial_state: "on" + hide_entity: true + trigger: + platform: state + entity_id: input_select.zigbee2mqtt_log_level + action: + - service: mqtt.publish + data: + payload_template: "{{ states('input_select.zigbee2mqtt_log_level') }}" + topic: zigbee2mqtt/bridge/config/log_level + +###################################################################### +# Automation to start timer when enable join is turned on +###################################################################### + - id: zigbee2mqtt_join_enabled + alias: "Zigbee2mqtt: Abilita Join" + initial_state: "on" + hide_entity: true + trigger: + platform: state + entity_id: switch.Zigbee2mqtt_Abilita_join + to: "on" + action: + service: timer.start + entity_id: timer.zigbee_permit_join + +###################################################################### +# Automation to stop timer when switch turned off and turn off switch when timer finished +###################################################################### + - id: zigbee2mqtt_join_disabled + alias: "Zigbee2mqtt: Disabilita Join" + initial_state: "on" + hide_entity: true + trigger: + - platform: event + event_type: timer.finished + event_data: + entity_id: timer.zigbee_permit_join + - platform: state + entity_id: switch.Zigbee2mqtt_Abilita_join + to: "off" + action: + - service: timer.cancel + data: + entity_id: timer.zigbee_permit_join + - service: switch.turn_off + entity_id: switch.Zigbee2mqtt_Abilita_join + +###################################################################### +# History +###################################################################### +history: + exclude: + entities: + - sensor.zigbee2mqtt_stato_bridge + - sensor.zigbee2mqtt_stato_permit_join + - sensor.zigbee2mqtt_stato_log_level + - sensor.zigbee2mqtt_versione_bridge + - sensor.zigbee2mqtt_versione_coordinator + #- sensor.zigbee2mqtt_nuova_versione_disponibile + - sensor.zigbee2mqtt_networkmap + +###################################################################### +# Logbook +###################################################################### +logbook: + exclude: + entities: + - sensor.zigbee2mqtt_stato_bridge + - sensor.zigbee2mqtt_stato_permit_join + - sensor.zigbee2mqtt_stato_log_level + - sensor.zigbee2mqtt_versione_bridge + - sensor.zigbee2mqtt_versione_coordinator + #- sensor.zigbee2mqtt_nuova_versione_disponibile + - sensor.zigbee2mqtt_networkmap + +###################################################################### +# Recorder +###################################################################### +recorder: + exclude: + entities: + - sensor.zigbee2mqtt_stato_bridge + - sensor.zigbee2mqtt_stato_permit_join + - sensor.zigbee2mqtt_stato_log_level + - sensor.zigbee2mqtt_versione_bridge + - sensor.zigbee2mqtt_versione_coordinator + #- sensor.zigbee2mqtt_nuova_versione_disponibile + - sensor.zigbee2mqtt_networkmap \ No newline at end of file diff --git a/recorder.yaml b/recorder.yaml index f6d29d54..0f5b138c 100644 --- a/recorder.yaml +++ b/recorder.yaml @@ -74,7 +74,6 @@ exclude: - sensor.potenza_reattiva - sensor.tensione # Zigbee2mqtt - - sensor.zigbee2mqtt_networkmap - sensor.porta_casa_batteria - sensor.porta_casa_stato_link - sensor.porta_casa_2_batteria diff --git a/sensor/zigbee.yaml b/sensor/zigbee.yaml deleted file mode 100644 index ee52c366..00000000 --- a/sensor/zigbee.yaml +++ /dev/null @@ -1,10 +0,0 @@ -###################################################################### -# Zigbee2mqtt Networkmap -###################################################################### - -- platform: mqtt - name: Zigbee2mqtt Networkmap - state_topic: zigbee2mqtt/bridge/networkmap/raw - value_template: >- - {{ now().strftime('%Y-%m-%d %H:%M:%S') }} - json_attributes_topic: zigbee2mqtt/bridge/networkmap/raw diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index 444d027f..a5e1a23d 100644 --- a/ui-lovelace.yaml +++ b/ui-lovelace.yaml @@ -1401,8 +1401,44 @@ views: # entities: # - sensor.freebsd_router_kbyte_sec_received # - sensor.freebsd_router_kbyte_sec_sent + +###################################################################### +# Zigbee +###################################################################### + - title: Zigbee + id: zigbee + icon: mdi:zigbee + cards: #panel: true # this renders the first card on full width, other cards in this view will not be rendered - #cards: + cards: + - type: entities + title: Stato Sistema Zigbee2mqtt + show_header_toggle: false + entities: + - sensor.zigbee2mqtt_stato_bridge + - sensor.zigbee2mqtt_stato_permit_join + - sensor.zigbee2mqtt_stato_log_level + - sensor.zigbee2mqtt_versione_bridge + - sensor.zigbee2mqtt_versione_coordinator + + - type: entities + title: Operazioni Sistema Zigbee2mqtt + show_header_toggle: false + entities: + - switch.zigbee2mqtt_abilita_join + - input_select.zigbee2mqtt_log_level + + - type: entities + title: Stato Batteria ZigBee Devices + show_header_toggle: false + entities: + - type: custom:battery-entity + entity: sensor.porta_casa_batteria + - type: custom:battery-entity + entity: sensor.porta_casa_2_batteria + - type: custom:battery-entity + entity: sensor.pulsante_batteria + - type: custom:zigbee2mqtt-networkmap title: Zigbee2mqtt Network Map entity: sensor.zigbee2mqtt_networkmap @@ -1428,16 +1464,6 @@ views: --zigbee2mqtt-networkmap-node-coordinator-color: rgba(224, 78, 93, .7); --zigbee2mqtt-networkmap-node-router-color: rgba(0, 165, 255, .7); } - - type: entities - title: Stato Batteria ZigBee Devices - show_header_toggle: false - entities: - - type: custom:battery-entity - entity: sensor.porta_casa_batteria - - type: custom:battery-entity - entity: sensor.porta_casa_2_batteria - - type: custom:battery-entity - entity: sensor.pulsante_batteria ###################################################################### # Alarms -- 2.47.3