From e2c109b8203913dad47eb8abd1442265e1fee713 Mon Sep 17 00:00:00 2001 From: Georgi Gardev Date: Sat, 28 May 2022 12:21:58 +0300 Subject: [PATCH] Update light temperature automations --- .../automation/light_on_set_temperature.yaml | 12 ++-- .../automation/light_sun_set_temperature.yaml | 4 +- .../advanced_dashboard/08_automations.yaml | 17 +---- .../modules/lighting/areas/bedroom.yaml | 21 ------ .../modules/lighting/areas/kitchen.yaml | 41 ----------- .../modules/lighting/areas/living_room.yaml | 28 -------- .../modules/lighting/temperature.yaml | 69 +++++++++---------- 7 files changed, 45 insertions(+), 147 deletions(-) diff --git a/config/blueprints/automation/light_on_set_temperature.yaml b/config/blueprints/automation/light_on_set_temperature.yaml index 4e90951..b12c7f2 100644 --- a/config/blueprints/automation/light_on_set_temperature.yaml +++ b/config/blueprints/automation/light_on_set_temperature.yaml @@ -29,8 +29,8 @@ action: before: sunset sequence: - service: light.turn_on - entity_id: !input light - data: + data_template: + entity_id: "{{ trigger.entity_id }}" color_temp: !input day_temp - conditions: @@ -44,8 +44,8 @@ action: after_offset: "+03:00:00" sequence: - service: light.turn_on - entity_id: !input light - data: + data_template: + entity_id: "{{ trigger.entity_id }}" color_temp: !input evening_temp - conditions: @@ -56,6 +56,6 @@ action: before: sunrise sequence: - service: light.turn_on - entity_id: !input light - data: + data_template: + entity_id: "{{ trigger.entity_id }}" color_temp: !input night_temp diff --git a/config/blueprints/automation/light_sun_set_temperature.yaml b/config/blueprints/automation/light_sun_set_temperature.yaml index 41acc0a..4203127 100644 --- a/config/blueprints/automation/light_sun_set_temperature.yaml +++ b/config/blueprints/automation/light_sun_set_temperature.yaml @@ -18,6 +18,6 @@ condition: state: "on" action: - service: light.turn_on - entity_id: !input light - data: + data_template: + entity_id: "{{ trigger.entity_id }}" color_temp: !input temp diff --git a/config/lovelace/advanced_dashboard/08_automations.yaml b/config/lovelace/advanced_dashboard/08_automations.yaml index 3747eb1..4ce0adc 100644 --- a/config/lovelace/advanced_dashboard/08_automations.yaml +++ b/config/lovelace/advanced_dashboard/08_automations.yaml @@ -72,27 +72,16 @@ cards: entities: - automation.lighting_turn_on_ceiling_lights_after_sunset - automation.lighting_turn_off_all_lights_after_sunrise - # - type: divider - # - automation.lighting_temperature_adjust_based_on_time - type: divider - - automation.lighting_living_room_temperature_adjust_on_start - - automation.lighting_living_room_temperature_sunset - - automation.lighting_living_room_temperature_night + - automation.lighting_temperature_adjust_on_start + - automation.lighting_temperature_sunset + - automation.lighting_temperature_night - type: divider - automation.lighting_bedroom_door_open - - automation.lighting_bedroom_temperature_adjust_on_start - - automation.lighting_bedroom_temperature_sunset - - automation.lighting_bedroom_temperature_night - type: divider - automation.lighting_kitchen_motion_on - automation.lighting_kitchen_night_motion_off - automation.lighting_kitchen_day_motion_off - - automation.lighting_kitchen_temperature_main_adjust_on_start - - automation.lighting_kitchen_temperature_secondary_adjust_on_start - - automation.lighting_kitchen_temperature_main_sunset - - automation.lighting_kitchen_temperature_secondary_sunset - - automation.lighting_kitchen_temperature_main_night - - automation.lighting_kitchen_temperature_secondary_night - type: divider - automation.lighting_hallway_motion_on - automation.lighting_hallway_motion_off diff --git a/config/packages/modules/lighting/areas/bedroom.yaml b/config/packages/modules/lighting/areas/bedroom.yaml index 713d8e3..44ad540 100644 --- a/config/packages/modules/lighting/areas/bedroom.yaml +++ b/config/packages/modules/lighting/areas/bedroom.yaml @@ -139,24 +139,3 @@ automation: action: - service: light.turn_on entity_id: light.master_bedroom_main - - - alias: Lighting · Bedroom · Temperature · Adjust on start - use_blueprint: - path: light_on_set_temperature.yaml - input: - light: light.master_bedroom_main - - - alias: Lighting · Bedroom · Temperature · Sunset - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.master_bedroom_main - temp: 400 - - - alias: Lighting · Bedroom · Temperature · Night - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.master_bedroom_main - temp: 500 - after_offset: "+03:00:00" diff --git a/config/packages/modules/lighting/areas/kitchen.yaml b/config/packages/modules/lighting/areas/kitchen.yaml index 0c9b5cf..2aea9da 100644 --- a/config/packages/modules/lighting/areas/kitchen.yaml +++ b/config/packages/modules/lighting/areas/kitchen.yaml @@ -97,44 +97,3 @@ automation: entity_id: light.browser_kitchen data: brightness_pct: 1 - - - alias: Lighting · Kitchen · Temperature · Main · Adjust on start - use_blueprint: - path: light_on_set_temperature.yaml - input: - light: light.kitchen_main - - - alias: Lighting · Kitchen · Temperature · Secondary · Adjust on start - use_blueprint: - path: light_on_set_temperature.yaml - input: - light: light.kitchen_secondary - - - alias: Lighting · Kitchen · Temperature · Main · Sunset - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.kitchen_main - temp: 400 - - - alias: Lighting · Kitchen · Temperature · Secondary · Sunset - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.kitchen_secondary - temp: 400 - - - alias: Lighting · Kitchen · Temperature · Main · Night - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.kitchen_main - temp: 500 - after_offset: "+03:00:00" - - - alias: Lighting · Kitchen · Temperature · Secondary · Night - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: light.kitchen_secondary - temp: 500 diff --git a/config/packages/modules/lighting/areas/living_room.yaml b/config/packages/modules/lighting/areas/living_room.yaml index 7c57ce7..3da1dd3 100644 --- a/config/packages/modules/lighting/areas/living_room.yaml +++ b/config/packages/modules/lighting/areas/living_room.yaml @@ -21,31 +21,3 @@ scene: state: "on" color_temp: 284 brightness_pct: 80 - -automation: - - alias: Lighting · Living Room · Temperature · Adjust on start - use_blueprint: - path: light_on_set_temperature.yaml - input: - light: - - light.living_room_main - - light.pc - - - alias: Lighting · Living Room · Temperature · Sunset - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: - - light.living_room_main - - light.pc - temp: 400 - - - alias: Lighting · Living Room · Temperature · Night - use_blueprint: - path: light_sun_set_temperature.yaml - input: - light: - - light.living_room_main - - light.pc - temp: 500 - after_offset: "+03:00:00" diff --git a/config/packages/modules/lighting/temperature.yaml b/config/packages/modules/lighting/temperature.yaml index cbdb6cb..c644f0d 100644 --- a/config/packages/modules/lighting/temperature.yaml +++ b/config/packages/modules/lighting/temperature.yaml @@ -1,37 +1,36 @@ -# automation: -# - alias: Lighting · Temperature · Adjust based on time -# trigger: -# platform: sun -# event: sunset -# action: -# - service: light.turn_on -# data_template: -# entity_id: -# - light.master_bedroom_main -# - light.living_room_main -# color_temp: "{{ 400 if is_state('sun.sun', 'above_horizon') else 500 }}" -# - service: logbook.log -# data_template: -# name: "💡 Lighting Module · " -# message: >- -# Adjusting temperature - sun changed from {{ trigger.from_state.state }} to {{ trigger.to_state.state }} -# domain: light +automation: + - alias: Lighting · Temperature · Adjust on start + use_blueprint: + path: light_on_set_temperature.yaml + input: + light: + - light.living_room_main + - light.pc + - light.master_bedroom_main + - light.kitchen_main + - light.kitchen_secondary -# switch: -# - platform: flux -# disable_brightness_adjust: true -# lights: -# - light.living_room_main -# - light.master_bedroom_main -# - light.pc + - alias: Lighting · Temperature · Sunset + use_blueprint: + path: light_sun_set_temperature.yaml + input: + light: + - light.living_room_main + - light.pc + - light.master_bedroom_main + - light.kitchen_main + - light.kitchen_secondary + temp: 400 -# circadian_lighting: - -# switch: -# - platform: circadian_lighting -# name: Circadian lights -# disable_brightness_adjust: true -# lights_ct: -# - light.master_bedroom_main -# - light.pc -# - light.living_room_main + - alias: Lighting ·Temperature · Night + use_blueprint: + path: light_sun_set_temperature.yaml + input: + light: + - light.living_room_main + - light.pc + - light.master_bedroom_main + - light.kitchen_main + - light.kitchen_secondary + temp: 500 + after_offset: "+03:00:00"