Evening lighting improvements #71

packages/lighting_and_scenes.yaml

@@ -907,6 +907,12 @@ script:
     alias: 'Evening on First Floor'
     sequence:
       - choose:
+        - conditions:
+          - condition: state
+            entity_id: binary_sensor.early_night_mode
+            state: 'off'
+          sequence:
+          - stop: "This scene does nothing during daytime"
         - conditions:
           - condition: state
             entity_id: input_boolean.give_me_darkness
@@ -985,6 +991,12 @@ script:
     alias: 'Evening on Second Floor'
     sequence:
       - choose:
+        - conditions:
+          - condition: state
+            entity_id: binary_sensor.early_night_mode
+            state: 'off'
+          sequence:
+          - stop: "This scene does nothing during daytime"
         - conditions:
           - condition: state
             entity_id: input_boolean.give_me_darkness

scripts.yaml

@@ -26,57 +26,11 @@ give_me_darkness:
     target:
       entity_id: input_boolean.give_me_darkness
     alias: Turn on input boolean
-  - service: light.turn_on
-    data: {}
-    target:
-      area_id:
-      - dining_room
-    alias: Turn on Dining Room Lamp
-  - service: input_select.select_option
-    target:
-      entity_id:
-      - input_select.upstairs_hallway_scenes
-      - input_select.mud_room_scenes
-      - input_select.upstairs_bathroom_scenes
-    data:
-      option: Nightlight
-    alias: Set nightlights
-  - service: switch.turn_on
-    target:
-      entity_id:
-      - switch.adaptive_lighting_sleep_mode_dining_room
-    data: {}
-    alias: Turn on night mode for Dining Room Lamp
   - if:
-    - condition: state
-      entity_id: person.christina_stork
-      state: home
-      alias: Check if Christina is home
-    then:
-    - service: input_select.select_option
-      data:
-        option: Night Mode
-      target:
-        entity_id: input_select.tina_desk_scenes
-      alias: Set Tina desk lights to Night Mode
-    alias: If Christina is home, set her desk lights to night mode
-  - choose:
-    - conditions:
     - condition: state
       entity_id: input_boolean.guest_mode
       state: 'off'
-        alias: If Guest Mode is off
+    then:
-      sequence:
-      - service: light.turn_off
-        target:
-          area_id:
-          - kallen_bedroom
-          - master_bedroom
-          - living_room
-          - emma_bedroom
-          - downstairs_bathroom
-        data: {}
-        alias: Turn off the usual lights
     - if:
       - condition: template
         value_template: "{% if is_state('person.tony_stork','home') and is_state('person.christina_stork','home')
@@ -91,23 +45,15 @@ give_me_darkness:
           alexa_device: '{{ states(''sensor.last_alexa'') }}'
         alias: Ask to arm security
       alias: Ask to arm security if both adults are home
-    - conditions:
+    alias: If guest mode is off
-      - condition: state
+  - wait_template: '{{ is_state(''input_boolean.give_me_darkness'',''on'') }}'
-        entity_id: input_boolean.guest_mode
+    continue_on_timeout: true
-        state: 'on'
+    timeout:
-        alias: If Guest Mode is on
+      seconds: 5
-      sequence:
+  - service: script.evening_on_first_floor
-      - service: light.turn_off
+    data: {}
-        target:
+  - service: script.evening_on_second_floor
-          area_id:
-          - kallen_bedroom
-          - master_bedroom
-          - emma_bedroom
-          - downstairs_bathroom
     data: {}
-        alias: Same as other option, but leave living room light on
-    alias: Turn off lights, leave living room light on if guest mode is on, arm security
-      if not
   mode: single
   icon: mdi:weather-night
 start_youtube: