Reviewd alarms and doors trigger

diff --git a/group/notifications.yaml b/group/notifications.yaml
deleted file mode 100644 (file)
index b224c58..0000000
--- a/group/notifications.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-######################################################################\r
-# Group Notifications\r
-######################################################################\r
-\r
-notifications:\r
-  name: Notifications\r
-  icon: mdi:bell-ring\r
-  entities:\r
-    - input_boolean.alarms\r
-    - input_boolean.door_alarm\r
-    - input_boolean.update      \r
-    - binary_sensor.ff590mr_engine_light_warning\r
-    - binary_sensor.ff590mr_warning_brakefluid\r
-    - binary_sensor.ff590mr_warning_washwater\r
-    - binary_sensor.ff590mr_warning_coolantlevellow\r

diff --git a/packages/alarm/alarm_engine.yaml b/packages/alarm/alarm_engine.yaml
index 2ba38e4a3d7fd44ac8a9390c065ed24b5a8d881f..f9176a8c64122d0bd7f2ab382e0769ed7b08d195 100644 (file)
--- a/packages/alarm/alarm_engine.yaml
+++ b/packages/alarm/alarm_engine.yaml
@@ -1,19 +1,3 @@
-######################################################################\r
-# Alarm Package - Alarm Engine - Input Booleans\r
-######################################################################\r
-\r
-input_boolean:\r
-\r
-  # Generic Alarms\r
-  alarms:\r
-    name: Allarme\r
-    icon: mdi:alarm-light-outline\r
-\r
-#  # Alarms: Door\r
-#  door_alarm:\r
-#    name: Allarme Porta\r
-#    icon: mdi:door-open\r
-\r
 ######################################################################\r
 # Alarm Package - Alarm Engine - Binary Sensors\r
 ######################################################################\r
@@ -25,11 +9,11 @@ binary_sensor:
     sensors:\r
       alarms:\r
         friendly_name: Allarmi\r
-        entity_id: input_boolean.alarms\r
+        entity_id: group.alarms\r
         value_template: >-\r
-          {{ is_state('input_boolean.alarms', 'on') }}\r
+          {{ is_state('group.alarms', 'on') }}\r
         icon_template: >-\r
-          {% if is_state('input_boolean.alarms', 'on') %}\r
+          {% if is_state('group.alarms', 'on') %}\r
              mdi:alarm-light\r
           {% else %}\r
              mdi:alarm-light-outline\r
@@ -54,7 +38,7 @@ automation:
 \r
     trigger:\r
       platform: state\r
-      entity_id: input_boolean.alarms\r
+      entity_id: group.alarms\r
       to: 'off'\r
       \r
     action:\r

diff --git a/packages/alarm/alarm_types.yaml b/packages/alarm/alarm_types.yaml
new file mode 100644 (file)
index 0000000..e4751a7
--- /dev/null
+++ b/packages/alarm/alarm_types.yaml
@@ -0,0 +1,26 @@
+######################################################################\r
+# Alarm Package - Types - Input Booleans\r
+######################################################################\r
+\r
+input_boolean:\r
+\r
+  # Generic Alarms\r
+  generic_alarm:\r
+    name: Allarme Generico\r
+    icon: mdi:alarm-light-outline\r
+\r
+  # Alarms: Door\r
+  door_alarm:\r
+    name: Allarme Porta\r
+    icon: mdi:door-open\r
+\r
+######################################################################\r
+# Alarm Package - Types - Group\r
+######################################################################\r
+group:\r
+  alarms:\r
+    name: Allarmi\r
+    icon: mdi:alarm-light-outline\r
+    entities:\r
+      - input_boolean.generic_alarm\r
+      - input_boolean.door_alarm
\ No newline at end of file

diff --git a/packages/alarm/notifications.yaml b/packages/alarm/notifications.yaml
index dcaf4f3a09f72841b69a996b47675219dfbdc5dc..af3dbd9d5a1d735a9bf7343c12c284b3fba89ed3 100644 (file)
--- a/packages/alarm/notifications.yaml
+++ b/packages/alarm/notifications.yaml
@@ -45,108 +45,74 @@ script:
         data_template:
           media_player: 'media_player.google_home'
 
-  ######################################################################
-  # Alarm: Start Alarm Level 1
-  # Inputs:
-  # - title
-  # - message
-  #
-  # Operations:
-  # - script.notify_text
-  ######################################################################
-
-  start_alarm_level_1:
-    alias: "Allarmi: Attiva Allarme 1"
-    sequence:
-    
-      - condition: template
-        value_template: >-
-          {# Check Null Input #}
-          {% if level | length == 0 %}
-            {% set level = 1 %}
-          {% endif %}
-          {% if level | int >= 1 %}
-            true
-          {% else %}
-            false
-          {% endif %}
-
-      - service: script.notify_all
-        data_template:
-          volume_level: 0.4
-          language: 'it'
-          title: >-
-            {# Check Null Input #}
-            {% if title | length == 0 %}
-              {% set title = 'Allarme Generico' %}
-            {% endif %}
-            Home Assistant - {{ title }}
-          message: >-
-            {# Check Null Input #}
-            {% if message | length == 0 %}
-              {% set message = 'Allarme Generico' %}
-            {% endif %}
-            {{ message }}
-          enable_persistent: 1
-          notification_id: "alarm"
-        
-  ######################################################################
-  # Alarm: Start Alarm Level 2
-  # Inputs:
-  # - level
-  #
-  # Operations:
-  # - start_alarm_sound
-  ######################################################################
-
-  start_alarm_level_2:
-    alias: "Allarmi: Attiva Allarme 2"
-    sequence:
-
-      - condition: template
-        value_template: >-
-          {# Check Null Input #}
-          {% if level | length == 0 %}
-            {% set level = 1 %}
-          {% endif %}
-          {% if level | int >= 2 %}
-            true
-          {% else %}
-            false
-          {% endif %}
-    
-      - service: script.start_alarm_sound
-
   ######################################################################
   # Alarm: Start Alarm
   # Inputs:
+  # - entity_id\r
   # - title
   # - message
-  # - level
+  # - level\r
   #
   # Operations:
   # - input_boolean.turn_on
-  # - script.start_alarm_level_1
-  # - script.start_alarm_level_2
+  # - script.notify_all
+  # - script.start_alarm_sound
   ######################################################################
 
   start_alarm:
     alias: "Allarmi: Attiva Allarme"
     sequence:
-      - service: input_boolean.turn_on
-        entity_id: input_boolean.alarms
-
-      - service: script.start_alarm_level_1
-        data_template:
-          title: "{{ title }}"
-          message:  "{{ message }}"
-          level: "{{ level }}"
-
-      - service: script.start_alarm_level_2
-        data_template:
-          title: "{{ title }}"
-          message:  "{{ message }}"
-          level: "{{ level }}"
+      - service: input_boolean.turn_on\r
+        data_template: 
+          entity_id: >\r
+            {# Check Null Input #}\r
+            {% if entity_id | length == 0 %}\r
+              {% set entity_id = 'input_boolean.generic_alarm' %}\r
+            {% endif %}\r
+            {{ entity_id }}\r
+\r
+      # LEVEL 1
+      - service: script.notify_all\r
+        data_template:\r
+          volume_level: 0.4\r
+          language: 'it'\r
+          title: >-\r
+            {# Check Null Input #}\r
+            {% if title | length == 0 %}\r
+              {# Check Null Input #}\r
+              {% if entity_id | length == 0 %}\r
+                {% set entity_id = 'input_boolean.generic_alarm' %}\r
+              {% endif %}\r
+              {% set title = state_attr(entity_id, 'friendly_name') %}\r
+            {% endif %}\r
+            Home Assistant - {{ title }}\r
+          message: >-\r
+            {# Check Null Input #}\r
+            {% if message | length == 0 %}\r
+              {# Check Null Input #}\r
+              {% if entity_id | length == 0 %}\r
+                {% set entity_id = 'input_boolean.generic_alarm' %}\r
+              {% endif %}\r
+              {% set message = state_attr(entity_id, 'friendly_name') %}\r
+            {% endif %}\r
+            {{ message }}\r
+          enable_persistent: 1\r
+          notification_id: "alarm"\r
+\r
+      # LEVEL 2\r
+      - condition: template\r
+        value_template: >-\r
+          {# Check Null Input #}\r
+          {% if level | length == 0 %}\r
+            {% set level = 1 %}\r
+          {% endif %}\r
+          {% if level | int >= 2 %}\r
+            true\r
+          {% else %}\r
+            false\r
+          {% endif %}\r
+\r
+      - service: script.start_alarm_sound\r
 
   ######################################################################
   # Alarm: Stop Alarm
@@ -159,8 +125,8 @@ script:
   stop_alarm:
     alias: "Allarmi: Disattiva Allarme"
     sequence:
-      - service: input_boolean.turn_off
-        entity_id: input_boolean.alarms
+      - service: homeassistant.turn_off
+        entity_id: group.alarms
 
       - service: script.stop_alarm_sound
 

diff --git a/packages/alarm/triggers.yaml b/packages/alarm/triggers.yaml
index 6a465876c015a62670beb02dd1acbb55a950da52..a527d503ca9126a2b11a0d678c4697785f5cbbfa 100644 (file)
--- a/packages/alarm/triggers.yaml
+++ b/packages/alarm/triggers.yaml
@@ -1,5 +1,5 @@
 ######################################################################\r
-# Alarms Package - Automation Triggers\r
+# Alarms Package - Triggers - Automations\r
 ######################################################################\r
 \r
 automation:\r
@@ -16,7 +16,7 @@ automation:
 \r
     trigger:\r
       - platform: state\r
-        entity_id: binary_sensor.porta_casa\r
+        entity_id: group.doors\r
         to: 'on'\r
       \r
     condition:\r
@@ -27,6 +27,6 @@ automation:
     action:\r
       - service: script.start_alarm\r
         data_template:\r
-          title: "Presenza non autorizzata"\r
+          entity_id: input_boolean.door_alarm\r
           message: "È stata rilevata una presenza non autorizzata."\r
           level: 1\r

diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index ba0646d61107d5598d0dfcd22a0abff87c2f4ece..3f7a1062d32ca700060d2fa73b0bef6b0ac3b4a8 100644 (file)
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -142,8 +142,7 @@ views:
     - type: entity-filter
       title: Eventi da Segnalare
       entities:
-        - input_boolean.alarms
-        - input_boolean.door_alarm
+        - group.alarms
         - input_boolean.update      
         - binary_sensor.ff590mr_engine_light_warning
         - binary_sensor.ff590mr_warning_brakefluid
@@ -534,8 +533,9 @@ views:
       title: Allarmi Casa
       show_header_toggle: false
       entities:
-      - input_boolean.alarms
-      #- input_boolean.door_alarm
+      - group.alarms
+      - input_boolean.generic_alarm
+      - input_boolean.door_alarm
       
 ######################################################################
 # Weather