From 47f23a4e0275befcc97ef66ee5a92964afcdf57e Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Sat, 25 Jan 2025 22:16:20 -0500 Subject: [PATCH] Change some entity names --- automations.yaml | 2 +- custom_templates/speech.jinja | 2 +- packages/climate.yaml | 9 +++++---- packages/scheduling.yaml | 4 ++-- scripts.yaml | 4 ++-- templates/speech/nightly_briefing.yaml | 12 ++++++------ 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/automations.yaml b/automations.yaml index 9827fee..82f4c84 100644 --- a/automations.yaml +++ b/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: diff --git a/custom_templates/speech.jinja b/custom_templates/speech.jinja index a2056b4..dbb918f 100644 --- a/custom_templates/speech.jinja +++ b/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.", diff --git a/packages/climate.yaml b/packages/climate.yaml index 141b2ff..817837f 100644 --- a/packages/climate.yaml +++ b/packages/climate.yaml @@ -239,15 +239,16 @@ input_select: - Fan - N/A icon: mdi:home-thermometer - scheduled_climate_mode_emma_aircon: - name: Scheduled Climate Mode - Emma Aircon + scheduled_climate_mode_emma_bedroom: + name: Scheduled Climate Mode - Emma Bedroom options: - AC + - Heat - White Noise - N/A icon: mdi:home-thermometer - scheduled_climate_mode_kallen_fan: - name: Scheduled Climate Mode - Kallen Fan + scheduled_climate_mode_kallen_bedroom: + name: Scheduled Climate Mode - Kallen Bedroom options: - Fan - White Noise diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index 2b1bd37..2d6a9fd 100644 --- a/packages/scheduling.yaml +++ b/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') %} diff --git a/scripts.yaml b/scripts.yaml index ee597df..1fdb515 100644 --- a/scripts.yaml +++ b/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 diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index 3fbf608..b1f0598 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/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 is_state('input_select.scheduled_climate_mode_kallen_fan','Fan') and is_state('fan.kallen_bedroom_fan','off') %} + {% if not is_state('input_select.scheduled_climate_mode_kallen_bedroom','N/A') %} + {% 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 is_state('input_select.scheduled_climate_mode_emma_aircon','AC') and is_state('fan.emma_air_conditioner','off') %} + {% if states('input_select.scheduled_climate_mode_emma_bedroom') != 'N/A' %} + {% 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 %}