From 4b09f6343bdd7003b03a7f798bc7fc3ae6d88a26 Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Mon, 21 Nov 2022 20:21:50 -0500 Subject: [PATCH] Renaming nursery, partial relation to #53 --- automations.yaml | 5 ---- groups.yaml | 2 +- node-red/projects/NerdFlows | 2 +- packages/climate.yaml | 32 +++++++++++++------------- packages/lighting.yaml | 8 +++---- packages/presence.yaml | 12 +++++----- packages/scheduling.yaml | 22 +++++++++--------- scripts.yaml | 12 +++++----- templates/speech/nightly_briefing.yaml | 12 +++++----- 9 files changed, 51 insertions(+), 56 deletions(-) diff --git a/automations.yaml b/automations.yaml index 4991a25..5997dc9 100644 --- a/automations.yaml +++ b/automations.yaml @@ -71,7 +71,6 @@ - living_room - master_bedroom - mud_room - - nursery - upstairs_hallway - service: switch.turn_off target: @@ -81,7 +80,6 @@ - switch.adaptive_lighting_living_room - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_mud_room - - switch.adaptive_lighting_nursery - switch.adaptive_lighting_upstairs_hallway - service: notify.alexa_media data: @@ -105,7 +103,6 @@ - light.master_bedroom_front - light.master_bedroom_side - light.mud_room_overhead - - light.nursery_light data: flash: long - delay: @@ -122,7 +119,6 @@ - living_room - master_bedroom - mud_room - - nursery - upstairs_hallway - delay: hours: 0 @@ -137,7 +133,6 @@ - switch.adaptive_lighting_living_room - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_mud_room - - switch.adaptive_lighting_nursery - switch.adaptive_lighting_upstairs_hallway - delay: hours: 0 diff --git a/groups.yaml b/groups.yaml index 4cc7b90..f009a8f 100644 --- a/groups.yaml +++ b/groups.yaml @@ -8,7 +8,7 @@ Presence Simulation: - light.living_room_lights - light.master_bedroom_lights - light.mud_room_overhead - - light.nursery_light + - light.emma_bedroom_light - light.dining_room_lamp - light.upstairs_bathroom_lights - light.downstairs_bathroom_lights diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index 7243bb1..f6e7363 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit 7243bb11f2561dc2a47ebbe32f227845fa1bbc64 +Subproject commit f6e73634939bd44616ccaa25607a1cee4437b5ee diff --git a/packages/climate.yaml b/packages/climate.yaml index 9069bc9..bc7ef8b 100644 --- a/packages/climate.yaml +++ b/packages/climate.yaml @@ -59,9 +59,9 @@ input_boolean: master_bedroom_aircon_installed: name: Master Bedroom Aircon Installed icon: mdi:tools - # Same thing, but for the nursery air conditioner - nursery_aircon_installed: - name: Nursery Aircon Installed + # Same thing, but for Emma's bedroom air conditioner + emma_bedroom_aircon_installed: + name: Emma Bedroom Aircon Installed icon: mdi:tools # Used internally for automations to know if cooling time has passed or not master_bedroom_cooling_on: @@ -85,8 +85,8 @@ input_select: - Fan - N/A icon: mdi:home-thermometer - scheduled_climate_mode_nursery_aircon: - name: Scheduled Climate Mode - Nursery Aircon + scheduled_climate_mode_emma_aircon: + name: Scheduled Climate Mode - Emma Aircon options: - AC - White Noise @@ -150,8 +150,8 @@ input_number: step: 1 unit_of_measurement: °F icon: mdi:thermometer - nursery_aircon_threshold: - name: Nursery Aircon Threshold + emma_aircon_threshold: + name: Emma Aircon Threshold min: 40 max: 70 step: 1 @@ -173,28 +173,28 @@ input_number: automation: - id: '1655415573165' - alias: Nursery Cooling + alias: Emma Bedroom Cooling description: For keeping the baby’s room at a safe temperature trigger: - platform: time - at: input_datetime.nursery_cooling + at: input_datetime.emma_bedtime action: - if: - condition: state - entity_id: input_select.scheduled_climate_mode_nursery_aircon + entity_id: input_select.scheduled_climate_mode_emma_aircon state: 'AC' then: - service: fan.turn_on target: - entity_id: fan.nursery_air_conditioner + entity_id: fan.emma_air_conditioner - service: script.text_notify data: who: "parents" - title: "Nursery Climate Schedule" - message: "The air conditioner in the nursery has been activated." + title: "Emma Climate Schedule" + message: "The air conditioner in Emma's Bedroom has been activated." - if: - condition: state - entity_id: input_select.scheduled_climate_mode_nursery_aircon + entity_id: input_select.scheduled_climate_mode_emma_aircon state: 'White Noise' then: - service: input_boolean.turn_on @@ -203,6 +203,6 @@ automation: - service: script.text_notify data: who: "parents" - title: "Nursery Climate Schedule" - message: "White noise has been activated in the nursery." + title: "Emma Climate Schedule" + message: "White noise has been activated in Emma's Bedroom." mode: restart diff --git a/packages/lighting.yaml b/packages/lighting.yaml index 08e1d33..d59020c 100644 --- a/packages/lighting.yaml +++ b/packages/lighting.yaml @@ -94,8 +94,8 @@ input_select: - Wall Nightlight initial: Select icon: mdi:bunk-bed - nursery_scenes: - name: Nursery Scenes + emma_bedroom_scenes: + name: Emma Bedroom Scenes options: - Select - Adaptive @@ -191,8 +191,8 @@ input_text: name: Upstairs Hallway Selected Scene kallen_bedroom_selected_scene: name: Kallen Bedroom Selected Scene - nursery_selected_scene: - name: Nursery Selected Scene + emma_bedroom_selected_scene: + name: Emma Bedroom Selected Scene basement_studio_selected_scene: name: Basement Studio Selected Scene master_bedroom_selected_scene: diff --git a/packages/presence.yaml b/packages/presence.yaml index 8f7ed3c..353f5a0 100644 --- a/packages/presence.yaml +++ b/packages/presence.yaml @@ -270,7 +270,7 @@ script: - living_room - master_bedroom - mud_room - - nursery + - emma_bedroom - upstairs_hallway - dining_room - downstairs_bathroom @@ -281,7 +281,7 @@ script: - basement_studio - kallen_bedroom - master_bedroom - - nursery + - emma_bedroom - delay: seconds: 5 - service: switch.turn_on @@ -297,7 +297,7 @@ script: - switch.adaptive_lighting_upstairs_bathroom - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_kallen_bedroom - - switch.adaptive_lighting_nursery + - switch.adaptive_lighting_emma_bedroom - service: input_text.set_value target: entity_id: @@ -310,7 +310,7 @@ script: - input_text.upstairs_bathroom_selected_scene - input_text.master_bedroom_selected_scene - input_text.kallen_bedroom_selected_scene - - input_text.nursery_selected_scene + - input_text.emma_bedroom_selected_scene data: value: Adaptive - service: input_text.set_value @@ -376,7 +376,7 @@ script: area_id: - furnace_room - kallen_bedroom - - nursery + - emma_bedroom - master_bedroom - upstairs_hallway - basement_studio @@ -427,7 +427,7 @@ script: area_id: - furnace_room - kallen_bedroom - - nursery + - emma_bedroom - master_bedroom - upstairs_hallway - basement_studio diff --git a/packages/scheduling.yaml b/packages/scheduling.yaml index d288487..3ea03b9 100644 --- a/packages/scheduling.yaml +++ b/packages/scheduling.yaml @@ -34,13 +34,13 @@ input_datetime: has_date: false has_time: true icon: mdi:fan-off - nursery_cooling: - name: Nursery Cooling + emma_bedtime: + name: Emma Bedtime has_date: false has_time: true icon: mdi:fan-auto - nursery_wakeup: - name: Nursery Wakeup + emma_wakeup: + name: Emma Wakeup has_date: false has_time: true icon: mdi:fan-off @@ -116,12 +116,12 @@ automation: - service: script.master_bedroom_scheduling_evening - id: a69d3d36-09d6-4ef3-a245-c564c7cb577c - alias: Nursery Scheduling + alias: Emma Bedroom Scheduling trigger: - platform: time at: '06:06:00' action: - - service: script.nursery_scheduling + - service: script.emma_bedroom_scheduling script: kallen_scheduling_morning: @@ -419,10 +419,10 @@ script: N/A {% endif %} - nursery_scheduling: + emma_bedroom_scheduling: sequence: - service: input_datetime.set_datetime - entity_id: input_datetime.nursery_cooling + entity_id: input_datetime.emma_bedtime data_template: time: > {% set high = state_attr('sensor.current_forecast','high_temp') | float %} @@ -436,11 +436,11 @@ script: {% endif %} - service: input_select.select_option target: - entity_id: input_select.scheduled_climate_mode_nursery_aircon + entity_id: input_select.scheduled_climate_mode_emma_aircon data: option: > - {% if is_state('input_boolean.nursery_aircon_installed','on') %} - {% if states('sensor.tonights_low_temp') >= states('input_number.nursery_aircon_threshold') %} + {% if is_state('input_boolean.emma_bedroom_aircon_installed','on') %} + {% if states('sensor.tonights_low_temp') >= states('input_number.emma_aircon_threshold') %} AC {% else %} White Noise diff --git a/scripts.yaml b/scripts.yaml index b4ab92c..70e112b 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -46,7 +46,7 @@ give_me_darkness: - kallen_bedroom - master_bedroom - living_room - - nursery + - emma_bedroom - downstairs_bathroom data: {} - condition: template @@ -172,7 +172,7 @@ max_brightness: - switch.adaptive_lighting_living_room - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_mud_room - - switch.adaptive_lighting_nursery + - switch.adaptive_lighting_emma_bedroom - switch.adaptive_lighting_upstairs_hallway - switch.adaptive_lighting_dining_room - switch.adaptive_lighting_upstairs_bathroom @@ -366,7 +366,7 @@ max_brightness_cleanup: - switch.adaptive_lighting_living_room - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_mud_room - - switch.adaptive_lighting_nursery + - switch.adaptive_lighting_emma_bedroom - switch.adaptive_lighting_upstairs_hallway - switch.adaptive_lighting_dining_room - switch.adaptive_lighting_upstairs_bathroom @@ -383,7 +383,7 @@ max_brightness_cleanup: - input_text.living_room_selected_scene - input_text.master_bedroom_selected_scene - input_text.mud_room_selected_scene - - input_text.nursery_selected_scene + - input_text.emma_bedroom_selected_scene - input_text.tina_lamp_selected_scene - input_text.upstairs_hallway_selected_scene mode: single @@ -509,7 +509,7 @@ freeze_cleanup: - switch.adaptive_lighting_master_bedroom - switch.adaptive_lighting_mud_room - switch.adaptive_lighting_tina_lamp - - switch.adaptive_lighting_nursery + - switch.adaptive_lighting_emma_bedroom - switch.adaptive_lighting_upstairs_bathroom - switch.adaptive_lighting_upstairs_hallway - service: input_text.set_value @@ -524,7 +524,7 @@ freeze_cleanup: - input_text.living_room_selected_scene - input_text.master_bedroom_selected_scene - input_text.mud_room_selected_scene - - input_text.nursery_selected_scene + - input_text.emma_bedroom_selected_scene - input_text.tina_lamp_selected_scene - input_text.upstairs_bathroom_selected_scene - input_text.upstairs_hallway_selected_scene diff --git a/templates/speech/nightly_briefing.yaml b/templates/speech/nightly_briefing.yaml index f488029..9d0f7c7 100644 --- a/templates/speech/nightly_briefing.yaml +++ b/templates/speech/nightly_briefing.yaml @@ -306,15 +306,15 @@ {% else %} "Colins room will be left alone, as he is spending the night elsewhere tonight. " {% endif %} - {% if is_state('fan.nursery_air_conditioner','on') %} + {% if is_state('fan.emma_air_conditioner','on') %} "Emma's air conditioner is already running. " {% elif is_state('input_boolean.white_noise_emma_bedroom','on') %} "Emma's white noise generator is already running. " - {% elif 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') %} + {% elif is_state('input_select.scheduled_climate_mode_emma_aircon','AC') %} + "Emma's air conditioner will be activated at {{ (state_attr('input_datetime.emma_bedtime','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + {% elif is_state('input_select.scheduled_climate_mode_emma_aircon','White Noise') %} + "Emma's white noise generator will activate at {{ (state_attr('input_datetime.emma_bedroom','timestamp') | int | timestamp_custom('%I:%M %p', False)) }}. " + {% elif is_state('input_select.scheduled_climate_mode_emma_aircon','N/A') %} "Emma's room will have no devices activated tonight. " {% endif %}