From 81705cdd196cba8d7ed980ae464ba3fb9cbb3d85 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Fri, 22 Sep 2023 16:45:55 -0400
Subject: [PATCH] Move med switch resets over to the once-a-day resetter, fix
 #144

---
 packages/kallen.yaml     |  6 ------
 packages/scheduling.yaml | 45 +++++++++++++++++++++++++---------------
 packages/tina.yaml       |  6 ------
 packages/tony.yaml       |  6 ------
 4 files changed, 28 insertions(+), 35 deletions(-)

diff --git a/packages/kallen.yaml b/packages/kallen.yaml
index a42de28..1868785 100644
--- a/packages/kallen.yaml
+++ b/packages/kallen.yaml
@@ -206,9 +206,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.kallen_morning_meds_taken
     - service: script.text_notify
       data:
         who: kallen
@@ -303,9 +300,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.kallen_night_meds_taken
     - service: script.text_notify
       data:
         who: kallen
diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml
index 23da107..6120b3a 100644
--- a/packages/scheduling.yaml
+++ b/packages/scheduling.yaml
@@ -168,9 +168,15 @@ automation:
         from: 'streaming'
         to: 'offline'
         id: stream-offline
+      - platform: time
+        at: "04:00:00"
+        id: 4am
+      - platform: time
+        at: "16:00:00"
+        id: 4pm
       - platform: time
         at: "06:00:00"
-        id: six
+        id: 6am
     action:
       - choose:
         - conditions:
@@ -217,7 +223,18 @@ automation:
               entity_id: input_boolean.tony_streaming_today
         - conditions:
           - condition: trigger
-            id: six
+            id: 4am
+          sequence:
+          - service: input_boolean.turn_off
+            target:
+              entity_id:
+                - input_boolean.kallen_morning_meds_taken
+                - input_boolean.kallen_night_meds_taken
+                - input_boolean.tony_morning_meds_taken
+                - input_boolean.tina_morning_meds_taken
+        - conditions:
+          - condition: trigger
+            id: 6am
           sequence:
           - if:
             - condition: state
@@ -227,16 +244,20 @@ automation:
             - service: input_boolean.turn_off
               target:
                 entity_id: input_boolean.tony_streaming_today
+        - conditions:
+          - condition: trigger
+            id: 4pm
+          sequence:
+          - service: input_boolean.turn_off
+            target:
+              entity_id:
+                - input_boolean.tony_night_meds_taken
+                - input_boolean.tina_night_meds_taken
 
 script:
   kallen_scheduling_morning:
     alias: 'Kallen Scheduling Morning'
     sequence:
-      - service: input_boolean.turn_off
-        target:
-          entity_id:
-            - input_boolean.kallen_morning_meds_taken
-            - input_boolean.kallen_night_meds_taken
       - if:
         - condition: state
           entity_id: input_boolean.school_in_session
@@ -661,11 +682,6 @@ script:
             {% else %}
               {{ states('input_datetime.master_bedroom_wakeup') }}
             {% endif %}
-      - service: input_boolean.turn_off
-        target:
-          entity_id:
-            - input_boolean.tony_morning_meds_taken
-            - input_boolean.tina_morning_meds_taken
       - service: input_boolean.turn_on
         target:
           entity_id: input_boolean.master_bedroom_scheduling_morning_ran
@@ -735,11 +751,6 @@ script:
               {% else %}
                 N/A
               {% endif %}
-        - service: input_boolean.turn_off
-          target:
-            entity_id:
-              - input_boolean.tony_night_meds_taken
-              - input_boolean.tina_night_meds_taken
         - service: input_datetime.set_datetime
           target:
             entity_id: input_datetime.tina_night_meds_notify
diff --git a/packages/tina.yaml b/packages/tina.yaml
index 1b67daf..d112b81 100644
--- a/packages/tina.yaml
+++ b/packages/tina.yaml
@@ -266,9 +266,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.tina_morning_meds_taken
     - service: script.text_notify
       data:
         who: tina
@@ -353,9 +350,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.tina_night_meds_taken
     - service: script.text_notify
       data:
         who: tina
diff --git a/packages/tony.yaml b/packages/tony.yaml
index 5301fbd..4e324f1 100644
--- a/packages/tony.yaml
+++ b/packages/tony.yaml
@@ -158,9 +158,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.tony_morning_meds_taken
     - service: script.text_notify
       data:
         who: tony
@@ -245,9 +242,6 @@ script:
     icon: mdi:medical-bag
     mode: restart
     sequence:
-    - service: input_boolean.turn_off
-      target:
-        entity_id: input_boolean.tony_night_meds_taken
     - service: script.text_notify
       data:
         who: tony