diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml index 2063272b..6a8e42d9 100755 --- a/config/automation/late_night_outside_helper.yaml +++ b/config/automation/late_night_outside_helper.yaml @@ -24,17 +24,6 @@ - service: scene.turn_on entity_id: scene.front_full_brightness - - choose: - - conditions: > - {{ states.group.entry_points.state == 'on' or - states.group.garage_doors.state != 'closed' }} - sequence: - - service: scene.turn_on - entity_id: scene.Red_living_Room - default: - - service: scene.turn_on - entity_id: scene.tv_time - - service: > {% set hour=states("sensor.time").split(':')[0] | int %} {% if hour >= 5 and hour <= 9 and states.group.bed.state == 'on'%} @@ -50,14 +39,3 @@ - wait_template: "{{ is_state('group.entry_points', 'off') }}" - wait_template: "{{ is_state('group.garage_doors', 'closed') }}" - service: script.monthly_color_scene - - - choose: - - conditions: > - {{ states.group.entry_points.state == 'on' or - states.group.garage_doors.state != 'closed' }} - sequence: - - service: scene.turn_on - entity_id: scene.Red_living_Room - default: - - service: scene.turn_on - entity_id: scene.tv_time diff --git a/config/automation/living_room_color_defaults.yaml b/config/automation/living_room_color_defaults.yaml index bbb23152..725f03d6 100644 --- a/config/automation/living_room_color_defaults.yaml +++ b/config/automation/living_room_color_defaults.yaml @@ -77,3 +77,35 @@ data: kelvin: 2700 brightness: 200 + + - alias: 'Living Room Red on Entry/Garage Open' + id: living_room_red_on_entry_open + mode: restart + variables: + was_off: "{{ is_state('light.living_room_lights', 'off') }}" + trigger: + - platform: state + entity_id: group.entry_points + to: 'on' + - platform: state + entity_id: group.garage_doors + from: 'closed' + to: 'open' + action: + - service: scene.turn_on + target: + entity_id: scene.red_living_room + - wait_for_trigger: + - platform: state + entity_id: group.entry_points + to: 'off' + - platform: state + entity_id: group.garage_doors + to: 'closed' + timeout: "01:00:00" + - choose: + - conditions: "{{ was_off }}" + sequence: + - service: light.turn_off + target: + entity_id: light.living_room_lights diff --git a/config/automation/tv_time_on_and_off.yaml b/config/automation/tv_time_on_and_off.yaml index ad46686c..960974ca 100755 --- a/config/automation/tv_time_on_and_off.yaml +++ b/config/automation/tv_time_on_and_off.yaml @@ -1,26 +1,15 @@ ###################################################################### -# @CCOSTAN -# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig -# TV Time at sunset or 8pm. Whichever is later. +# config/automation/tv_time_on_and_off.yaml +# TV Time: soften house lights when living room media starts after 8pm/sunset. +# https://github.com/CCOSTAN/Home-AssistantConfig ###################################################################### - alias: TV Time id: 6e59d312-661f-40da-bb08-416f2e86b566 trigger: - - platform: state - entity_id: input_boolean.TV_time - to: 'on' - from: 'off' - - platform: state - entity_id: sun.sun - to: 'below_horizon' - from: 'above_horizon' - platform: state entity_id: media_player.living_room_ultra to: 'playing' - - platform: time - at: '20:00:00' - condition: condition: and conditions: @@ -40,8 +29,6 @@ state: 'playing' action: - - service: input_boolean.turn_off - entity_id: input_boolean.tv_time - service: light.turn_off entity_id: diff --git a/config/input_boolean/trigger_booleans.yaml b/config/input_boolean/trigger_booleans.yaml index 2d4c6796..8f1850b9 100755 --- a/config/input_boolean/trigger_booleans.yaml +++ b/config/input_boolean/trigger_booleans.yaml @@ -6,10 +6,6 @@ meal_time: name: Meal Time initial: off -tv_time: - name: TV Time - initial: off - work: name: Work initial: off diff --git a/config/packages/garadget.yaml b/config/packages/garadget.yaml index d39c823f..c479cd07 100755 --- a/config/packages/garadget.yaml +++ b/config/packages/garadget.yaml @@ -352,10 +352,6 @@ automation: entity_id: group.family to: not_home for: 00:05:00 - - platform: state - entity_id: input_boolean.tv_time - to: 'on' - from: 'off' condition: condition: or diff --git a/config/scene/living_room.yaml b/config/scene/living_room.yaml index 6d302233..d66412f8 100755 --- a/config/scene/living_room.yaml +++ b/config/scene/living_room.yaml @@ -1,14 +1,18 @@ - name: TV Time entities: light.m1_front_left: - state: off + state: on + rgb_color: &gold [255,223,0] + brightness: 100 light.m1_front_right: - state: off + state: on + rgb_color: *gold + brightness: 100 light.main_slider: state: off light.m1_back_right: state: on - rgb_color: &gold [255,223,0] + rgb_color: *gold brightness: 50 light.m1_back_left: state: on