More voice notification updates...minor stuff tweaking routing and such

config/packages/announcements.yaml

@@ -137,6 +137,7 @@ automation:
       - wed
       - thu
       - fri
+      - sat
     action:
     - service: script.morning_wakeup_report
         
@@ -151,12 +152,7 @@ automation:
     action:
     - service: scene.turn_on
       entity_id: scene.skylar_room_morning
-    - service: >
-        {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
-          script.skylar_morning_briefing_jarvis
-        {% else %}
-          script.skylar_morning_briefing_alexa
-        {%- endif %}
+    - service: script.skylar_morning_briefing_jarvis
   
   - id: bbbafc52-eab1-44cd-ac24-4f9b7f4210b6
     alias: set skylar morning report time
@@ -214,12 +210,7 @@ script:
 
   skylar_morning_briefing:
     sequence:
-    - service: >
-        {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
-          script.speech_engine
-        {% else %}
-          script.alexa_voice
-        {%- endif %}
+    - service: script.speech_engine
       data: 
           who: >
             {%- if is_state('binary_sensor.theater_occupancy', 'on') and is_state('media_player.theater_tv', 'on') %}
@@ -233,21 +224,21 @@ script:
     sequence:
     - service: script.speech_engine
       data_template:
-        who: '{{ states.sensor.room_audio.state }}'
+        who: main
         message: !include ../templates/speech/skylar_nightly_briefing.yaml
 
   nightly_briefing_report:
     sequence:
     - service: script.speech_engine
       data_template:
-        who: '{{ states.sensor.room_audio.state }}'
+        who: main
         message: !include ../templates/speech/nightly_briefing.yaml
 
   sundown_briefing:
     sequence:
     - service: script.speech_engine
       data_template:
-        who: '{{ states.sensor.room_audio.state }}'
+        who: kitchen
         message: !include ../templates/speech/sundown_briefing.yaml
 
   morning_briefing:

config/packages/audio.yaml

@@ -117,7 +117,7 @@ sensor:
           {% if sensor_count >= 1 %}
             {% for sensor in expand('group.occupancy') %}
               {% if as_timestamp(sensor.last_changed) == as_timestamp(expand('group.occupancy') | selectattr('state', 'eq', 'on') | map(attribute='last_changed') | max) %}
-                {%- if sensor.name == 'Theater Occupancy' and is_state('media_player.theater_tv', 'on') %}
+                {%- if is_state('media_player.theater_tv', 'on') %}
                   theater
                 {% elif sensor.name == 'Kitchen Occupancy' %}
                   kitchen

config/packages/presence.yaml

@@ -444,11 +444,7 @@ automation:
           object_id: "arriving"
           add_entities: >-
             {{ trigger.to_state.entity_id }}
-      - service: script.standby
-      - service: script.washer_finished_notification_audible
-      - wait_template: "{{ states.binary_sensor.kitchen_door.state == 'on' }}"
-        timeout: '00:01:00'
-      - delay: '00:02:00'
+      - delay: '00:03:00'
       - service: script.speech_engine
         data_template:
           who: main
@@ -532,7 +528,6 @@ script:
       entity_id: sensor.family_status
       state: Away
     - service: script.standby
-    - service: script.washer_finished_notification_audible
     - service: mqtt.publish
       data:
         topic: house/family/status