From 2224d1eab9221faaa93a43db6fa07add3cffddfa Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Wed, 15 Feb 2023 13:20:33 -0500 Subject: [PATCH] Improved Good Morning flow #75 --- node-red/projects/NerdFlows | 2 +- packages/announcements.yaml | 7 ------- packages/lighting_and_scenes.yaml | 26 ++++++++++++++++++++++++++ 3 files changed, 27 insertions(+), 8 deletions(-) diff --git a/node-red/projects/NerdFlows b/node-red/projects/NerdFlows index 1ab1ebb..c15f901 160000 --- a/node-red/projects/NerdFlows +++ b/node-red/projects/NerdFlows @@ -1 +1 @@ -Subproject commit 1ab1ebb11c4f3bd17233d6e3c86c926a3bb42a10 +Subproject commit c15f901fdcdc576aac1a266933c4fda0c58629b3 diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 80f9636..070b91a 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -215,13 +215,6 @@ script: - service: input_boolean.turn_off entity_id: input_boolean.good_morning - morning_briefing_alexa: - alias: 'Morning Briefing Alexa' - sequence: - - service: button.press - target: - entity_id: button.good_morning - kallen_nightly_briefing: alias: 'Kallen Nightly Briefing' sequence: diff --git a/packages/lighting_and_scenes.yaml b/packages/lighting_and_scenes.yaml index eeed2b1..e7c7b7a 100644 --- a/packages/lighting_and_scenes.yaml +++ b/packages/lighting_and_scenes.yaml @@ -1051,6 +1051,32 @@ script: Nightlight {% endif %} + morning_scene: + alias: 'Morning Scene' + sequence: + - if: + - condition: template + value_template: "{{ states('weather.iron_nerd_weather_station') not in ['sunny','clear-night'] }}" + then: + - service: light.turn_on + target: + entity_id: light.master_bedroom_lights + - if: + - condition: template + value_template: "{{ is_state('input_boolean.kallen_sleeping','off') and is_state('person.kallen_stork','home') }}" + then: + - service: light.turn_on + target: + entity_id: light.kallen_bedroom_lights + - if: + - condition: state + entity_id: input_boolean.emma_sleeping + state: 'off' + then: + - service: light.turn_on + target: + entity_id: light.emma_bedroom_light + #! Unless there is a good reason, do not define multi-room scenes below. #! Use scripts instead, to avoid some straight-up haunted house bullshit...