From a085e71c86eedce301b47f42dc099b9b3849a4ff Mon Sep 17 00:00:00 2001 From: Tony Stork Date: Tue, 11 Feb 2025 02:41:43 -0500 Subject: [PATCH] Remove wife's desk strip as it broke --- automations.yaml | 6 -- packages/announcements.yaml | 2 - packages/lighting_and_scenes.yaml | 1 - packages/presence.yaml | 2 - packages/weatheralerts.yaml | 2 - scripts.yaml | 102 ++++++++---------------------- sensors/house_stats.yaml | 2 - 7 files changed, 28 insertions(+), 89 deletions(-) diff --git a/automations.yaml b/automations.yaml index 82f4c84..7eeae28 100644 --- a/automations.yaml +++ b/automations.yaml @@ -125,7 +125,6 @@ - light.basement_studio_lights - light.tina_lamp_top - light.tina_lamp_side - - light.tina_desk_strip - light.stairwell_led_strip data: color_name: red @@ -152,7 +151,6 @@ - light.master_bedroom_lights - light.tina_lamp_top - light.tina_lamp_side - - light.tina_desk_strip data: flash: long - alias: Send TTS notification to the common areas @@ -1574,7 +1572,6 @@ - light.living_room_color_3 - light.tina_lamp_side - light.tina_lamp_top - - light.tina_desk_strip - light.stairwell_led_strip - light.basement_stairwell - light.basement_tall_lamp @@ -1590,7 +1587,6 @@ - light.living_room_color_3 - light.tina_lamp_side - light.tina_lamp_top - - light.tina_desk_strip - light.stairwell_led_strip - delay: seconds: 1 @@ -1611,7 +1607,6 @@ entity_id: - light.living_room_lights - light.tina_lamp - - light.tina_desk_strip - light.stairwell_led_strip - light.basement_studio_lights data: @@ -1623,7 +1618,6 @@ entity_id: - light.living_room_lights - light.tina_lamp - - light.tina_desk_strip - light.stairwell_led_strip data: color_name: red diff --git a/packages/announcements.yaml b/packages/announcements.yaml index 538938f..4782ac1 100644 --- a/packages/announcements.yaml +++ b/packages/announcements.yaml @@ -283,7 +283,6 @@ script: - light.living_room_color_1 - light.living_room_color_2 - light.living_room_color_3 - - light.tina_desk_strip - light.tina_lamp_side - light.tina_lamp_top - light.mud_room_overhead @@ -320,7 +319,6 @@ script: entity_id: - light.living_room_lights - light.tina_lamp - - light.tina_desk_strip - light.basement_studio_lights data: color_name: > diff --git a/packages/lighting_and_scenes.yaml b/packages/lighting_and_scenes.yaml index 9cc97e9..33674d5 100644 --- a/packages/lighting_and_scenes.yaml +++ b/packages/lighting_and_scenes.yaml @@ -819,7 +819,6 @@ switch: - light.living_room_color_3 - light.tina_lamp_top - light.tina_lamp_side - - light.tina_desk_strip colors: - color_type: rgb_color color: [255,0,0] diff --git a/packages/presence.yaml b/packages/presence.yaml index 601d056..3d98d5c 100644 --- a/packages/presence.yaml +++ b/packages/presence.yaml @@ -405,7 +405,6 @@ automation: # - light.living_room_led_strip # - light.tina_lamp_top # - light.tina_lamp_side - # - light.tina_desk_strip # - alias: "Save Current Adaptive State" # service: scene.create # data: @@ -425,7 +424,6 @@ automation: # entity_id: # - light.living_room_lights # - light.tina_lamp - # - light.tina_desk_strip # - light.living_room_led_strip # data: # color_name: green diff --git a/packages/weatheralerts.yaml b/packages/weatheralerts.yaml index 82097d9..6a24d7c 100644 --- a/packages/weatheralerts.yaml +++ b/packages/weatheralerts.yaml @@ -1617,7 +1617,6 @@ script: # snapshot_entities: # - light.tina_lamp_side # - light.tina_lamp_top - # - light.tina_desk_strip # - switch.adaptive_lighting_living_room # - switch.adaptive_lighting_tina_lamp # - service: switch.turn_off @@ -1631,7 +1630,6 @@ script: # entity_id: # - light.tina_lamp_side # - light.tina_lamp_top - # - light.tina_desk_strip # data: # color_name: red # - service: script.living_room_lights_alert diff --git a/scripts.yaml b/scripts.yaml index 1fdb515..9c3f11d 100644 --- a/scripts.yaml +++ b/scripts.yaml @@ -780,14 +780,9 @@ adaptive_on_first_floor: value: Adaptive alias: If living room lights are on - if: - - condition: or - conditions: - - condition: state - entity_id: light.tina_lamp - state: 'on' - - condition: state - entity_id: light.tina_desk_strip - state: 'on' + - condition: state + entity_id: light.tina_lamp + state: 'on' then: - service: input_select.select_option target: @@ -1037,7 +1032,6 @@ bright_on_first_floor: - service: light.turn_on target: entity_id: - - light.tina_desk_strip - light.tina_lamp data: color_temp_kelvin: 2700 @@ -1045,7 +1039,6 @@ bright_on_first_floor: target: entity_id: - light.tina_lamp - - light.tina_desk_strip data: brightness: 255 bright_on_second_floor: @@ -1569,15 +1562,6 @@ day_mode_in_tina_desk: target: entity_id: light.tina_lamp_side data: {} - - service: light.turn_on - target: - entity_id: light.tina_desk_strip - data: - rgb_color: - - 0 - - 255 - - 255 - brightness: 89 - wait_template: '{{ is_state(''light.tina_lamp_side'',''off'') }}' timeout: seconds: 15 @@ -1606,23 +1590,13 @@ day_mode_in_tina_desk: evening_mode_in_tina_desk: alias: Evening Mode in Tina Desk sequence: - - alias: Turn on all lights - parallel: - - service: light.turn_on - data: {} - target: - entity_id: - - light.tina_lamp_top - - light.tina_lamp_side - - service: light.turn_on - target: - entity_id: light.tina_desk_strip - data: - rgb_color: - - 127 - - 0 - - 255 - brightness: 128 + - alias: Turn on lamp + service: light.turn_on + data: {} + target: + entity_id: + - light.tina_lamp_top + - light.tina_lamp_side - alias: Apply adaptive lighting to lamp if: - condition: state @@ -1652,25 +1626,15 @@ night_mode_in_tina_desk: target: entity_id: switch.adaptive_lighting_tina_lamp data: {} - - parallel: - - service: light.turn_on - target: - entity_id: light.tina_lamp - data: - rgb_color: - - 127 - - 0 - - 255 - brightness: 128 - - service: light.turn_on - target: - entity_id: light.tina_desk_strip - data: - rgb_color: - - 127 - - 0 - - 255 - brightness: 128 + - service: light.turn_on + target: + entity_id: light.tina_lamp + data: + rgb_color: + - 127 + - 0 + - 255 + brightness: 128 mode: restart icon: mdi:palette bright_mode_in_tina_desk: @@ -1680,25 +1644,15 @@ bright_mode_in_tina_desk: target: entity_id: switch.adaptive_lighting_tina_lamp data: {} - - parallel: - - service: light.turn_on - target: - entity_id: light.tina_lamp - data: - rgb_color: - - 255 - - 210 - - 175 - brightness: 255 - - service: light.turn_on - target: - entity_id: light.tina_desk_strip - data: - rgb_color: - - 255 - - 210 - - 175 - brightness: 255 + - service: light.turn_on + target: + entity_id: light.tina_lamp + data: + rgb_color: + - 255 + - 210 + - 175 + brightness: 255 mode: restart icon: mdi:palette tony_morning_meds: diff --git a/sensors/house_stats.yaml b/sensors/house_stats.yaml index 54c57d4..71c26f4 100644 --- a/sensors/house_stats.yaml +++ b/sensors/house_stats.yaml @@ -68,7 +68,6 @@ states.light.downstairs_bathroom_right, states.light.tina_lamp_top, states.light.tina_lamp_side, - states.light.tina_desk_strip, states.light.basement_tall_lamp, states.light.basement_short_lamp, states.light.basement_stairwell, @@ -103,7 +102,6 @@ states.light.downstairs_bathroom_right, states.light.tina_lamp_top, states.light.tina_lamp_side, - states.light.tina_desk_strip ] %} {{ lights | selectattr('state','eq','on') | list | count | int }} - name: Second Floor Lights On