configuration/automations/alarm.yaml

@@ -72,12 +72,12 @@
     - platform: state
       entity_id: binary_sensor.office_sensor_motion
       to: 'on'
-    #    - platform: state
-    #      entity_id: binary_sensor.kitchen_tabletop_motion_detection
-    #      to: 'on'
-    #    - platform: state
-    #      entity_id: binary_sensor.kitchen_sink_motion_sensor
-    #      to: 'on'
+#    - platform: state
+#      entity_id: binary_sensor.kitchen_tabletop_motion_detection
+#      to: 'on'
+#    - platform: state
+#      entity_id: binary_sensor.kitchen_sink_motion_sensor
+#      to: 'on'
     # Use open/close sensors
     - platform: state
       entity_id: binary_sensor.dining_window_1_open_close
@@ -196,16 +196,16 @@
     - platform: state
       entity_id: binary_sensor.bathroom_motion_occupancy
       to: 'on'
-    #    - platform: state
-    #      entity_id: binary_sensor.bedroom_motion_occupancy
-    #      to: 'on'
+#    - platform: state
+#      entity_id: binary_sensor.bedroom_motion_occupancy
+#      to: 'on'
     - platform: state
       entity_id: binary_sensor.bathroom_shower_sensor_motion
       to: 'on'
     # Use open/close sensors
-  #    - platform: state
-  #      entity_id: binary_sensor.bedroom_window_open_close
-  #      to: 'on'
+#    - platform: state
+#      entity_id: binary_sensor.bedroom_window_open_close
+#      to: 'on'
   condition:
     - condition: state
       entity_id: alarm_control_panel.home_alarm
@@ -221,6 +221,28 @@
         data:
           url:  "/lovelace-tablet/security"
 
+- id: alarm_away_test_vibration
+  alias: '[Alarm] Window vibration test'
+  trigger:
+    - platform: state
+      entity_id: binary_sensor.office_vibration
+      to: 'on'
+  condition:
+#    - condition: state
+#      entity_id: alarm_control_panel.home_alarm
+#      state: armed_away
+  action:
+#    - service: alarm_control_panel.alarm_trigger
+#      entity_id: alarm_control_panel.home_alarm
+    - service: notify.mobile_app_iphone
+      data:
+        title: "Vibration Test ALARM!"
+        message: >
+          {{ state_attr(trigger.entity_id, 'friendly_name') }}
+        data:
+          entity_id: camera.living_room
+          url:  "/lovelace-tablet/security"
+
 - id: alarm_night
   alias: '[Alarm] Trigger alarm at night'
   trigger:
@@ -265,7 +287,8 @@
       zone: zone.home
       event: leave
   action:
-    - service: script.alarm_arm_away
+    - service: alarm_control_panel.alarm_arm_away
+      entity_id: alarm_control_panel.home_alarm
 
 - id: alarm_pending
   alias: '[Alarm] Send notification when alarm triggered'

configuration/automations/vacuum.yaml

@@ -31,8 +31,10 @@
               entity_id: alarm_control_panel.home_alarm
               state: 'armed_home'
           sequence:
-            - service: script.alarm_disarm
-            - service: script.alarm_arm_away
+            - service: alarm_control_panel.alarm_disarm
+              entity_id: alarm_control_panel.home_alarm
+            - service: alarm_control_panel.alarm_arm_away
+              entity_id: alarm_control_panel.home_alarm
 
 - id: vacuum_daily_reset
   alias: '[Vacuum] Reset daily cleaning'

configuration/configuration.yaml

@@ -236,7 +236,6 @@ influxdb:
 alarm_control_panel:
   - platform: manual
     name: Home Alarm
-    code: !secret alarm_code
     delay_time: 30
     arming_time: 30
     trigger_time: 120

home-assistant.yml

@@ -1,9 +1,6 @@
 ---
 - hosts: home-assistant
   tasks:
-    - name: Include secrets
-      include_vars:
-        file: configuration/secrets.yaml
     - name: Remove automations directory
       file:
         path: '{{ pwd_config }}/automations'
@@ -128,11 +125,6 @@
         dest: './scripts/check-unavailable.yaml'
       vars:
         entities: "{{ availability }}"
-    - name: Build alarm script
-      delegate_to: localhost
-      template:
-        src: scripts/alarm.yaml.j2
-        dest: './scripts/alarm.yaml'
     - name: Concat scripts
       ansible.builtin.assemble:
         remote_src: no

localhost.yml

@@ -0,0 +1,25 @@
+---
+- hosts: localhost
+  tasks:
+    - name: Build lights automations
+      template:
+        src: lights.yaml.j2
+        dest: configuration/automations/lights.yaml
+      vars:
+        lights:
+          - entityId: light.bathroom_lights
+            name: Bathroom Lights
+          - entityId: light.kitchen_lights
+            name: Kitchen Lights
+          - entityId: light.shower_lights
+            name: Shower Lights
+          - entityId: light.couch_lights
+            name: Couch Lights
+          - entityId: light.desk_lightbar
+            name: Desk Lightbar
+          - entityId: light.office
+            name: Office lamp
+    - name: Concat scripts
+      ansible.builtin.assemble:
+        src: scripts
+        dest: configuration/scripts.yaml

scripts/70.vacuum.yaml

@@ -18,8 +18,10 @@ vacuum_today:
                         entity_id: alarm_control_panel.home_alarm
                         state: 'arming'
                   sequence:
-                    - service: script.alarm_disarm
-                    - service: script.alarm_arm_stay
+                    - service: alarm_control_panel.alarm_disarm
+                      entity_id: alarm_control_panel.home_alarm
+                    - service: alarm_control_panel.alarm_arm_home
+                      entity_id: alarm_control_panel.home_alarm
             - service: vacuum.start
               entity_id: vacuum.valetudo_valetudos5
 

templates/scripts/alarm.yaml.j2

@@ -1,26 +0,0 @@
-alarm_arm_stay:
-  alias: '[Alarm] arm stay'
-  mode: single
-  icon: mdi:weather-night
-  sequence:
-    - service: alarm_control_panel.alarm_arm_home
-      entity_id: alarm_control_panel.home_alarm
-      data:
-        code: "{{ alarm_code }}"
-
-alarm_arm_away:
-  alias: '[Alarm] arm away'
-  mode: single
-  sequence:
-    - service: alarm_control_panel.alarm_arm_away
-      entity_id: alarm_control_panel.home_alarm
-      data:
-        code: "{{ alarm_code }}"
-
-alarm_disarm:
-  alias: '[Alarm] disarm'
-  sequence:
-    - service: alarm_control_panel.alarm_disarm
-      entity_id: alarm_control_panel.home_alarm
-      data:
-        code: "{{ alarm_code }}"