diff --git a/kitchen-lovelace.yaml b/kitchen-lovelace.yaml index 8335f0c..f587b6f 100644 --- a/kitchen-lovelace.yaml +++ b/kitchen-lovelace.yaml @@ -55,7 +55,7 @@ views: entity: binary_sensor.kitchen_window_contact - type: custom:button-card template: v3_badge_icon - entity: binary_sensor.kitchen_door_contact + entity: binary_sensor.kitchen_door - type: custom:decluttering-card template: v3_section_title diff --git a/lovelace/home_dashboard/kitchen_dashboard.yaml b/lovelace/home_dashboard/kitchen_dashboard.yaml index fdfcbb9..386bd8a 100644 --- a/lovelace/home_dashboard/kitchen_dashboard.yaml +++ b/lovelace/home_dashboard/kitchen_dashboard.yaml @@ -44,7 +44,7 @@ entity: binary_sensor.kitchen_window_contact - type: custom:button-card template: v3_badge_icon - entity: binary_sensor.kitchen_door_contact + entity: binary_sensor.kitchen_door - type: custom:decluttering-card template: v3_section_title diff --git a/packages/devices/living_room/toshiba_ac.yaml b/packages/devices/living_room/toshiba_ac.yaml index 0d8fa22..7d280da 100644 --- a/packages/devices/living_room/toshiba_ac.yaml +++ b/packages/devices/living_room/toshiba_ac.yaml @@ -74,7 +74,7 @@ template: {% set outside_temp_high = states('sensor.dark_sky_apparent_temperature')|float + 2 >= states('input_number.toshiba_trigger_temp')|float %} {% set someone_home = is_state('binary_sensor.someone_home', 'on') %} {% set bedroom_ready = is_state('group.bedroom_windows', 'off') or is_state('binary_sensor.bedroom_door_contact', 'off') %} - {% set kitchen_ready = is_state('binary_sensor.kitchen_window_contact', 'off') or is_state('binary_sensor.kitchen_door_contact', 'off') %} + {% set kitchen_ready = is_state('binary_sensor.kitchen_window_contact', 'off') or is_state('binary_sensor.kitchen_door', 'off') %} {% set ac_off = is_state('climate.toshiba_ac', 'off') %} {{ temp_matching and outside_temp_high and someone_home and bedroom_ready and kitchen_ready and ac_off }} @@ -160,7 +160,7 @@ automation: - binary_sensor.living_room_right_window_contact - group.bedroom_windows - binary_sensor.kitchen_window_contact - - binary_sensor.kitchen_door_contact + - binary_sensor.kitchen_door from: "on" to: "off" action: diff --git a/packages/modules/lighting/areas/hallway.yaml b/packages/modules/lighting/areas/hallway.yaml index 50d11dc..c6fb469 100644 --- a/packages/modules/lighting/areas/hallway.yaml +++ b/packages/modules/lighting/areas/hallway.yaml @@ -18,8 +18,7 @@ automation: sequence: - service: light.turn_on entity_id: - - light.hallway_main - - light.hallway_entrance + - light.hallway - light.browser_hallway data: brightness_pct: 100 @@ -49,8 +48,7 @@ automation: sequence: - service: light.turn_off entity_id: - - light.hallway_main - - light.hallway_entrance + - light.hallway - service: script.browser_hallway_low # Turn off in Night Mode default: diff --git a/packages/modules/lighting/areas/kitchen.yaml b/packages/modules/lighting/areas/kitchen.yaml index 8ea76bc..5b92ef6 100644 --- a/packages/modules/lighting/areas/kitchen.yaml +++ b/packages/modules/lighting/areas/kitchen.yaml @@ -31,9 +31,7 @@ automation: entity_id: sensor.dark_sky_cloud_coverage above: 80 - service: light.turn_on - entity_id: - - light.kitchen_main - - light.kitchen_secondary + entity_id: light.kitchen data: brightness_pct: 100 # Turn on in Night Mode diff --git a/packages/modules/lighting/setup/groups.yaml b/packages/modules/lighting/setup/groups.yaml index b948e60..e752909 100644 --- a/packages/modules/lighting/setup/groups.yaml +++ b/packages/modules/lighting/setup/groups.yaml @@ -25,68 +25,65 @@ light: - light.living_room_ambient_main - light.light_lohas_2 - - platform: group - name: Master bedroom main - entities: - - light.hue_2 - - light.hue_3 - - light.hue_4 - - light.hue_5 + # - platform: group + # name: Master bedroom main + # entities: + # - light.hue_2 + # - light.hue_3 + # - light.hue_4 + # - light.hue_5 - platform: group name: Master bedroom entities: - - light.hue_2 - - light.hue_3 - - light.hue_4 - - light.hue_5 + - light.master_bedroom_main - light.bedside - - platform: group - name: Kitchen main - entities: - - light.tradfri_1 - - light.hue_ambiance_6 - - light.hue_ambiance_8 + # - platform: group + # name: Kitchen main + # entities: + # - light.tradfri_1 + # - light.hue_ambiance_6 + # - light.hue_ambiance_8 - - platform: group - name: Kitchen secondary - entities: - - light.hue_ambiance_1 - - light.hue_ambiance_2 - - light.hue_ambiance_3 - - light.hue_ambiance_4 + # - platform: group + # name: Kitchen secondary + # entities: + # - light.hue_ambiance_1 + # - light.hue_ambiance_2 + # - light.hue_ambiance_3 + # - light.hue_ambiance_4 - - platform: group - name: Kitchen - entities: - - light.tradfri_1 - - light.hue_ambiance_6 - - light.hue_ambiance_8 - - light.hue_ambiance_1 - - light.hue_ambiance_2 - - light.hue_ambiance_3 - - light.hue_ambiance_4 + # - platform: group + # name: Kitchen + # entities: + # - light.tradfri_1 + # - light.hue_ambiance_6 + # - light.hue_ambiance_8 + # - light.hue_ambiance_1 + # - light.hue_ambiance_2 + # - light.hue_ambiance_3 + # - light.hue_ambiance_4 - - platform: group - name: Hallway main - entities: - - light.hue_ambiance_5 - - light.hue_1 + # - platform: group + # name: Hallway main + # entities: + # - light.hue_ambiance_5 + # - light.hue_1 - - platform: group - name: Hallway entrance - entities: - - light.hue_white_1 - - light.hue_white_2 + # - platform: group + # name: Hallway entrance + # entities: + # - light.hue_white_1 + # - light.hue_white_2 - - platform: group - name: Hallway - entities: - - light.hue_ambiance_5 - - light.hue_1 - - light.hue_white_1 - - light.hue_white_2 + # - platform: group + # name: Hallway + # entities: + # - light.hue_ambiance_5 + # - light.hue_1 + # - light.hue_white_1 + # - light.hue_white_2 - platform: group name: On after dark @@ -101,17 +98,10 @@ light: # LR ambiance - light.living_room_ambient_main - light.light_lohas_2 - # BR main - - light.hue_2 - - light.hue_3 - - light.hue_4 - - light.hue_5 + + - light.master_bedroom_main - light.bedside - # Hallway - - light.hue_ambiance_5 - - light.hue_1 - - light.hue_white_1 - - light.hue_white_2 + - light.hallway script: @@ -120,34 +110,20 @@ script: service: light.turn_on entity_id: # LR main - - light.light_le_1 - - light.light_le_2 - - light.light_le_3 - - light.light_le_4 - # PC - - light.hue_ambiance_7 - # LR ambiance - - light.living_room_ambient_main - - light.light_lohas_2 - # BR main - - light.hue_2 - - light.hue_3 - - light.hue_4 - - light.hue_5 - - light.bedside - # Hallway - - light.hue_ambiance_5 - - light.hue_1 - - light.hue_white_1 - - light.hue_white_2 - # Kitchen - - light.tradfri_1 - - light.hue_ambiance_6 - - light.hue_ambiance_8 - - light.hue_ambiance_1 - - light.hue_ambiance_2 - - light.hue_ambiance_3 - - light.hue_ambiance_4 + - light.light_le_1 + - light.light_le_2 + - light.light_le_3 + - light.light_le_4 + # PC + - light.hue_ambiance_7 + # LR ambiance + - light.living_room_ambient_main + - light.light_lohas_2 + - light.master_bedroom_main + - light.bedside + + - light.hallway + - light.kitchen turn_off_all_lights: sequence: service: light.turn_off @@ -162,25 +138,11 @@ script: # LR ambiance - light.living_room_ambient_main - light.light_lohas_2 - # BR main - - light.hue_2 - - light.hue_3 - - light.hue_4 - - light.hue_5 + - light.master_bedroom_main - light.bedside - # Hallway - - light.hue_ambiance_5 - - light.hue_1 - - light.hue_white_1 - - light.hue_white_2 - # Kitchen - - light.tradfri_1 - - light.hue_ambiance_6 - - light.hue_ambiance_8 - - light.hue_ambiance_1 - - light.hue_ambiance_2 - - light.hue_ambiance_3 - - light.hue_ambiance_4 + + - light.hallway + - light.kitchen homeassistant: customize: diff --git a/packages/modules/lighting/temperature.yaml b/packages/modules/lighting/temperature.yaml index 3659ecc..debcee5 100644 --- a/packages/modules/lighting/temperature.yaml +++ b/packages/modules/lighting/temperature.yaml @@ -16,8 +16,7 @@ automation: - light.living_room_main - light.hue_ambiance_7 - light.master_bedroom_main - - light.kitchen_main - - light.kitchen_secondary + - light.kitchen action: - service: light.turn_on data_template: diff --git a/packages/modules/media/plex.yaml b/packages/modules/media/plex.yaml index 59e7bf5..2cee03d 100644 --- a/packages/modules/media/plex.yaml +++ b/packages/modules/media/plex.yaml @@ -26,26 +26,22 @@ automation: - light.hue_ambiance_7 - light.living_room_ambient_main - light.light_lohas_2 - - light.hallway_entrance - - light.hallway_main + - light.hallway - light.master_bedroom_main - - light.kitchen_main - - light.kitchen_secondary + - light.kitchen - service: light.turn_off entity_id: - - light.hallway_entrance + - light.hallway - light.living_room_main - service: light.turn_off entity_id: - light.hue_ambiance_7 - light.living_room_ambient_main - light.light_lohas_2 - - light.hallway_main - service: light.turn_off entity_id: - light.master_bedroom_main - - light.kitchen_main - - light.kitchen_secondary + - light.kitchen - alias: TV · Plex · Restore house after Plex trigger: diff --git a/packages/modules/preferences/preferences_milena.yaml b/packages/modules/preferences/preferences_milena.yaml index 754c933..904004b 100644 --- a/packages/modules/preferences/preferences_milena.yaml +++ b/packages/modules/preferences/preferences_milena.yaml @@ -61,9 +61,7 @@ automation: use_blueprint: path: light_on_set_temperature.yaml input: - light: - - light.kitchen_main - - light.kitchen_secondary + light: light.kitchen day_temp: 153 evening_temp: 153 night_temp: 153 diff --git a/packages/routines/good_night.yaml b/packages/routines/good_night.yaml index b014de7..19827ae 100644 --- a/packages/routines/good_night.yaml +++ b/packages/routines/good_night.yaml @@ -36,10 +36,8 @@ script: entity_id: - light.living_room - light.master_bedroom - - light.kitchen_main - - light.kitchen_secondary - - light.hallway_main - - light.hallway_entrance + - light.kitchen + - light.hallway - light.tradfri_large - media_player.nvidia_shield - media_player.living_room_tv diff --git a/packages/routines/waking_up.yaml b/packages/routines/waking_up.yaml index 57ea534..2bfab70 100644 --- a/packages/routines/waking_up.yaml +++ b/packages/routines/waking_up.yaml @@ -16,9 +16,7 @@ script: alias: Routine · Waking up sequence: - service: light.turn_on - entity_id: - - light.hallway_main - - light.hallway_entrance + entity_id: light.hallway data: brightness_pct: 100