From 76ca50210dd0fb4da1a15c60a3b490dfeb1a209d Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Mon, 17 Oct 2022 20:03:54 -0400 Subject: [PATCH] Adjust for new option names #52 --- node-red/projects/NerdFlows | 2 +- packages/climate.yaml | 8 ++++---- packages/scheduling.yaml | 4 ++-- templates/speech/nightly_briefing.yaml | 20 +++++++++----------- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index 1e80a66..2e3caa7 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit 1e80a66f62d22fd2f9ef0c4dd19508fe252c0ecd +Subproject commit 2e3caa7567de51b9dfd244963cd33a8f4b6f55a7 diff --git a/packages/climate.yaml b/packages/climate.yaml index 76ce85d..b06718b 100644 --- a/packages/climate.yaml +++ b/packages/climate.yaml @@ -77,27 +77,27 @@ input_select: options: - AC - Fan - - None + - N/A icon: mdi:home-thermometer scheduled_climate_mode_master_bedroom_fan: name: Scheduled Climate Mode - Master Bedroom Fan options: - Fan - - None + - N/A icon: mdi:home-thermometer scheduled_climate_mode_nursery_aircon: name: Scheduled Climate Mode - Nursery Aircon options: - AC - White Noise - - None + - N/A icon: mdi:home-thermometer scheduled_climate_mode_kallen_fan: name: Scheduled Climate Mode - Kallen Fan options: - Fan - White Noise - - None + - N/A icon: mdi:home-thermometer input_number: diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index d75f503..5d64333 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -398,7 +398,7 @@ script: Fan {% endif %} {% else %} - None + N/A {% endif %} - service: input_select.select_option target: @@ -408,7 +408,7 @@ script: {% if states('sensor.tonights_low_temp') >= states('input_number.master_bedroom_fan_threshold') %} Fan {% else %} - None + N/A {% endif %} nursery_scheduling: diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index 87283c8..155c342 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -48,13 +48,13 @@ "The master bedroom air conditioner will activate cooling mode at {{ (state_attr('input_datetime.master_bedroom_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_aircon','Fan') %} "The master bedroom air conditioner will activate fan only mode at {{ (state_attr('input_datetime.master_bedroom_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_aircon','None') %} + {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_aircon','N/A') %} "The master bedroom air conditioner will remain inactive tonight. " {% endif %} {% endif %} {% if is_state('input_select.scheduled_climate_mode_master_bedroom_fan','Fan') %} "The master bedroom fan will activate at {{ (state_attr('input_datetime.master_bedroom_fan','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_fan','None') %} + {% elif is_state('input_select.scheduled_climate_mode_master_bedroom_fan','N/A') %} "The master bedroom fan will remain inactive tonight. " {% endif %} {% if is_state('input_boolean.kallen_overnight','off') %} @@ -62,20 +62,18 @@ "Colins fan will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','White Noise') %} "Colins white noise generator will activate at {{ (state_attr('input_datetime.kallen_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','None') %} + {% elif is_state('input_select.scheduled_climate_mode_kallen_fan','N/A') %} "Colins room will have no devices activated tonight. " {% endif %} {% else %} "Colins room will be left alone, as he is spending the night elsewhere tonight. " {% endif %} - {% if is_state('input_boolean.nursery_aircon_installed','on') %} - {% if is_state('input_select.scheduled_climate_mode_nursery_aircon','AC') %} - "Emma's air conditioner will be activated at {{ (state_attr('input_datetime.nursery_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_select.scheduled_climate_mode_nursery_aircon','White Noise') %} - "Emma's white noise generator will activate at {{ (state_attr('input_datetime.nursery_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " - {% elif is_state('input_select.scheduled_climate_mode_nursery_aircon','None') %} - "Emma's room will have no devices activated tonight. " - {% endif %} + {% if is_state('input_select.scheduled_climate_mode_nursery_aircon','AC') %} + "Emma's air conditioner will be activated at {{ (state_attr('input_datetime.nursery_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + {% elif is_state('input_select.scheduled_climate_mode_nursery_aircon','White Noise') %} + "Emma's white noise generator will activate at {{ (state_attr('input_datetime.nursery_cooling','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + {% elif is_state('input_select.scheduled_climate_mode_nursery_aircon','N/A') %} + "Emma's room will have no devices activated tonight. " {% endif %}