Updated notifications management for alamrs (doors) and exported stop alarm script...

diff --git a/automation/update_notifications.yaml b/automation/update_notifications.yaml
index 3e75648a444b65f8d58419185ef005959b285a93..ce132ae9674e4b25f21474016f08bcb38c7449cf 100644 (file)
--- a/automation/update_notifications.yaml
+++ b/automation/update_notifications.yaml
@@ -10,6 +10,14 @@
       entity_id: binary_sensor.updater\r
       to: 'on'\r
 \r
+    - platform: homeassistant\r
+      event: start\r
+\r
+  condition:\r
+    condition: state\r
+    entity_id: binary_sensor.updater\r
+    state: 'on'\r
+\r
   action:\r
     - service: script.notify_text\r
       data_template:\r
@@ -32,6 +40,14 @@
     - platform: state\r
       entity_id: group.shelly\r
       to: 'on'\r
+      \r
+    - platform: homeassistant\r
+      event: start\r
+      \r
+  condition:\r
+    condition: state\r
+    entity_id: group.shelly\r
+    state: 'on'\r
 \r
   action:\r
     - service: script.notify_text\r

diff --git a/components/google_assistant/home_assistant.yaml b/components/google_assistant/home_assistant.yaml
index 6c53512c843908fab2b23d02faccb32c7761d431..7fdf46ec25fbd54103eec4c3fa55ea34dcbe2034 100644 (file)
--- a/components/google_assistant/home_assistant.yaml
+++ b/components/google_assistant/home_assistant.yaml
@@ -26,3 +26,7 @@ script.shelly_upgrade:
   name: Aggiorna Shelly
   expose: true
   room: Generale
+script.stop_alarm:
+  name: Disattiva Allarmi
+  expose: true
+  room: Generale

diff --git a/script/alarms.yaml b/script/alarms.yaml
index 990a67354f1ef201742514b46d3212f7ff520f4e..e59a6508c3fe7aac24910ca32d2479e2b8585b0c 100644 (file)
--- a/script/alarms.yaml
+++ b/script/alarms.yaml
@@ -153,8 +153,11 @@ start_alarm:
 stop_alarm:
   alias: "Allarmi: Disattiva Allarme"
   sequence:
+    - service: input_boolean.turn_off
+      entity_id: input_boolean.alarms
+
     - service: script.stop_alarm_sound
 
     - service: persistent_notification.dismiss
       data_template:
-        notification_id: "alarm"
+        notification_id: "alarm"
\ No newline at end of file

diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index d385b286e3f3d8a09746cd08fa5ef2db76cd5f35..ab60eb3dc9aaf92e8e168556d1a55bdc13ee259f 100644 (file)
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -9,6 +9,8 @@ resources:
     type: module
   - url: /community_plugin/zigbee2mqtt-networkmap/zigbee2mqtt-networkmap.js?v=0.6.0
     type: module
+  - url: /community_plugin/lovelace-battery-entity/battery-entity.js?v=1
+    type: module
 
 views:
 ######################################################################
@@ -22,10 +24,11 @@ views:
       - device_tracker.google_maps_103158638433668748797
       - device_tracker.wdd1760081v167576    
       - sensor.time
+      - binary_sensor.porta_casa
       - binary_sensor.home_mode
       - binary_sensor.guard_mode
       - binary_sensor.speech_notifications
-      - binary_sensor.text_notifications
+      #- binary_sensor.text_notifications
       - binary_sensor.alarms
       - sensor.potenza_istantanea
     cards:
@@ -133,6 +136,19 @@ views:
       show_header_toggle: false
       entities:
       - input_datetime.away_mode_end
+
+    - type: entity-filter
+      title: Eventi da Segnalare
+      entities:
+        - input_boolean.alarms
+        - input_boolean.door_alarm
+        - input_boolean.update      
+        - binary_sensor.ff590mr_engine_light_warning
+        - binary_sensor.ff590mr_warning_brakefluid
+        - binary_sensor.ff590mr_warning_washwater
+        - binary_sensor.ff590mr_warning_coolantlevellow
+      state_filter:
+      - "on"
       
 ######################################################################
 # Lights
@@ -1115,6 +1131,15 @@ views:
               service: script.turn_on
               service_data:
                 entity_id: script.laura_voice_3
+          - type: entity-button
+            name: Che Schifo è?
+            icon: mdi:numeric-4
+            entity: script.laura_voice
+            tap_action:
+              action: call-service
+              service: script.turn_on
+              service_data:
+                entity_id: script.laura_voice_4
                 
         - type: horizontal-stack
           cards:
@@ -1290,7 +1315,7 @@ views:
 # Power Status
 ######################################################################
   - title: Monitoraggio Energetico
-    id: network
+    id: power
     icon: mdi:flash
     badges:
       - sensor.potenza_istantanea
@@ -1345,7 +1370,6 @@ views:
       #  entities: 
       #    - sensor.freebsd_router_kbyte_sec_received
       #    - sensor.freebsd_router_kbyte_sec_sent
-
     #panel: true # this renders the first card on full width, other cards in this view will not be rendered
     #cards:
       - type: custom:zigbee2mqtt-networkmap
@@ -1373,6 +1397,16 @@ 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