Reviewd Alarm package

diff --git a/packages/alarm/alarm_engine.yaml b/packages/alarm/alarm_engine.yaml
new file mode 100644 (file)
index 0000000..1e51cfa
--- /dev/null
+++ b/packages/alarm/alarm_engine.yaml
@@ -0,0 +1,61 @@
+######################################################################\r
+# Alarm Package - 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 - Binary Sensors\r
+######################################################################\r
+\r
+binary_sensor:\r
+\r
+  # Generic Alarms\r
+  - platform: template\r
+    sensors:\r
+      alarms:\r
+        friendly_name: Allarmi\r
+        entity_id: input_boolean.alarms\r
+        value_template: >-\r
+          {{ is_state('input_boolean.alarms', 'on') }}\r
+        icon_template: >-\r
+          {% if is_state('input_boolean.alarms', 'on') %}\r
+             mdi:alarm-light\r
+          {% else %}\r
+             mdi:alarm-light-outline\r
+          {% endif %}\r
+\r
+######################################################################\r
+# Alarm Package - Automation\r
+######################################################################\r
+\r
+automation:\r
+\r
+  ######################################################################\r
+  # Alarm Automation: Aknowledge Alarms\r
+  #\r
+  # Actions:\r
+  # - persistent_notification.dismiss\r
+  # - script.stop_alarm\r
+  ######################################################################\r
+\r
+  - alias: "Alarms: Riconoscimento Allarmi"\r
+    initial_state: 'on'\r
+\r
+    trigger:\r
+      platform: state\r
+      entity_id: input_boolean.alarms\r
+      to: 'off'\r
+      \r
+    action:\r
+      - service: script.stop_alarm\r

diff --git a/packages/alarm/notifications.yaml b/packages/alarm/notifications.yaml
new file mode 100644 (file)
index 0000000..8c4461e
--- /dev/null
+++ b/packages/alarm/notifications.yaml
@@ -0,0 +1,169 @@
+######################################################################\r
+# Alarm Package: Notifications\r
+######################################################################\r
+
+script: \r
+\r
+  ######################################################################
+  # Alarm: Start Alarm Sound
+  #
+  # Operations:
+  # - media_player.volume_set
+  # - media_player.play_media
+  ######################################################################
+\r
+  start_alarm_sound:
+    alias: "Allarmi: Avvia Suono"
+    sequence:
+      - service: media_player.volume_set
+        data_template:
+          entity_id: 'media_player.google_home'
+          volume_level: 0.4
+
+      - service: media_player.play_media
+        data_template:
+          entity_id: 'media_player.google_home'
+          media_content_type: 'audio/mp4'
+          media_content_id: 'https://home.giorgioravera.it/local/audio/alarm.mp3'
+
+  ######################################################################
+  # Alarm: Stop Alarm Sound
+  #
+  # Operations:
+  # - media_player.media_stop
+  # - script.volume_manager
+  ######################################################################
+
+  stop_alarm_sound:
+    alias: "Allarmi: Interrompi Suono"
+    sequence:
+      - service: media_player.media_stop
+        data_template:
+          entity_id: 'media_player.google_home'
+
+      - service: script.volume_manager
+        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:
+  # - title
+  # - message
+  # - level
+  #
+  # Operations:
+  # - input_boolean.turn_on
+  # - script.start_alarm_level_1
+  # - script.start_alarm_level_2
+  ######################################################################
+
+  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 }}"
+
+  ######################################################################
+  # Alarm: Stop Alarm
+  #
+  # Operations:
+  # - stop_alarm_sound
+  # - persistent_notification.dismiss
+  ######################################################################
+
+  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"

diff --git a/packages/alarm/triggers.yaml b/packages/alarm/triggers.yaml
new file mode 100644 (file)
index 0000000..4241b5a
--- /dev/null
+++ b/packages/alarm/triggers.yaml
@@ -0,0 +1,32 @@
+######################################################################\r
+# Alarms Package - Automation based on Events\r
+######################################################################\r
+\r
+automation:\r
+\r
+  ######################################################################\r
+  # Alarm Door\r
+  #\r
+  # Actions:\r
+  # - script.notify_all\r
+  ######################################################################\r
+\r
+  - alias: "Allarme Porta Casa"\r
+    initial_state: 'on'\r
+\r
+    trigger:\r
+      - platform: state\r
+        entity_id: binary_sensor.porta_casa\r
+        to: 'on'\r
+      \r
+    condition:\r
+      - condition: state\r
+        entity_id: binary_sensor.guard_mode\r
+        state: 'on'\r
+\r
+    action:\r
+      - service: script.start_alarm\r
+        data_template:\r
+          title: "Presenza non autorizzata"\r
+          message: "È stata rilevata una presenza non autorizzata."\r
+          level: 1\r

diff --git a/packages/alarm_events/doors.yaml b/packages/alarm_events/doors.yaml
deleted file mode 100644 (file)
index 4241b5a..0000000
--- a/packages/alarm_events/doors.yaml
+++ /dev/null
@@ -1,32 +0,0 @@
-######################################################################\r
-# Alarms Package - Automation based on Events\r
-######################################################################\r
-\r
-automation:\r
-\r
-  ######################################################################\r
-  # Alarm Door\r
-  #\r
-  # Actions:\r
-  # - script.notify_all\r
-  ######################################################################\r
-\r
-  - alias: "Allarme Porta Casa"\r
-    initial_state: 'on'\r
-\r
-    trigger:\r
-      - platform: state\r
-        entity_id: binary_sensor.porta_casa\r
-        to: 'on'\r
-      \r
-    condition:\r
-      - condition: state\r
-        entity_id: binary_sensor.guard_mode\r
-        state: 'on'\r
-\r
-    action:\r
-      - service: script.start_alarm\r
-        data_template:\r
-          title: "Presenza non autorizzata"\r
-          message: "È stata rilevata una presenza non autorizzata."\r
-          level: 1\r

diff --git a/packages/alarm_system/alarms.yaml b/packages/alarm_system/alarms.yaml
deleted file mode 100644 (file)
index 58769c8..0000000
--- a/packages/alarm_system/alarms.yaml
+++ /dev/null
@@ -1,61 +0,0 @@
-######################################################################\r
-# Alarm Package - 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 - Binary Sensors\r
-######################################################################\r
-\r
-binary_sensor:\r
-\r
-  # Generic Alarms\r
-  - platform: template\r
-    sensors:\r
-      alarms:\r
-        friendly_name: Allarmi\r
-        entity_id: input_boolean.alarms\r
-        value_template: >-\r
-          {{ is_state('input_boolean.alarms', 'on') }}\r
-        icon_template: >-\r
-          {% if is_state('input_boolean.alarms', 'on') %}\r
-             mdi:alarm-light\r
-          {% else %}\r
-             mdi:alarm-light-outline\r
-          {% endif %}\r
-\r
-######################################################################\r
-# Alarm Package - Automation\r
-######################################################################\r
-\r
-automation:\r
-\r
-  ######################################################################\r
-  # Alarm Automation: Aknowledge Alarms\r
-  #\r
-  # Actions:\r
-  # - persistent_notification.dismiss\r
-  # - script.stop_alarm\r
-  ######################################################################\r
-\r
-  - alias: "Alarms: Riconoscimento Allarmi"\r
-    initial_state: 'on'\r
-\r
-    trigger:\r
-      platform: state\r
-      entity_id: input_boolean.alarms\r
-      to: 'off'\r
-      \r
-    action:\r
-      - service: script.stop_alarm
\ No newline at end of file

diff --git a/packages/alarm_system/alarms_scripts.yaml b/packages/alarm_system/alarms_scripts.yaml
deleted file mode 100644 (file)
index c8cd0ff..0000000
--- a/packages/alarm_system/alarms_scripts.yaml
+++ /dev/null
@@ -1,169 +0,0 @@
-######################################################################\r
-# Alarm Script Package\r
-######################################################################\r
-
-script: \r
-\r
-  ######################################################################
-  # Alarm: Start Alarm Sound
-  #
-  # Operations:
-  # - media_player.volume_set
-  # - media_player.play_media
-  ######################################################################
-\r
-  start_alarm_sound:
-    alias: "Allarmi: Avvia Suono"
-    sequence:
-      - service: media_player.volume_set
-        data_template:
-          entity_id: 'media_player.google_home'
-          volume_level: 0.4
-
-      - service: media_player.play_media
-        data_template:
-          entity_id: 'media_player.google_home'
-          media_content_type: 'audio/mp4'
-          media_content_id: 'https://home.giorgioravera.it/local/audio/alarm.mp3'
-
-  ######################################################################
-  # Alarm: Stop Alarm Sound
-  #
-  # Operations:
-  # - media_player.media_stop
-  # - script.volume_manager
-  ######################################################################
-
-  stop_alarm_sound:
-    alias: "Allarmi: Interrompi Suono"
-    sequence:
-      - service: media_player.media_stop
-        data_template:
-          entity_id: 'media_player.google_home'
-
-      - service: script.volume_manager
-        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:
-  # - title
-  # - message
-  # - level
-  #
-  # Operations:
-  # - input_boolean.turn_on
-  # - script.start_alarm_level_1
-  # - script.start_alarm_level_2
-  ######################################################################
-
-  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 }}"
-
-  ######################################################################
-  # Alarm: Stop Alarm
-  #
-  # Operations:
-  # - stop_alarm_sound
-  # - persistent_notification.dismiss
-  ######################################################################
-
-  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"