Starting to dig into Speech Engine...annnnnd holy shit

.HA_VERSION

@@ -1 +1 @@
-2025.4.1
+2025.3.3

automations.yaml

@@ -311,118 +311,102 @@
 - id: '1651787468337'
   alias: Reboot handling
   description: ''
-  triggers:
+  trigger:
-  - event: start
+  - platform: homeassistant
+    event: start
     id: hass_start
-    trigger: homeassistant
+  - platform: homeassistant
-  - event: shutdown
+    event: shutdown
     id: hass_stop
-    trigger: homeassistant
+  condition: []
-  conditions: []
+  action:
-  actions:
+  - if:
-  - alias: Routing
+    - condition: trigger
-    choose:
+      id: hass_start
-    - conditions:
+      alias: Startup
-      - condition: trigger
+    then:
-        id: hass_start
+    - delay:
-        alias: Startup
+        hours: 0
-      sequence:
+        minutes: 1
-      - delay:
+        seconds: 0
-          hours: 0
+        milliseconds: 0
-          minutes: 1
+    - service: automation.turn_on
-          seconds: 0
+      data: {}
-          milliseconds: 0
+      target:
-      - data: {}
+        entity_id:
-        target:
+        - automation.family_has_arrived
-          entity_id:
+        - automation.family_has_left
-          - automation.family_has_arrived
+        - automation.scheduled_alarm_rearm
-          - automation.family_has_left
+        - automation.scheduled_alarm_disarm
-          - automation.scheduled_alarm_rearm
+    - service: switch.turn_off
-          - automation.scheduled_alarm_disarm
+      target:
-        action: automation.turn_on
+        entity_id:
-      - if:
+        - switch.presence_simulation
+      data: {}
+    - if:
+      - condition: and
+        conditions:
+        - condition: state
+          entity_id: input_boolean.holiday_mode
+          state: 'on'
+          alias: Is holiday mode on?
         - condition: state
           entity_id: binary_sensor.early_night_mode
-          state: 'off'
+          state: 'on'
-        then:
+          alias: Is early night mode on?
-        - action: input_boolean.turn_off
+        alias: Test conditions
-          metadata: {}
+      then:
-          data: {}
+      - service: switch.turn_on
-          target:
-            entity_id:
-            - input_boolean.give_me_darkness
-            - input_boolean.night_mode
-            - input_boolean.goodnight
-        alias: If early night mode is off, turn off other night-related modes
-      - target:
-          entity_id:
-          - switch.presence_simulation
         data: {}
-        action: switch.turn_off
-      - if:
-        - condition: and
-          conditions:
-          - condition: state
-            entity_id: input_boolean.holiday_mode
-            state: 'on'
-            alias: Is holiday mode on?
-          - condition: state
-            entity_id: binary_sensor.early_night_mode
-            state: 'on'
-            alias: Is early night mode on?
-          alias: Test conditions
-        then:
-        - data: {}
-          target:
-            entity_id: switch.animated_scene_{{ states('input_select.holiday_animation')
-              | lower }}
-          alias: Turn on the appropriate animated holiday scene
-          action: switch.turn_on
-        alias: Turn on animated holiday scene if night time and holiday mode is on
-      - data: {}
-        action: script.tony_desktop_refresh
-      - data: {}
-        action: script.tina_desktop_refresh
-      - data: {}
-        action: script.asus_laptop_refresh
-      - data: {}
-        action: script.kallen_desktop_refresh
-      - data: {}
-        action: script.win10vm_refresh
-      - data:
-          topic: house/basement/server/glances
-          payload: restart
-          qos: 0
-          retain: false
-        alias: Restart Glances via MQTT
-        action: mqtt.publish
-      - data: {}
-        alias: Reset all speaker volumes
-        action: script.volume_reset
-      - if:
-        - condition: state
-          entity_id: input_boolean.studio_quiet
-          state: 'off'
-        then:
-        - data:
-            who: basement
-            call_ha_started: 1
-          action: script.status_annc
-        else:
-        - stop: Studio has requested quiet, and Jarvis respects this
-        alias: Announce back online, unless studio has requested quiet
-    - conditions:
-      - condition: trigger
-        id: hass_stop
-        alias: Shutdown
-      sequence:
-      - data:
-          stop_actions: true
         target:
-          entity_id:
+          entity_id: switch.animated_scene_{{ states('input_select.holiday_animation')
-          - automation.family_has_arrived
+            | lower }}
-          - automation.family_has_left
+        alias: Turn on the appropriate animated holiday scene
-        action: automation.turn_off
+      alias: Turn on animated holiday scene if night time and holiday mode is on
+    - service: script.tony_desktop_refresh
+      data: {}
+    - service: script.tina_desktop_refresh
+      data: {}
+    - service: script.asus_laptop_refresh
+      data: {}
+    - service: script.kallen_desktop_refresh
+      data: {}
+    - service: script.win10vm_refresh
+      data: {}
+    - service: mqtt.publish
+      data:
+        topic: house/basement/server/glances
+        payload: restart
+        qos: 0
+        retain: false
+      alias: Restart Glances via MQTT
+    - service: script.volume_reset
+      data: {}
+      alias: Reset all speaker volumes
+    - if:
+      - condition: state
+        entity_id: input_boolean.studio_quiet
+        state: 'off'
+      then:
+      - service: script.status_annc
+        data:
+          who: basement
+          call_ha_started: 1
+      else:
+      - stop: Studio has requested quiet, and Jarvis respects this
+      alias: Announce back online, unless studio has requested quiet
+  - if:
+    - condition: trigger
+      id: hass_stop
+      alias: Shutdown
+    then:
+    - service: automation.turn_off
+      data:
+        stop_actions: true
+      target:
+        entity_id:
+        - automation.family_has_arrived
+        - automation.family_has_left
   mode: queued
 - id: '1654547257475'
   alias: Battery Monitoring
@@ -1326,23 +1310,10 @@
     input:
       dimmer_device: 40c14ccfe958d21d75888a968bbbf908
       on_short_action:
-      - if:
+      - data: {}
-        - condition: state
+        target:
           entity_id: light.tina_desk_lights
-          state: 'off'
+        action: light.turn_on
-        then:
-        - action: input_select.select_option
-          metadata: {}
-          data:
-            option: Reset
-          target:
-            entity_id: input_select.tina_desk_scenes
-        else:
-        - action: light.turn_off
-          metadata: {}
-          data: {}
-          target:
-            entity_id: light.tina_desk_lights
       on_long_action:
       - data:
           option: Reset
@@ -5059,6 +5030,38 @@
         alias: Update Notification
   mode: parallel
   max: 10
+- id: '1714595577405'
+  alias: Emma Bedroom Cooling
+  description: ''
+  trigger:
+  - platform: time
+    at: input_datetime.emma_bedroom_cooling
+    alias: At the scheduled cooling time
+  condition:
+  - condition: state
+    entity_id: input_boolean.emma_sleeping
+    state: 'off'
+    alias: If Emma is not already asleep
+  - condition: state
+    entity_id: input_select.scheduled_climate_mode_emma_bedroom
+    state: AC
+    alias: If the AC is scheduled to run
+  action:
+  - service: fan.turn_on
+    metadata: {}
+    data: {}
+    target:
+      entity_id: fan.emma_air_conditioner
+    alias: Turn on Emma's air conditioner
+  - service: script.text_notify
+    data:
+      who: parents
+      title: Emma Climate Schedule
+      message: The air conditioner in Emma's Bedroom has been activated.
+      type: normal
+      tag: emma-climate
+    alias: Send AC notification
+  mode: restart
 - id: '1716497196985'
   alias: Emma Bedtime Rescheduler
   description: Keeps Emma's bedtime up-to-date with reality
@@ -6094,30 +6097,3 @@
         action: script.tina_tylenol
   mode: parallel
   max: 10
-- id: '1742799079017'
-  alias: Emma Sleep Handling
-  description: Awareness of when Emma is asleep or wakes up
-  triggers:
-  - trigger: state
-    entity_id:
-    - input_boolean.emma_sleeping
-    from: 'on'
-    to: 'off'
-    id: sleep-off
-    alias: Sleep Off
-  - trigger: state
-    entity_id:
-    - binary_sensor.family_home
-    from: 'on'
-    to: 'off'
-    id: family-left
-    alias: Family Left
-  conditions: []
-  actions:
-  - action: input_boolean.turn_on
-    metadata: {}
-    data: {}
-    target:
-      entity_id: input_boolean.emma_awake
-    alias: Turn on Emma Awake
-  mode: restart

custom_templates/sports.jinja

@@ -12,62 +12,21 @@
 {% endif %}
 {% endmacro %}
 
-{% macro period_str(team) %}
-{% if state_attr(team,'league') in ['NFL','NCAAF'] %}
-  quarter
-{% elif state_attr(team,'league') == 'MLB' %}
-  inning
-{% else %}
-  period
-{% endif %}
-{% endmacro %}
-
-{% macro sports_clock(team) %}
-  {% macro data() %}
-  {% set period_str = period_str(team) %}
-  {% set game_clock = state_attr(team,'clock') %}
-  {% if state_attr(team,'league') == 'MLB' %}
-    {% set inning_parts = game_clock.split(' ') %}
-    in the {{ inning_parts[0] ~ ' of the ' ~ inning_parts[1] ~ ' inning' }}
-  {% else %}
-    {% if ' - ' in game_clock %}
-      {% set clock_time, quarter = game_clock.split(' - ') %}
-      with {{ clock_time ~ ' remaining in the ' ~ quarter ~ ' ' ~ period_str }}
-    {% else %}
-      with {{ game_clock ~ ' remaining in the ' ~ period_str }}
-    {% endif %}
-  {% endif %}
-  {% endmacro %}
-{{ cleanup(data()) }}
-{% endmacro %}
-
 {% macro sports_pregame(team) %}
   {% macro data() %}
-  {% if state_attr(team,'opponent_name') %}
-    {% set opponent_name = state_attr(team, 'opponent_name') %}
-    {% if opponent_name.endswith(' St') %}
-      {% set opponent_name = opponent_name | replace(' St', ' State') %}
-    {% endif %}
-  {% endif %}
   {% if is_state(team,'PRE') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% if date == now().strftime('%m-%d') %}
-      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} at {{ state_attr(team,'venue') }}. 
+      The {{ state_attr(team,'friendly_name') }} will be playing today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} at {{ state_attr(team,'venue') }}. 
       {{ sports_str(team,'start') }} is at {{ state_attr(team,'date') | as_timestamp | timestamp_custom('%I:%M %p') }}. 
     {% endif %}
   {% endif %}
-  {% endmacro %}
+  {% endmacro%}
 {{ cleanup(data()) }}
 {% endmacro %}
 
 {% macro sports_main(team) %}
   {% macro data() %}
-  {% if state_attr(team,'opponent_name') %}
-    {% set opponent_name = state_attr(team, 'opponent_name') %}
-    {% if opponent_name.endswith(' St') %}
-      {% set opponent_name = opponent_name | replace(' St', ' State') %}
-    {% endif %}
-  {% endif %}
   {% if is_state(team,'POST') %}
     {% set date = state_attr(team,'date') | as_timestamp | timestamp_custom('%m-%d') %}
     {% set yday = (as_timestamp(now()) - (24*3600)) | timestamp_custom('%m-%d') %}
@@ -75,11 +34,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed today, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game today against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -88,11 +47,11 @@
       {% if state_attr(team,'clock') in ['postponed','Postponed'] %}
         The {{ state_attr(team,'friendly_name') }} had their game postponed yesterday, and it will be played at a later date. 
       {% elif (state_attr(team,'team_score') | int) == state_attr(team,'opponent_score') | int %}
-        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} tied in their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'team_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} won their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
       {% elif state_attr(team,'opponent_winner') == true %}
-        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
+        The {{ state_attr(team,'friendly_name') }} lost their game yesterday against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} by a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
       {% endif %}
       {% if state_attr(team,'clock') not in ['postponed','Postponed'] %}
         This brings their record to {{ state_attr(team,'team_record') | replace("-"," and ") }} on the season. 
@@ -100,11 +59,11 @@
     {% endif %}
   {% elif is_state(team,'IN') %}
     {% if (state_attr(team,'team_score') | int) == (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}.
+      The {{ state_attr(team,'friendly_name') }} are currently tied in their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
     {% elif (state_attr(team,'team_score') | int) > (state_attr(team,'opponent_score') | int) %}
-      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }} {{ sports_clock(team) }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently winning their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'team_score') }} to {{ state_attr(team,'opponent_score') }}. 
     {% else %}
-      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ opponent_name }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }} {{ sports_clock(team) }}. 
+      The {{ state_attr(team,'friendly_name') }} are currently losing their game against {% if state_attr(team,'league') != 'NCAAF'%}the{% endif %} {{ state_attr(team,'opponent_name') }} with a score of {{ state_attr(team,'opponent_score') }} to {{ state_attr(team,'team_score') }}. 
     {% endif %}
   {% endif %}
   {% endmacro %}

custom_templates/status.jinja

@@ -473,11 +473,12 @@
       Collin has Beyond The Bells today after school.
     {% endif %}
     {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
-      {{ states('input_text.kallen_pickup') }} will be picking Collin up from school today.
+      {{ states('input_text.kallen_pickup') }} will be picking Collin up from school today. 
-      {% if is_state('input_boolean.kallen_school_early_release','on') %}
+    {% else %}
-        Today is an early release day!
-      {% endif %}
       Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
+      {% if is_state('input_boolean.kallen_school_early_release','on') %}
+        And It is early release!
+      {% endif %}
     {% endif %}
     {% if states('sensor.windows_open') | int > 0 %}
       'I detect that there are windows open. Make sure you close them before you leave, or else the security system will not arm. '
@@ -543,11 +544,10 @@
         {% endif %}
         {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
           {{ states('input_text.kallen_pickup') }} will be picking him up from school today.
-          {% if is_state('input_boolean.kallen_school_early_release','on') %}
+        {% elif is_state('input_boolean.kallen_school_early_release','on') %}
-            The school is on an early release schedule, pickup is at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
+          The school is on an early release schedule, pickup is at {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
-          {% else %}
+        {% else %}
-            His pickup time is {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
+          His pickup time is {{ input_datetime_read('input_datetime.kallen_school_day_end') | trim }}.
-          {% endif %}
         {% endif %}
       {% else %}
         {{ identKallen }} has school at {{ input_datetime_read('input_datetime.kallen_school_day_start') | trim }} today.

input_select.yaml

@@ -11,7 +11,6 @@ report_type:
   options:
     - Bug Report
     - New Idea
-    - Adjustment
   initial: Bug Report
   icon: mdi:bug
 select_testing:

packages/climate.yaml

@@ -1,14 +1,14 @@
 template:
   - binary_sensor:
-    - name: Emma Bedroom Aircon - Compressor
+    - name: Emma Aircon - Compressor
       unique_id: 21bcbb62-823c-43ff-8c2c-26e940324ee6
-      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 150 }}"
+      state: "{{ states('sensor.emma_air_conditioner_power') | int > 150 }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
+      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
       device_class: running
-    - name: Emma Bedroom Aircon - Fan
+    - name: Emma Aircon - Fan
       unique_id: 9e3054cf-8f7e-4fef-9da4-5b2f2bc99c9d
-      state: "{{ states('sensor.emma_bedroom_aircon_power') | int > 20 }}"
+      state: "{{ states('sensor.emma_air_conditioner_power') | int > 20 }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unknown','unavailable'] }}"
+      availability: "{{ states('fan.emma_air_conditioner') not in ['unknown','unavailable'] }}"
       device_class: running
     - name: Master Bedroom Aircon - Compressor
       unique_id: 87051957-1dbc-4d65-b138-e8469728f58f
@@ -142,36 +142,6 @@ template:
           mdi:fan-off
         {% endif %}
       availability: "{{ states('climate.master_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Emma Bedroom Target Temp"
-      unique_id: b81152a1-d4d9-4e3e-8a78-6039de2884ad
-      state: "{{ state_attr('climate.emma_bedroom_aircon','temperature') | float }}"
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Emma Bedroom Eco Mode"
-      unique_id: 4b6fc8fc-4152-4d8b-ad8d-80f97fcabe44
-      state: "{{ is_state_attr('climate.emma_bedroom_aircon','preset_mode','eco') }}"
-      icon: >-
-        {% if is_state_attr('climate.emma_bedroom_aircon','preset_mode','eco') %}
-          mdi:home-lightning-bolt
-        {% else %}
-          mdi:home-lightning-bolt-outline
-        {% endif %}
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
-    - name: "Emma Bedroom Aircon Fan Mode"
-      unique_id: d678eb2e-be5b-4626-913d-fc1e32941ead
-      state: "{{ state_attr('climate.emma_bedroom_aircon','fan_mode') }}"
-      icon: >
-        {% if is_state_attr('climate.emma_bedroom_aircon','fan_mode','Auto') %}
-          mdi:fan-auto
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Low') %}
-          mdi:fan-speed-1
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','Medium') %}
-          mdi:fan-speed-2
-        {% elif is_state_attr('climate.emma_bedroom_aircon','fan_mode','High') %}
-          mdi:fan-speed-3
-        {% else %}
-          mdi:fan-off
-        {% endif %}
-      availability: "{{ states('climate.emma_bedroom_aircon') not in ['unavailable','unknown'] }}"
     - name: Living Room Average Temperature
       unique_id: c4a901a6-87e2-4257-b60b-2944be8fdf04
       state: >
@@ -217,17 +187,16 @@ input_boolean:
   master_bedroom_climate_protocol:
     name: Master Bedroom Climate Protocol
     icon: mdi:lightbulb-night
-  emma_bedroom_climate_protocol:
-    name: Emma Bedroom Climate Protocol
-    icon: mdi:lightbulb-night
   kallen_bedtime_protocol:
     name: Kallen Bedtime Protocol
     icon: mdi:lightbulb-night
 
-  # Turn on when air conditioners are installed, turn off in winter when we take them out
+  # Turn on when master bedroom air conditioner is installed, turn off in winter when we take it out, for smarter automations
   master_bedroom_aircon_installed:
     name: Master Bedroom Aircon Installed
     icon: mdi:tools
+
+  # Same thing, but for Emma's bedroom air conditioner
   emma_bedroom_aircon_installed:
     name: Emma Bedroom Aircon Installed
     icon: mdi:tools
@@ -236,9 +205,6 @@ input_boolean:
   master_bedroom_cooling_on:
     name: Master Bedroom Cooling On
     icon: mdi:snowflake
-  emma_bedroom_cooling_on:
-    name: Emma Bedroom Cooling On
-    icon: mdi:snowflake
 
   # Activated if the day will be excessively hot. For use with automations for daytime climate control.
   hot_day:
@@ -281,7 +247,6 @@ input_select:
     name: Scheduled Climate Mode - Emma Bedroom
     options:
       - AC
-      - Fan
       - Heat
       - White Noise
       - N/A
@@ -344,55 +309,13 @@ input_number:
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
-  emma_bedroom_daytime_temp:
+  emma_aircon_threshold:
-    name: Emma Bedroom Daytime Temp
+    name: Emma Aircon Threshold
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_night_temp:
-    name: Emma Bedroom Night Temp
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_bedtime_temp:
-    name: Emma Bedroom Bedtime Temp
-    min: 65
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_aircon_run_threshold:
-    name: Emma Bedroom Aircon Run Threshold
     min: 40
     max: 80
     step: 1
     unit_of_measurement: °F
     icon: mdi:thermometer
-  emma_bedroom_aircon_mode_threshold:
-    name: Emma Bedroom Aircon Mode Threshold
-    min: 40
-    max: 80
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_fan_threshold:
-    name: Emma Bedroom Fan Threshold
-    min: 30
-    max: 70
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
-  emma_bedroom_auto_cooling_threshold:
-    name: Emma Bedroom Auto Cooling Threshold
-    min: 70
-    max: 90
-    step: 1
-    unit_of_measurement: °F
-    icon: mdi:thermometer
   kallen_fan_threshold:
     name: Kallen Fan Threshold
     min: 40

packages/emmalynn.yaml

@@ -257,9 +257,6 @@ automation:
               time: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
-          - service: input_boolean.turn_off
-            target:
-              entity_id: input_boolean.emma_awake
       - conditions:
         - condition: trigger
           id: bedtime-timer-finished
@@ -284,9 +281,6 @@ automation:
               datetime: >
                 {% from 'time.jinja' import current_time %}
                 {{ current_time('time',24) }}
-          - service: input_boolean.turn_off
-            target:
-              entity_id: input_boolean.emma_awake
 
   - id: e59f638a-519f-4619-bf7d-b13251b3a374
     alias: Emma Meds Handler
@@ -810,11 +804,16 @@ script:
             datetime: >
               {% from 'time.jinja' import set_datetime %}
               {{ set_datetime(0,5) }}
-      - service: script.speech_engine
+      - if:
-        data:
+        - condition: state
-          who: common
+          entity_id: binary_sensor.basement_occupied
-          type: normal
+          state: 'on'
-          message: Emma has awoken, so it is time to make your way upstairs now
+        then:
+        - service: script.speech_engine
+          data:
+            who: basement
+            type: normal
+            message: Emma has awoken, so it is time to make your way upstairs now
       - service: input_datetime.set_datetime
         target:
           entity_id: input_datetime.emma_awake_at
@@ -899,3 +898,26 @@ script:
       - service: input_boolean.turn_off
         target:
           entity_id: input_boolean.white_noise_emma_bedroom
+      - if:
+        - condition: state
+          entity_id: fan.emma_air_conditioner
+          state: 'on'
+        then:
+        - service: script.turn_on
+          target:
+            entity_id: script.emma_aircon_shutoff
+
+  emma_aircon_shutoff:
+    alias: 'Emma Air Conditioner Shutoff'
+    mode: restart
+    description: 'Attempt to shut off air conditioner after compressor stops running'
+    sequence:
+    - wait_template: "{{ is_state('binary_sensor.emma_aircon_compressor','off') }}"
+      timeout:
+        minutes: 15
+      continue_on_timeout: true
+    - delay:
+        seconds: 5
+    - service: fan.turn_off
+      target:
+        entity_id: fan.emma_air_conditioner

packages/integrations.yaml

@@ -31,7 +31,8 @@ tts:
     region_name: 'us-east-1'
     text_type: ssml
     voice: Joanna
-    engine: generative
+    cache: true
+    engine: neural
 
 conversation:
 

packages/lighting_and_scenes.yaml

@@ -489,7 +489,6 @@ input_select:
       - Evening Mode
       - Night Mode
       - Bright Mode
-      - Reading Mode
       - Reset
     initial: Select
     icon: mdi:desk
@@ -654,21 +653,6 @@ template:
           {% endif %}
       device_class: problem
       delay_on: "00:00:10"
-    - name: Light Switch Issue
-      unique_id: 381e8038-ea96-474c-92ec-d1296dc1369e
-      state: >
-        {% set lights = states.light.upstairs_bathroom_lights,
-                        states.light.hallway_overhead,
-                        states.light.downstairs_bathroom_lights %}
-        {% set issues = lights | selectattr('state','eq','unavailable') | list | count %}
-        {{ issues > 0 }}
-      attributes:
-        issues: >
-          {% set lights = states.light.upstairs_bathroom_lights,
-                          states.light.hallway_overhead,
-                          states.light.downstairs_bathroom_lights %}
-          {% set ids = lights | selectattr('state','eq','unavailable') | map(attribute='attributes.friendly_name') | list %}
-          {{ ids | join(', ') }}
   - sensor:
     - name: "Basement Studio Lights - Brightness Actual"
       unique_id: dee4dc84-a6a0-4150-903e-5b8bd436d962

packages/notify.yaml

@@ -980,7 +980,33 @@ script:
               - critical
     variables:
       voice: "{{ states('input_select.jarvis_voice') }}"
+      groupname: >-
+        {% if who == 'kids_bedrooms' %}
+          kids_bedroom_speakers
+        {% elif who == 'all_bedrooms' %}
+          all_bedroom_speakers
+        {% elif who == 'basement' and is_state('input_boolean.studio_quiet','on') %}
+          alexa_no_basement
+        {% else %}
+          {{ who }}
+        {% endif %}
     sequence:
+      - service: script.get_room_speakers
+        data:
+          room: "{{ who }}"
+        response_variable: "get_room_speakers"
+      - choose:
+        - conditions: "{{ who in ['everywhere','Everywhere'] }}"
+          sequence:
+          - service: script.get_all_speakers
+            response_variable: "get_all_speakers"
+        - conditions: "{{ get_room_speakers.jarvis_tts == 'group' }}"
+          sequence:
+          - service: script.get_group_speakers
+            data:
+              group: "{{ who }}"
+            response_variable: "get_group_speakers"
+      # Need to figure out whether to do this part here, or in alexa/jarvis voice scripts, or both
       - service: mqtt.publish
         data:
           topic: 'house/polly/lastmsg'
@@ -1024,44 +1050,13 @@ script:
       - service: >-
           {% if voice == 'nabu' %}
             script.nabu_voice      
-          {% elif who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
+          {% elif get_room_services.jarvis_tts in ['group','alexa'] %}
-            script.alexa_voice
-          {% elif who in ['kallen_bedroom','Kallen Bedroom']  %}
-            {% if is_state('input_boolean.kallen_sleeping','on') and type not in ['critical','Critical'] %}
-              script.alexa_voice
-            {% else %}
-              script.jarvis_voice
-            {% endif %}
-          {% elif who in ['emma_bedroom','Emma Bedroom'] %}
-            {% if is_state('input_boolean.emma_sleeping','on') and type not in ['critical','Critical'] %}
-              script.alexa_voice
-            {% else %}
-              script.jarvis_voice
-            {% endif %}
-          {% elif who in ['master_bedroom','master_bedroom_echo_dot','media_player.master_bedroom_echo_dot','Master Bedroom Echo Dot','Master Bedroom']  %}
-            script.alexa_voice
-          {% elif who in ['kids_bedrooms','Kids Bedrooms'] %}
-            script.jarvis_voice
-          {% elif who in ['all_bedrooms','All Bedrooms'] %}
-            script.alexa_voice
-          {% elif who in ['Basement','basement','basement_echo_dot','media_player.basement_echo_dot','Basement Echo Dot']  %}
-            script.alexa_voice
-          {% elif who in ['Basement Google','basement_google'] %}
-            {% if is_state('input_boolean.studio_quiet','on') %}
-              script.alexa_voice
-            {% else %}
-              script.jarvis_voice
-            {% endif %}
-          {% elif who in ['Common Areas','common','common_areas'] %}
-            script.alexa_voice
-          {% elif who in ['alexa_everywhere','Alexa Everywhere'] %}
-            script.alexa_voice
-          {% elif who in ['Everywhere','everywhere'] %}
             script.alexa_voice
           {% else %}
-            script.alexa_voice
+            script.jarvis_voice
           {% endif %}
         data:
+          # Work on where this redirect logic should go
           who: >
             {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room','Living Room Echo Dot','Living Room']  %}
               living_room
@@ -1138,7 +1133,7 @@ script:
           type: '{{ type }}'
       - if:
         - condition: template
-          value_template: "{{ who in ['Everywhere','everywhere','all_bedrooms','All Bedrooms','kids_bedrooms','Kids Bedrooms'] }}"
+          value_template: "{{ get_room_speakers.jarvis_tts == 'group' and get_group_speakers.google is defined }}"
         then:
         - service: script.jarvis_voice
           data:
@@ -1237,9 +1232,11 @@ script:
       data:
         message: >
           <voice name="{{ voice }}">
+          <amazon:auto-breaths>
           <prosody rate="fast">
           {{ message }}
           </prosody>
+          </amazon:auto-breaths>
           </voice>
         target: >
           {% if who in ['living_room_echo_dot', 'media_player.living_room_echo_dot','living_room'] %}

packages/powercalc.yaml

@@ -17,8 +17,8 @@ sensor:
     entity_id: switch.tina_desktop
     power_sensor_id: sensor.tina_desktop_power
   - platform: powercalc
-    entity_id: switch.emma_bedroom_aircon
+    entity_id: fan.emma_air_conditioner
-    power_sensor_id: sensor.emma_bedroom_aircon_power
+    power_sensor_id: sensor.emma_air_conditioner_power
   - platform: powercalc
     entity_id: switch.master_bedroom_aircon
     power_sensor_id: sensor.master_bedroom_aircon_power

packages/presence.yaml

@@ -613,6 +613,7 @@ automation:
               target:
                 entity_id:
                   - fan.kallen_bedroom_fan
+                  - fan.emma_air_conditioner
           - service: button.press
             target:
               entity_id: button.master_bedroom_climate_reset

packages/scheduling.yaml

@@ -418,14 +418,21 @@ script:
           entity_id: input_datetime.daily_briefing
           data:
             time: >
-              {% if is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','on') %}
+              {% from 'time.jinja' import time_from_calendar %}
+              {% if is_state('input_boolean.kallen_school_today','on') %}
+                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
+                  15:30
+                {% else %}
+                  {{ time_from_calendar('calendar.kallen_school_days','end_time','set','subtract',1) }}
+                {% endif %}
+              {% elif is_state('input_boolean.kallen_school_today','off') and is_state('input_boolean.work_today','off') %}
+                15:30
+              {% else %}
                 {% if (state_attr('input_datetime.tina_workday_end','timestamp')) > 61200 %}
                   16:00
                 {% else %}
                   {{ (state_attr('input_datetime.tina_workday_end', 'timestamp') + 3600) | timestamp_custom('%H:%M', false) }}
                 {% endif %}
-              {% else %}
-                15:30
               {% endif %}
       - if:
         - condition: state
@@ -554,7 +561,18 @@ script:
         - service: input_datetime.set_datetime
           entity_id: input_datetime.master_bedroom_wakeup
           data:
-            time: "16:30"
+            time: >
+              {% if is_state('input_boolean.kallen_school_today','on') %}
+                {% if is_state('input_boolean.kallen_alternate_pickup','on') or is_state('input_boolean.kallen_btb','on') %}
+                  16:30
+                {% elif is_state('input_boolean.kallen_school_early_release','on') %}
+                  12:30
+                {% else %}
+                  13:00
+                {% endif %}
+              {% else %}
+                16:30
+              {% endif %}
       - delay:
           milliseconds: 500
       - service: input_datetime.set_datetime
@@ -732,11 +750,11 @@ script:
               {% set low = states('sensor.overnight_lowest_temperature') | int %}
               {% set bedtime = state_attr('input_datetime.emma_bedtime','timestamp') | int %}
               {% if is_state('input_boolean.hot_day','on') %}
-                {{ (bedtime - 5400) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 7200) | timestamp_custom('%H:%M',false) }}
               {% elif high >= 80 or low >= 60 %}
-                {{ (bedtime - 3600) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 5400) | timestamp_custom('%H:%M',false) }}
               {% else %}
-                {{ (bedtime - 1800) | timestamp_custom('%H:%M',false) }}
+                {{ (bedtime - 3600) | timestamp_custom('%H:%M',false) }}
               {% endif %}
       - service: input_boolean.turn_on
         target:

packages/sysmon.yaml

@@ -63,25 +63,25 @@ template:
   - binary_sensor:
     - name: Tony Desktop On
       unique_id: 82ce673a-96ad-4af5-a8d1-be9ca9fa9c36
-      state: "{{ states('sensor.tony_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.tony_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tony_desktop_power') | int }}W"
     - name: Tina Desktop On
       unique_id: 8484dbd4-2fae-4368-a4bc-d1bdc09e003f
-      state: "{{ states('sensor.tina_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.tina_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.tina_desktop_power') | int }}W"
     - name: Kallen Desktop On
       unique_id: ccc25d75-4915-449d-9b2e-09ad14ffac29
-      state: "{{ states('sensor.kallen_desktop_power') | int > 25 }}"
+      state: "{{ states('sensor.kallen_desktop_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.kallen_desktop_power') | int }}W"
     - name: Basement Server On
       unique_id: e6df7d98-d3ba-4e01-bae2-2ebafc8d78d6
-      state: "{{ states('sensor.basement_server_power') | int > 25 }}"
+      state: "{{ states('sensor.basement_server_power') | int > 10 }}"
       device_class: running
       attributes:
         power_usage: "{{ states('sensor.basement_server_power') | int }}W"

packages/variables.yaml

@@ -0,0 +1,126 @@
+script:
+  get_room_speakers:
+    alias: Get Room Speakers
+    sequence:
+    - variables:
+        room_services: >-
+          {% if room in areas() %}
+            {% set alexa_speaker = states.media_player | 
+                selectattr('entity_id', 'in', area_entities(room)) |
+                rejectattr('attributes.last_called', 'undefined') |
+                selectattr('entity_id', 'search', 'echo_dot') |
+                map(attribute='entity_id') |
+              list | first %}
+  
+            {% set google_speaker = states.media_player | 
+                selectattr('entity_id', 'in', area_entities(room)) |
+                rejectattr('attributes.device_class', 'undefined') |
+                selectattr('attributes.device_class', 'search', '(speaker)') | 
+                selectattr('entity_id', 'search', 'google') |
+                map(attribute='entity_id') |
+              list | first %}
+  
+            {% set tts = "alexa" if alexa_speaker is defined else "google" %}
+          {% else %}
+            {% set tts = "group" %}
+          {% endif %}
+          {"area":"{{room}}","alexa_speaker":"{{alexa_speaker|default({}) }}","jarvis_tts":"{{tts|default("google") }}","google_speaker":"{{google_speaker|default({}) }}"}
+    - stop: "Services acquired"
+      response_variable: "get_room_speakers"
+
+  get_group_speakers:
+    alias: Get Group Speakers
+    sequence:
+    - variables:
+        get_group_speakers: >-
+          {% set speakers = expand('group.' + group) | map(attribute='entity_id') | list | join(',') %}
+          {% set alexa_speakers = expand('group.' + group) | 
+              rejectattr('attributes.last_called', 'undefined') |
+              selectattr('entity_id', 'search', 'echo_dot') |
+              map(attribute='entity_id') |
+            list | join(',') %}
+          {% set google_speakers = expand('group.' + group) |
+              rejectattr('attributes.device_class', 'undefined') |
+              selectattr('attributes.device_class', 'search', '(speaker)') | 
+              selectattr('entity_id', 'search', 'google') |
+              map(attribute='entity_id') |
+            list | join(',') %}
+          {"alexa":"{{alexa_speakers|default({})}}","google":"{{google_speakers|default({})}}"}
+    - stop: "Speakers acquired"
+      response_variable: "get_group_speakers"
+
+  get_echo_dots:
+    alias: Get Echo Dots
+    sequence:
+    - variables:
+        get_echo_dots: >-
+          {% if group is defined %}
+            {% set speakers = expand('group.' + group) %}
+          {% else %}
+            {% set speakers = states.media_player %}
+          {% endif %}
+          {% set echo_dots = speakers |
+            rejectattr('attributes.last_called', 'undefined') |
+            selectattr('entity_id', 'search', 'echo_dot') |
+            map(attribute='entity_id') |
+          list | join(',') %}
+          {"speakers":"{{echo_dots}}"}
+    - stop: "Echo Dots acquired"
+      response_variable: "get_echo_dots"
+
+  get_google_speakers:
+    alias: Get Google Speakers
+    sequnce:
+    - variables:
+        get_google_speakers: >-
+          {% if group is defined %}
+            {% set speakers = expand('group.' + group) %}
+          {% else %}
+            {% set speakers = states.media_player %}
+          {% endif %}
+          {% set google_speaker = speakers |
+              rejectattr('attributes.device_class', 'undefined') |
+              selectattr('attributes.device_class', 'search', '(speaker)') | 
+              selectattr('entity_id', 'search', 'google') |
+              map(attribute='entity_id') |
+            list | join(',') %}
+          {"speakers":"{{google_speaker}}"}
+    - stop: "Google speakers acquired"
+      response_variable: "get_google_speakers"
+
+  get_all_speakers:
+    alias: Get All Speakers
+    sequence:
+    - variables: >-
+        get_speakers:
+        {% set alexa_speaker = states.media_player |
+            rejectattr('attributes.last_called', 'undefined') |
+            selectattr('entity_id', 'search', 'echo_dot') |
+            map(attribute='entity_id')
+          %}
+
+        {% set google_speaker = states.media_player |
+            rejectattr('attributes.device_class', 'undefined') |
+            selectattr('attributes.device_class', 'search', '(speaker)') | 
+            selectattr('entity_id', 'search', 'google') |
+            map(attribute='entity_id')
+          %}
+        {% set alexa_list = alexa_speaker | list | join(',') %}
+        {% set google_list = google_speaker | list | join(',') %}
+        {% set all_speakers = alexa_list + ',' + google_list %}
+        {"all_speakers":"{{all_speakers}}"}
+
+  get_room_lights:
+    alias: Get Room Lights
+    sequence:
+    - variables:
+        area: >
+          {{ room }}
+        entities: >
+          {% set lights = states.light |
+            selectattr('entity_id', 'in', area_entities(area)) |
+            map(attribute='entity_id') |
+            list | join(',') %}
+          {"lights":"{{lights}}"}
+    - stop: "Lights acquired"
+      response_variable: "entities"

scripts.yaml

@@ -1544,14 +1544,14 @@ day_mode_in_tina_desk:
   alias: Day Mode in Tina Desk
   sequence:
   - parallel:
-    - target:
+    - service: light.turn_on
+      target:
         entity_id: light.tina_lamp_top
       data: {}
-      action: light.turn_on
+    - service: light.turn_off
-    - target:
+      target:
         entity_id: light.tina_lamp_side
       data: {}
-      action: light.turn_off
   - wait_template: '{{ is_state(''light.tina_lamp_side'',''off'') }}'
     timeout:
       seconds: 15
@@ -1561,57 +1561,52 @@ day_mode_in_tina_desk:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If adaptive lighting is off
+      alias: If switch is off
     then:
-    - alias: Turn on adaptive lighting
+    - service: switch.turn_on
       data: {}
       target:
-        entity_id:
+        entity_id: switch.adaptive_lighting_tina_lamp
-        - switch.adaptive_lighting_tina_lamp
+      alias: Turn on the switch
-        - switch.adaptive_lighting_adapt_brightness_tina_lamp
-        - switch.adaptive_lighting_adapt_color_tina_lamp
-      action: switch.turn_on
     else:
     - alias: Apply adaptive lighting
+      service: adaptive_lighting.apply
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
-      action: adaptive_lighting.apply
   mode: restart
   icon: mdi:palette
 evening_mode_in_tina_desk:
   alias: Evening Mode in Tina Desk
   sequence:
   - alias: Turn on lamp
+    service: light.turn_on
     data: {}
     target:
       entity_id:
       - light.tina_lamp_top
       - light.tina_lamp_side
-    action: light.turn_on
   - alias: Apply adaptive lighting to lamp
     if:
     - condition: state
       entity_id: switch.adaptive_lighting_tina_lamp
       state: 'off'
-      alias: If adaptive lighting is off
+      alias: If switch is off
     then:
-    - alias: Turn on adaptive lighting
+    - service: switch.turn_on
       data: {}
       target:
-        entity_id:
+        entity_id: switch.adaptive_lighting_tina_lamp
-        - switch.adaptive_lighting_tina_lamp
+      alias: Turn on the switch
-        - switch.adaptive_lighting_adapt_brightness_tina_lamp
-        - switch.adaptive_lighting_adapt_color_tina_lamp
-      action: switch.turn_on
     else:
-    - alias: Apply adaptive lighting
+    - service: adaptive_lighting.apply
       data:
         entity_id: switch.adaptive_lighting_tina_lamp
         adapt_brightness: true
         adapt_color: true
-      action: adaptive_lighting.apply
+        turn_on_lights: true
+      alias: Apply adaptive lighting
   mode: restart
   icon: mdi:palette
 night_mode_in_tina_desk:
@@ -2977,33 +2972,69 @@ emma_sleep:
       option: Adaptive
     alias: Set lights to adaptive
     action: input_select.select_option
-  - if:
+  - alias: Select climate mode
-    - alias: White Noise
+    choose:
-      condition: and
+    - conditions:
-      conditions:
+      - alias: AC
-      - condition: state
+        condition: and
-        entity_id: input_select.scheduled_climate_mode_emma_bedroom
+        conditions:
-        state: White Noise
+        - condition: state
-        alias: Scheduled mode is White Noise
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
-      - condition: state
+          state: AC
-        entity_id: input_boolean.white_noise_emma_bedroom
+          alias: Scheduled mode is AC
-        state: 'off'
+        - condition: state
-        alias: White Noise is not already on
+          entity_id: fan.emma_air_conditioner
-    then:
+          state: 'off'
-    - target:
+          alias: Air conditioner is not already on
-        entity_id: input_boolean.white_noise_emma_bedroom
+      sequence:
-      data: {}
+      - target:
-      alias: Turn on white noise
+          entity_id: fan.emma_air_conditioner
-      action: input_boolean.turn_on
+        data: {}
+        alias: Turn on air conditioner
+        action: fan.turn_on
+      - data:
+          who: parents
+          title: Emma Climate Schedule
+          message: The air conditioner in Emma's Bedroom has been activated.
+          type: normal
+          tag: emma-climate
+        alias: Send AC notification
+        action: script.text_notify
+    - conditions:
+      - alias: White Noise
+        condition: and
+        conditions:
+        - condition: state
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
+          state: White Noise
+          alias: Scheduled mode is White Noise
+        - condition: state
+          entity_id: input_boolean.white_noise_emma_bedroom
+          state: 'off'
+          alias: White Noise is not already on
+      sequence:
+      - target:
+          entity_id: input_boolean.white_noise_emma_bedroom
+        data: {}
+        alias: Turn on white noise
+        action: input_boolean.turn_on
+      - data:
+          who: parents
+          title: Emma Climate Schedule
+          message: White noise has been activated in Emma's Bedroom.
+          type: normal
+          tag: emma-climate
+        alias: Send white noise notification
+        action: script.text_notify
+    default:
     - data:
         who: parents
         title: Emma Climate Schedule
-        message: White noise has been activated in Emma's Bedroom.
+        message: No option selected for Emma's climate mode. No devices will be activated.
         type: normal
         tag: emma-climate
-      alias: Send white noise notification
+      alias: Send notification that no climate mode is selected
       action: script.text_notify
-    alias: Select climate mode
   icon: mdi:lightbulb-night
   mode: restart
 tina_morning_meds:
@@ -3530,41 +3561,3 @@ tina_tylenol:
   icon: mdi:medication
   max: 10
   description: ''
-reading_mode_in_tina_desk:
-  sequence:
-  - action: switch.turn_off
-    metadata: {}
-    data: {}
-    target:
-      entity_id: switch.adaptive_lighting_adapt_brightness_tina_lamp
-    alias: Turn off adaptive brightness, leave adaptive color on
-  - alias: Turn on lamp
-    action: light.turn_on
-    metadata: {}
-    data:
-      brightness_pct: 100
-    target:
-      entity_id: light.tina_desk_lights
-  - alias: Apply adaptive lighting to lamp
-    if:
-    - condition: state
-      entity_id: switch.adaptive_lighting_tina_lamp
-      state: 'off'
-      alias: If switch is off
-    then:
-    - data: {}
-      target:
-        entity_id: switch.adaptive_lighting_tina_lamp
-      alias: Turn on the switch
-      action: switch.turn_on
-    else:
-    - alias: Apply adaptive lighting
-      data:
-        entity_id: switch.adaptive_lighting_tina_lamp
-        adapt_color: true
-        turn_on_lights: true
-        adapt_brightness: false
-      action: adaptive_lighting.apply
-  alias: Reading Mode in Tina Desk
-  description: ''
-  icon: mdi:palette

sensors/house_stats.yaml

@@ -168,7 +168,7 @@
     unit_of_measurement: ''
     state: >-
       {% set compressors = [
-        states.binary_sensor.emma_bedroom_aircon_compressor,
+        states.binary_sensor.emma_aircon_compressor,
         states.binary_sensor.master_bedroom_aircon_compressor
       ] %}
       {{ compressors | selectattr('state','eq','on') | list | count | int }}
@@ -177,7 +177,7 @@
     unit_of_measurement: ''
     state: >-
       {% set fans = [
-        states.binary_sensor.emma_bedroom_aircon_fan,
+        states.binary_sensor.emma_aircon_fan,
         states.binary_sensor.master_bedroom_aircon_fan
       ] %}
       {{ fans | selectattr('state','eq','on') | list | count | int }}
@@ -196,7 +196,11 @@
     unit_of_measurement: ''
     state: >-
       {% set climate = states.climate | selectattr('state','ne','off') | rejectattr('state','eq','unavailable') | rejectattr('state','eq','unknown') | list | count | int %}
-      {{ climate | int }}
+      {% set fans = [
+        states.fan.emma_air_conditioner
+      ] %}
+      {% set fans_on = fans | selectattr('state','eq','on') | list | count | int %}
+      {{ climate + fans_on | int }}
   - name: Climate Devices Running
     unique_id: 3c61c756-2934-4294-8085-7d3855b692dd
     unit_of_measurement: ''

templates/speech/kallen_morning_briefing.yaml

@@ -98,7 +98,12 @@
           {% endif %}
           {% if is_state('input_boolean.kallen_alternate_pickup','on') %}
             Today, you will be picked up from school by {{ states('input_text.kallen_pickup') }}.
+          {% elif is_state('input_boolean.work_today','off') %}
+            Today, you will be picked up from school by your parents.
+          {% else %}
+            Today, you will be picked up from school by your dad.
           {% endif %}
+          <s>Pickup today will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}</s>
           {% if count_the_days('input_datetime.school_last_day') | int == 0 -%}
             But today is the last day of School! 
           {%- endif %}

templates/speech/nightly_briefing.yaml

@@ -71,13 +71,9 @@
       {% else %}
         "Collin's room will be left alone, as he is spending the night elsewhere tonight. "
       {% endif %}
-      {% if states('input_select.scheduled_climate_mode_emma_bedroom_aircon') != 'N/A' %}
+      {% if states('input_select.scheduled_climate_mode_emma_bedroom') != 'N/A' %}
-        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') and is_state('input_boolean.hot_day','on') %}
+        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom','AC') and is_state('fan.emma_air_conditioner','off') %}
-          "Today was a hot day, so Emma's bedroom air conditioner will start cooling a bit earlier tonight at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
+          "Emma's air conditioner will be activated at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
-        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','AC') %}
-          "Emma's bedroom air conditioner will start cooling at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
-        {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom_aircon','Fan') %}
-          "Emma's bedroom air conditioner will activate fan only mode at {{ input_datetime_read('input_datetime.emma_bedroom_cooling') }}. "
         {% elif is_state('input_select.scheduled_climate_mode_emma_bedroom','White Noise') and is_state('input_boolean.white_noise_emma_bedroom','off') %}
           "Emma's white noise generator will activate at {{ input_datetime_read('input_datetime.emma_bedtime') }}. "
         {% endif %}

templates/speech/welcome_home.yaml

@@ -91,21 +91,8 @@
               {% endif %}
             {% endif %}
         {% endif %}
-        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}
+        {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') and is_state('fan.emma_air_conditioner','on') %}
-          "the temperature in Emma's bedroom is {{ states('sensor.emma_bedroom_temperature') | int }} degrees. "
+          "Emma's air conditioner is {{ states('fan.emma_air_conditioner') }}. "
-            {% if not is_state('climate.emma_bedroom_aircon','off') %}
-              {% if is_state('climate.emma_bedroom_aircon','cool') %}
-                "and Emma's bedroom air conditioner is set for cooling to {{ state_attr('climate.emma_bedroom_aircon','temperature') }} degrees. "
-              {% elif is_state('climate.emma_bedroom_aircon','fan_only') %}
-                "and Emma's bedroom air conditioner is in fan only mode. "
-              {% elif is_state('climate.emma_bedroom_aircon','dry') %}
-                "and Emma's bedroom air conditioner is moonlighting as a dehumidifier. "
-              {% elif is_state('climate.emma_bedroom_aircon','auto') %}
-                "and Emma's bedroom air conditioner is making its own decisions. Be afraid, be very afraid. "
-              {% else %}
-                "and Emma's bedroom air conditioner is currently not speaking to me. Was it something I said? "
-              {% endif %}
-            {% endif %}
         {% endif %}
       {% endif %}
     </p>
@@ -128,7 +115,7 @@
         "Tina has work today. "
       {% endif %}
       {% if is_state('input_boolean.kallen_at_school','on') %}
-        "Collin is at school right now. His school day ends at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
+        "Collin is at school right now. His pickup time will be at {{ input_datetime_read('input_datetime.kallen_school_day_end') }}. "
       {% elif is_state('input_boolean.kallen_school_today','on') %}
         "Collin has school today. "
       {% endif %}