From 3b34204c4ba28333c895a1cbe0c9c6d65100d812 Mon Sep 17 00:00:00 2001
From: Tony Stork <tm24fan8@gmail.com>
Date: Thu, 21 Apr 2022 14:11:38 -0400
Subject: [PATCH] Some workarounds for current sensor logic

---
 packages/announcements.yaml | 52 +++++++++++++++++++++++--------------
 1 file changed, 33 insertions(+), 19 deletions(-)

diff --git a/packages/announcements.yaml b/packages/announcements.yaml
index 401c170..dbaf059 100644
--- a/packages/announcements.yaml
+++ b/packages/announcements.yaml
@@ -63,16 +63,8 @@ automation:
     - service: input_boolean.turn_off
       entity_id: input_boolean.audible_notifications
 
-  - id: b8d21d04-c263-4d33-9590-9fb1e76b0de8
-    alias: Kallen Nightly Report
-    trigger:
-      platform: time
-      at: input_datetime.kallen_nightly_briefing
-    action:
-    - service: script.kallen_nightly_briefing
-
   - id: c772b54d-6448-4d74-a0c2-32998f49b17c
-    alias: Kallen Scheduling
+    alias: Kallen Scheduling - Morning
     trigger:
       platform: time
       at: '06:05:00'
@@ -86,6 +78,22 @@ automation:
           {% else %}
             08:00
           {% endif %}
+    - service: input_datetime.set_datetime
+      entity_id: input_datetime.kallen_morning_briefing
+      data_template:
+        time: >
+          {% if is_state('input_boolean.school_today', 'on') %}
+            07:40
+          {% else %}
+            10:00
+          {% endif %}
+
+  - id: 0335656c-b5cf-4983-bbac-a2d71ca2b74e
+    alias: Kallen Scheduling - Evening
+    trigger:
+      platform: time
+      at: '16:00:00'
+    action:
     - service: input_datetime.set_datetime
       entity_id: input_datetime.kallen_bedtime
       data_template:
@@ -104,18 +112,9 @@ automation:
           {% else %}
             21:40
           {% endif %}
-    - service: input_datetime.set_datetime
-      entity_id: input_datetime.kallen_morning_briefing
-      data_template:
-        time: >
-          {% if is_state('input_boolean.school_today', 'on') %}
-            07:40
-          {% else %}
-            10:00
-          {% endif %}
 
   - id: 1c9f7e4b-2d5a-4b95-bd80-d9aa2244a6db
-    alias: House Scheduling
+    alias: House Scheduling - Morning
     trigger:
       platform: time
       at: '06:10:00'
@@ -129,6 +128,13 @@ automation:
           {% else %}
             09:00
           {% endif %}
+
+  - id: 55293e9a-ec3b-46bb-af47-94e95f3c9951
+    alias: House Scheduling - Evening
+    trigger:
+      platform: time
+      at: '16:05:00'
+    action:
     - service: input_datetime.set_datetime
       entity_id: input_datetime.audible_notification_off
       data_template:
@@ -147,6 +153,14 @@ automation:
     action:
     - service: script.kallen_morning_briefing
 
+  - id: b8d21d04-c263-4d33-9590-9fb1e76b0de8
+    alias: Kallen Nightly Briefing
+    trigger:
+      platform: time
+      at: input_datetime.kallen_nightly_briefing
+    action:
+    - service: script.kallen_nightly_briefing
+
 script:
   reset_annc_switches:
     sequence: