From: Giorgio Ravera Date: Tue, 21 Apr 2020 12:44:11 +0000 (+0200) Subject: Reviewd alarms and doors trigger X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=e0dca2a9671622373013953c2a2813f68f16c04c;p=homeassistant.git Reviewd alarms and doors trigger --- diff --git a/group/notifications.yaml b/group/notifications.yaml deleted file mode 100644 index b224c586..00000000 --- a/group/notifications.yaml +++ /dev/null @@ -1,15 +0,0 @@ -###################################################################### -# Group Notifications -###################################################################### - -notifications: - name: Notifications - icon: mdi:bell-ring - 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 diff --git a/packages/alarm/alarm_engine.yaml b/packages/alarm/alarm_engine.yaml index 2ba38e4a..f9176a8c 100644 --- a/packages/alarm/alarm_engine.yaml +++ b/packages/alarm/alarm_engine.yaml @@ -1,19 +1,3 @@ -###################################################################### -# Alarm Package - Alarm Engine - Input Booleans -###################################################################### - -input_boolean: - - # Generic Alarms - alarms: - name: Allarme - icon: mdi:alarm-light-outline - -# # Alarms: Door -# door_alarm: -# name: Allarme Porta -# icon: mdi:door-open - ###################################################################### # Alarm Package - Alarm Engine - Binary Sensors ###################################################################### @@ -25,11 +9,11 @@ binary_sensor: sensors: alarms: friendly_name: Allarmi - entity_id: input_boolean.alarms + entity_id: group.alarms value_template: >- - {{ is_state('input_boolean.alarms', 'on') }} + {{ is_state('group.alarms', 'on') }} icon_template: >- - {% if is_state('input_boolean.alarms', 'on') %} + {% if is_state('group.alarms', 'on') %} mdi:alarm-light {% else %} mdi:alarm-light-outline @@ -54,7 +38,7 @@ automation: trigger: platform: state - entity_id: input_boolean.alarms + entity_id: group.alarms to: 'off' action: diff --git a/packages/alarm/alarm_types.yaml b/packages/alarm/alarm_types.yaml new file mode 100644 index 00000000..e4751a79 --- /dev/null +++ b/packages/alarm/alarm_types.yaml @@ -0,0 +1,26 @@ +###################################################################### +# Alarm Package - Types - Input Booleans +###################################################################### + +input_boolean: + + # Generic Alarms + generic_alarm: + name: Allarme Generico + icon: mdi:alarm-light-outline + + # Alarms: Door + door_alarm: + name: Allarme Porta + icon: mdi:door-open + +###################################################################### +# Alarm Package - Types - Group +###################################################################### +group: + alarms: + name: Allarmi + icon: mdi:alarm-light-outline + entities: + - input_boolean.generic_alarm + - input_boolean.door_alarm \ No newline at end of file diff --git a/packages/alarm/notifications.yaml b/packages/alarm/notifications.yaml index dcaf4f3a..af3dbd9d 100644 --- 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 # - title # - message - # - level + # - level # # 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 + data_template: + entity_id: > + {# Check Null Input #} + {% if entity_id | length == 0 %} + {% set entity_id = 'input_boolean.generic_alarm' %} + {% endif %} + {{ entity_id }} + + # LEVEL 1 + - service: script.notify_all + data_template: + volume_level: 0.4 + language: 'it' + title: >- + {# Check Null Input #} + {% if title | length == 0 %} + {# Check Null Input #} + {% if entity_id | length == 0 %} + {% set entity_id = 'input_boolean.generic_alarm' %} + {% endif %} + {% set title = state_attr(entity_id, 'friendly_name') %} + {% endif %} + Home Assistant - {{ title }} + message: >- + {# Check Null Input #} + {% if message | length == 0 %} + {# Check Null Input #} + {% if entity_id | length == 0 %} + {% set entity_id = 'input_boolean.generic_alarm' %} + {% endif %} + {% set message = state_attr(entity_id, 'friendly_name') %} + {% endif %} + {{ message }} + enable_persistent: 1 + notification_id: "alarm" + + # LEVEL 2 + - 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: 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 6a465876..a527d503 100644 --- a/packages/alarm/triggers.yaml +++ b/packages/alarm/triggers.yaml @@ -1,5 +1,5 @@ ###################################################################### -# Alarms Package - Automation Triggers +# Alarms Package - Triggers - Automations ###################################################################### automation: @@ -16,7 +16,7 @@ automation: trigger: - platform: state - entity_id: binary_sensor.porta_casa + entity_id: group.doors to: 'on' condition: @@ -27,6 +27,6 @@ automation: action: - service: script.start_alarm data_template: - title: "Presenza non autorizzata" + entity_id: input_boolean.door_alarm message: "È stata rilevata una presenza non autorizzata." level: 1 diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml index ba0646d6..3f7a1062 100644 --- 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