Merge context resets as planned in #127

appdaemon/apps/apps.yaml

@@ -49,7 +49,7 @@ white_noise_living_room:
 white_noise_kallen_bedroom:
   module: whitenoise
   class: WhiteNoise
-  media_player: kallen_bedroom_speaker
+  media_player: kallen_bedroom_google_speaker
   input_boolean: white_noise_kallen_bedroom
   filename: !secret remote_url_oceanwaves
 
@@ -63,7 +63,7 @@ white_noise_kallen_bedroom:
 white_noise_emma_bedroom:
   module: whitenoise
   class: WhiteNoise
-  media_player: emma_bedroom_speaker
+  media_player: emma_bedroom_google_speaker
   input_boolean: white_noise_emma_bedroom
   filename: !secret remote_url_oceanwaves
 

packages/announcements.yaml

@@ -141,7 +141,6 @@ automation:
     action:
     - service: input_boolean.turn_off
       entity_id: input_boolean.audible_notifications
-    - service: script.reset_annc_switches
 
   - id: 842a1b9a-de3b-4f0a-9ecc-6cfacd92bf5d
     alias: Kallen Briefings

packages/presence.yaml

@@ -614,22 +614,6 @@ automation:
         target:
           entity_id: input_boolean.away_mode_skipped
 
-  - id: 11eee604-db2a-4ab2-a372-70026a4f1a6f
-    alias: Door Openings Reset
-    trigger:
-      - platform: time
-        at: 00:00
-    action:
-      - service: input_number.set_value
-        target:
-          entity_id:
-            - input_number.back_door_opened_today
-            - input_number.front_door_opened_today
-            - input_number.basement_studio_door_opened_today
-            - input_number.downstairs_bathroom_door_opened_today
-        data:
-          value: 0
-
   - id: 1061c626-17c1-4f0b-8f55-2afc60ef8a3a
     alias: Vacation Mode
     trigger:

packages/scheduling.yaml

@@ -150,13 +150,83 @@ automation:
             - service: script.security_scheduling
 
   - id: 7350300d-94d3-4ea3-97bb-b0673eafd71f
-    alias: Scheduling Reset
+    alias: Scheduled Reset
-    description: "Reset all 'Briefing Ran' input booleans for the next day"
+    description: "Reset all context entities for the next day at the appropriate times"
+    mode: restart
     trigger:
       - platform: time
         at: "00:00:00"
+        id: midnight
+      - platform: time
+        at: input_datetime.audible_notification_off
+        id: audible-off
+      - platform: time
+        at: input_datetime.kallen_school_day_end
+        id: school-end
+      - platform: state
+        entity_id: sensor.twitch_ironnerd24
+        from: 'streaming'
+        to: 'offline'
+        id: stream-offline
+      - platform: time
+        at: "06:00:00"
+        id: six
     action:
+      - choose:
+        - conditions:
+          - condition: trigger
+            id: midnight
+          sequence:
           - service: script.scheduling_reset
+          - service: script.kallen_school_reset_late
+          - service: automation.turn_on
+            target:
+              entity_id:
+                - automation.scheduled_alarm_rearm
+                - automation.scheduled_alarm_disarm
+          - service: input_boolean.turn_off
+            target:
+              entity_id:
+                - input_boolean.skip_disarm
+                - input_boolean.skip_rearm
+        - conditions:
+          - condition: trigger
+            id: audible-off
+          sequence:
+          - service: script.reset_annc_switches
+          - service: input_number.set_value
+            target:
+              entity_id:
+                - input_number.back_door_opened_today
+                - input_number.front_door_opened_today
+                - input_number.basement_studio_door_opened_today
+                - input_number.downstairs_bathroom_door_opened_today
+            data:
+              value: 0
+        - conditions:
+          - condition: trigger
+            id: school-end
+          sequence:
+          - service: script.kallen_school_reset
+        - conditions:
+          - condition: trigger
+            id: stream-offline
+          sequence:
+          - service: input_boolean.turn_off
+            target:
+              entity_id: input_boolean.tony_streaming_today
+        - conditions:
+          - condition: trigger
+            id: six
+          sequence:
+          - if:
+            - condition: state
+              entity_id: sensor.twitch_ironnerd24
+              state: 'offline'
+            then:
+            - service: input_boolean.turn_off
+              target:
+                entity_id: input_boolean.tony_streaming_today
 
 script:
   kallen_scheduling_morning:

packages/school.yaml

@@ -276,28 +276,6 @@ automation:
       target:
         entity_id: input_boolean.school_today_ran
 
-  - id: b9028665-401c-4de3-8f13-1099160b011f
-    alias: Kallen School Reset
-    initial_state: true
-    trigger:
-      - platform: time
-        at: input_datetime.kallen_school_day_end
-        id: day_end
-      - platform: time
-        at: 00:00
-        id: midnight
-    action: 
-      - if:
-        - condition: trigger
-          id: day_end
-        then:
-        - service: script.kallen_school_reset
-      - if:
-        - condition: trigger
-          id: midnight
-        then:
-        - service: script.kallen_school_reset_late
-
   - id: 05ee0f8d-5411-4486-8acf-9bfadad2b23a
     alias: End of School Year
     initial_state: true

packages/security.yaml

@@ -473,23 +473,6 @@ automation:
             - switch.adaptive_lighting_living_room
             - switch.adaptive_lighting_tina_lamp
 
-  - id: 027f6f05-289f-4f3d-925e-54d95226ea34
-    alias: Security Schedules Reset
-    trigger:
-      - platform: time
-        at: "00:00:00"
-    action:
-      - service: automation.turn_on
-        target:
-          entity_id:
-            - automation.scheduled_alarm_rearm
-            - automation.scheduled_alarm_disarm
-      - service: input_boolean.turn_off
-        target:
-          entity_id:
-            - input_boolean.skip_disarm
-            - input_boolean.skip_rearm
-
   - id: ea52c580-dcf4-4eec-8d25-adda3b9e7cf4
     alias: Alexa Guard Handling
     description: Sync state of Alexa guard with state of main alarm system

packages/tony.yaml

@@ -170,36 +170,6 @@ automation:
     action:
       - service: script.tony_stream_today
 
-  - id: 465ec4be-8e6c-444b-bfe7-6d4796888be4
-    alias: Tony Stream Reset
-    initial_state: true
-    trigger:
-      - platform: state
-        entity_id: sensor.twitch_ironnerd24
-        from: 'streaming'
-        to: 'offline'
-        id: offline
-      - platform: time
-        at: "06:00:00"
-        id: time
-    action:
-      - choose:
-        - conditions:
-          - condition: trigger
-            id: offline
-          sequence:
-          - service: script.tony_stream_reset
-        - conditions:
-          - condition: trigger
-            id: time
-          sequence:
-          - if:
-            - condition: state
-              entity_id: sensor.twitch_ironnerd24
-              state: 'offline'
-            then:
-            - service: script.tony_stream_reset
-
 script:
   tony_morning_meds:
     alias: 'Tony Morning Meds'
@@ -432,9 +402,3 @@ script:
             {{ time_from_calendar('calendar.tony_s_twitch_schedule','start_time','set') }}
       - service: input_boolean.turn_on
         entity_id: input_boolean.tony_streaming_today
-
-  tony_stream_reset:
-    alias: 'Tony Stream Reset'
-    sequence:
-      - service: input_boolean.turn_off
-        entity_id: input_boolean.tony_streaming_today