mikes-motion-activated-scenes.yaml

@@ -210,7 +210,6 @@ variables:
   debug_mode:                  !input debug_mode
 
   scene_repeat_count:          !input scene_repeat_count
-  scene_repeat_delay_milliseconds: 500
 
 trigger_variables:
   enabled_helper:              !input enabled_helper
@@ -312,12 +311,6 @@ action:
 
       # If the enabled helper is OFF, we should start by resetting
       # the countdown timer to default
-      - alias: "If the enabled helper is OFF, reset countdown timer to default"
-        if:
-          - condition: trigger
-            id:
-              - Enabled Helper is off
-        then:
       - alias: "Reset countdown timer when enabled helper is switched OFF."
         service: input_number.set_value
         data:
@@ -337,30 +330,18 @@ action:
               state: "on"
             then:
               - alias: "Activate the ON scene"
-                repeat:
+                service: scene.turn_on
-                  count: "{{ scene_repeat_count  }}"
-                  sequence:
-                    - service: scene.turn_on
                 target:
                   entity_id: !input scene_on
-                    - delay:
-                        milliseconds: "{{ scene_repeat_delay_milliseconds }}"
             else:
               - alias: "Activate the OFF scene"
-                repeat:
+                service: scene.turn_on
-                  count: "{{ scene_repeat_count }}"
-                  sequence:
-                    - service: scene.turn_on
                 target:
                   entity_id: !input scene_off
-                    - delay:
+          - stop: ""
-                        milliseconds: "{{ scene_repeat_delay_milliseconds }}"
-          - stop: "Enabled helper was on or auto mode was on; Determined scene to activate based on current motion."
 
-      # At this point, the enabled helper is assumed to be OFF
+      # In ON mode, just activate the ON scene
-
+      - alias: "on mode: just activate the ON scene"
-      # In disabled_scene::ON mode, just activate the ON scene
-      - alias: "disabled_scene::on mode: just activate the ON scene"
         if:
           - condition: template
             value_template: "{{ disabled_scene == 'on' }}"
@@ -372,11 +353,11 @@ action:
                   target:
                     entity_id: !input scene_on
                 - delay:
-                    milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                    milliseconds: 500
-          - stop: "Enabled helper is off and disabled scene was ON; Set ON scene"
+          - stop: ""
 
-      # In disabled_scene::OFF mode, just activate the OFF scene
+      # In OFF mode, just activate the OFF scene
-      - alias: "disabled_scene::off mode: just activate the OFF scene"
+      - alias: "off mode: just activate the ON scene"
         if:
           - condition: template
             value_template: "{{ disabled_scene == 'off' }}"
@@ -388,11 +369,11 @@ action:
                   target:
                     entity_id: !input scene_off
                 - delay:
-                    milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                    milliseconds: 500
-          - stop: "Enabled helper is off and disabled scene was OFF; Set OFF scene"
+          - stop: ""
 
-      # In disabled_scene::notice mode, just activate the NOTICE scene
+      # In notice mode, just activate the NOTICE scene
-      - alias: "disabled_scene::notice mode: just activate the NOTICE scene"
+      - alias: "notice mode: just activate the NOTICE scene"
         if:
           - condition: template
             value_template: "{{ disabled_scene == 'notice' }}"
@@ -404,11 +385,11 @@ action:
                   target:
                     entity_id: !input scene_notice
                 - delay:
-                    milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                    milliseconds: 500
-          - stop: "Enabled helper is off and disabled scene was NOTICE; Set NOTICE scene"
+          - stop: ""
 
-      # In disabled_scene::warning mode, just activate the WARNING scene
+      # In warning mode, just activate the WARNING scene
-      - alias: "disabed_scene::warning mode: just activate the WARNING scene"
+      - alias: "warning mode: just activate the WARNING scene"
         if:
           - condition: template
             value_template: "{{ disabled_scene == 'warning' }}"
@@ -420,8 +401,8 @@ action:
                   target:
                     entity_id: !input scene_warning
                 - delay:
-                    milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                    milliseconds: 500
-          - stop: "Enabled helper is off and disabled scene was WATNING; Set WARNING scene"
+          - stop: ""
 
       # Don't do anything after processing the enabled_helper triggers
       - stop: "Done handling enabled helper"
@@ -467,7 +448,7 @@ action:
               target:
                 entity_id: !input scene_on
             - delay:
-                milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                milliseconds: 500
 
 
     # Motion is not detected
@@ -486,8 +467,8 @@ action:
 
       # Initial period where nothing happens
       - alias: "Delay appropriately before doing anything"
-        wait_template: "{{ states[motion_sensor].state == 'on' or (enabled_helper != None and is_state(enabled_helper, 'off') ) }}"
+        wait_template: "{{ states[motion_sensor].state == 'on' }}"
-        timeout: "{{ states[delay_seconds_helper].state }}"
+        timeout: "{{ states[delay_seconds_helper].state or (enabled_helper != None and is_state(enabled_helper, 'off') ) }}"
 
       - alias: "Quit now if the enabled-helper went OFF"
         if:
@@ -496,10 +477,9 @@ action:
           - condition: template
             value_template: "{{ is_state( enabled_helper, 'off' ) }}"
         then:
-          stop: "Interrupted initial delay because the enabled helper turned OFF."
+          stop: "Quitting early because the enabled-helper went OFF."
 
-      - alias: "Motion detected again during initial delay; Interrupt initial delay"
+      - if:
-        if:
         - condition: state
           entity_id: !input motion_sensor
           state: "on"
@@ -536,7 +516,7 @@ action:
               target:
                 entity_id: !input scene_notice
             - delay:
-                milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                milliseconds: 500
 
       - alias: "Delay during the notice period"
         wait_template: "{{ states[motion_sensor].state == 'on' or (enabled_helper != None and is_state('enabled_helper', 'off') ) }}"
@@ -549,11 +529,10 @@ action:
           - condition: template
             value_template: "{{ is_state( enabled_helper, 'off' ) }}"
         then:
-          stop: "Interrupting NOTICE period because the enabled-helper went OFF."
+          stop: "Quitting early because the enabled-helper went OFF."
 
 
-      - alias: "If motion interrupted the NOTICE period, activate the ON scene"
+      - if:
-        if:
         - condition: state
           entity_id: !input motion_sensor
           state: "on"
@@ -625,7 +604,7 @@ action:
               target:
                 entity_id: !input scene_warning
             - delay:
-                milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                milliseconds: 500
 
       - alias: "Delay during the warning period"
         wait_template: "{{ states[motion_sensor].state == 'on' or (enabled_helper != None and is_state('enabled_helper', 'off') ) }}"
@@ -638,10 +617,9 @@ action:
           - condition: template
             value_template: "{{ is_state( enabled_helper, 'off' ) }}"
         then:
-          stop: "Interrupting the WARNING sequence because the enabled-helper went OFF."
+          stop: "Quitting early because the enabled-helper went OFF."
 
-      - alias: "If motion interrupts the WARNING sequence, just activate the ON scene"
+      - if:
-        if:
         - condition: state
           entity_id: !input motion_sensor
           state: "on"
@@ -655,7 +633,7 @@ action:
                   target:
                     entity_id: !input scene_on
                 - delay:
-                    milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                    milliseconds: 500
 
           - alias: "Double countdown timer when user interrupts the warning period."
             service: input_number.set_value
@@ -741,7 +719,7 @@ action:
               target:
                 entity_id: !input scene_off
             - delay:
-                milliseconds: "{{ scene_repeat_delay_milliseconds }}"
+                milliseconds: 500
 
       - alias: "Reset countdown timer after turning off lights."
         service: input_number.set_value