Change some entity names

automations.yaml

@@ -5103,7 +5103,7 @@
     state: 'off'
     alias: If Emma is not already asleep
   - condition: state
-    entity_id: input_select.scheduled_climate_mode_emma_aircon
+    entity_id: input_select.scheduled_climate_mode_emma_bedroom
     state: AC
     alias: If the AC is scheduled to run
   action:

custom_templates/speech.jinja

@@ -146,7 +146,7 @@ It is {{ now().strftime("%I:%M %p") }}.
 {% endmacro %}
 
 {% macro kallenSleepMsg() %}
-{% set schedMode = states('input_select.scheduled_climate_mode_kallen_fan') %}
+{% set schedMode = states('input_select.scheduled_climate_mode_kallen_bedroom') %}
 {% if schedMode == 'White Noise' %}
 {{ [
     "No fan in Collin's room tonight. Too cold outside. Brr. Enjoy your white noise.",

packages/climate.yaml

@@ -239,15 +239,16 @@ input_select:
       - Fan
       - N/A
     icon: mdi:home-thermometer
-  scheduled_climate_mode_emma_aircon:
+  scheduled_climate_mode_emma_bedroom:
-    name: Scheduled Climate Mode - Emma Aircon
+    name: Scheduled Climate Mode - Emma Bedroom
     options:
       - AC
+      - Heat
       - White Noise
       - N/A
     icon: mdi:home-thermometer
-  scheduled_climate_mode_kallen_fan:
+  scheduled_climate_mode_kallen_bedroom:
-    name: Scheduled Climate Mode - Kallen Fan
+    name: Scheduled Climate Mode - Kallen Bedroom
     options:
       - Fan
       - White Noise

packages/scheduling.yaml

@@ -303,7 +303,7 @@ script:
         then:
         - service: input_select.select_option
           target:
-            entity_id: input_select.scheduled_climate_mode_kallen_fan
+            entity_id: input_select.scheduled_climate_mode_kallen_bedroom
           data:
             option: >
               {% if is_state('input_boolean.kallen_overnight','on') %}
@@ -729,7 +729,7 @@ script:
         then:
         - service: input_select.select_option
           target:
-            entity_id: input_select.scheduled_climate_mode_emma_aircon
+            entity_id: input_select.scheduled_climate_mode_emma_bedroom
           data:
             option: >
               {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %}

scripts.yaml

@@ -2922,7 +2922,7 @@ emma_sleep:
         condition: and
         conditions:
         - condition: state
-          entity_id: input_select.scheduled_climate_mode_emma_aircon
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
           state: AC
           alias: Scheduled mode is AC
         - condition: state
@@ -2948,7 +2948,7 @@ emma_sleep:
         condition: and
         conditions:
         - condition: state
-          entity_id: input_select.scheduled_climate_mode_emma_aircon
+          entity_id: input_select.scheduled_climate_mode_emma_bedroom
           state: White Noise
           alias: Scheduled mode is White Noise
         - condition: state

templates/speech/nightly_briefing.yaml

@@ -61,20 +61,20 @@
         {% endif %}
       {% endif %}
       {% if is_state('input_boolean.kallen_overnight','off') %}
-        {% if not is_state('input_select.scheduled_climate_mode_kallen_fan','N/A') %}
+        {% if not is_state('input_select.scheduled_climate_mode_kallen_bedroom','N/A') %}
-          {% if is_state('input_select.scheduled_climate_mode_kallen_fan','Fan') and is_state('fan.kallen_bedroom_fan','off') %}
+          {% if is_state('input_select.scheduled_climate_mode_kallen_bedroom','Fan') and is_state('fan.kallen_bedroom_fan','off') %}
             "Collin's fan will activate at {{ input_datetime_read('input_datetime.kallen_fan') }}. "
-          {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','White Noise') and is_state('input_boolean.white_noise_kallen_bedroom','off') %}
+          {% elif is_state('input_select.scheduled_climate_mode_kallen_bedroom','White Noise') and is_state('input_boolean.white_noise_kallen_bedroom','off') %}
             "Collin's white noise generator will activate at {{ input_datetime_read('input_datetime.kallen_bedtime') }}. "
           {% endif %}
         {% endif %}
       {% 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_aircon') != 'N/A' %}
+      {% if states('input_select.scheduled_climate_mode_emma_bedroom') != 'N/A' %}
-        {% if is_state('input_select.scheduled_climate_mode_emma_aircon','AC') and is_state('fan.emma_air_conditioner','off') %}
+        {% if is_state('input_select.scheduled_climate_mode_emma_bedroom','AC') and is_state('fan.emma_air_conditioner','off') %}
           "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_aircon','White Noise') and is_state('input_boolean.white_noise_emma_bedroom','off') %}
+        {% 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 %}
       {% endif %}