diff --git a/README.md b/README.md index 4e3e168..7307c9f 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ The `speech` module uses [partial templates](https://github.com/GeorgeSG/sarah/t - [Philips Hue White E14](https://www.philips-hue.com/en-us/p/hue-white-2-pack-e12/046677548285) - A bunch of random Tuya E14 lights (wifi - some flashed with Tasmota, some runing on Tuya Cloud) - [Yeelight S1 Lights](https://www.yeelight.com/en_US/product/lemon2-color) (wifi) -- [Random LED strip from AliExpress](https://www.aliexpress.com/item/4000068013535.html?spm=a2g0s.9042311.0.0.6ea44c4d3Tm6AF) (Zigbee) A note on lights - I tried a lot of wifi lights, running on Tuya Cloud, running with Tasmota; also tried some Zigbee ones as well. They all broke or had issues - blinking, noise, etc. The Hues are diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml index 705dcb8..fcd6c18 100644 --- a/config/lovelace/advanced_dashboard/02_lights.yaml +++ b/config/lovelace/advanced_dashboard/02_lights.yaml @@ -148,7 +148,6 @@ cards: - lqi: sensor.hue_5_lqi - update: binary_sensor.hue_5_update_available - light.bedside - - light.bed_led - type: entities title: Kitchen diff --git a/config/lovelace/advanced_dashboard/10_system.yaml b/config/lovelace/advanced_dashboard/10_system.yaml index c0565d0..ac1c3ba 100644 --- a/config/lovelace/advanced_dashboard/10_system.yaml +++ b/config/lovelace/advanced_dashboard/10_system.yaml @@ -109,7 +109,6 @@ cards: - sensor.aqara_tvoc_lqi - type: divider - sensor.bedside_switch_lqi - # - sensor.bed_led_lqi - sensor.bedside_second_switch_lqi - sensor.bedroom_opple_lqi - sensor.bedroom_door_lqi diff --git a/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml b/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml index ca4f56e..12e4976 100644 --- a/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml +++ b/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml @@ -26,13 +26,6 @@ - top: 11.7% - left: 61.6% -- type: custom:decluttering-card - template: floorplan_state_icon - variables: - - entity: light.bed_led - - top: 11% - - left: 67.5% - - type: custom:decluttering-card template: floorplan_state_icon variables: diff --git a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml index 945dfbe..db6de87 100644 --- a/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml +++ b/config/lovelace/floorplan_dashboard/picture_elements/sensors.yaml @@ -265,20 +265,3 @@ background-color: rgba(255,0,0,0.5) color: transparent transform: perspective(2000px) rotateX(185.6deg) rotateY(73.1deg) - -# Master bedroom LED Strip -- type: conditional - conditions: - - entity: light.bed_led - state: "on" - elements: - - type: state-label - entity: light.bed_led - style: - width: 9.9% - height: 0 - top: 7.6% - left: 67.6% - color: transparent - box-shadow: '0 0 7px 4px rgb(255, 127, 0)' - opacity: 0.6 diff --git a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml index 8a390f3..eaa4476 100644 --- a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml +++ b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml @@ -218,23 +218,16 @@ card: template: v3_tablet_button entity: light.master_bedroom_main name: Main - - type: custom:button-card - template: v3_tablet_button - entity: light.bed_led - name: Bed - tap_action: - action: call-service - service: script.bed_led_toggle - type: custom:button-card template: v3_tablet_button entity: light.bedside name: Bedside - - type: horizontal-stack - cards: - type: custom:button-card template: v3_tablet_button entity: light.kitchen name: Kitchen + - type: horizontal-stack + cards: - type: custom:button-card template: v3_tablet_button entity: light.hallway_main diff --git a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml index f125a88..b316e80 100644 --- a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml +++ b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml @@ -214,23 +214,16 @@ card: template: v3_tablet_button entity: light.master_bedroom_main name: Main - - type: custom:button-card - template: v3_tablet_button - entity: light.bed_led - name: Bed - tap_action: - action: call-service - service: script.bed_led_toggle - type: custom:button-card template: v3_tablet_button entity: light.bedside name: Bedside - - type: horizontal-stack - cards: - type: custom:button-card template: v3_tablet_button entity: light.kitchen name: Kitchen + - type: horizontal-stack + cards: - type: custom:button-card template: v3_tablet_button entity: light.hallway_main diff --git a/config/lovelace/home_dashboard/bedroom_dashboard.yaml b/config/lovelace/home_dashboard/bedroom_dashboard.yaml index b76c4b1..202cc07 100644 --- a/config/lovelace/home_dashboard/bedroom_dashboard.yaml +++ b/config/lovelace/home_dashboard/bedroom_dashboard.yaml @@ -118,12 +118,6 @@ template: v3_button_light entity: light.bedside name: Bedside - - type: horizontal-stack - cards: - - type: custom:button-card - template: v3_button_light - entity: light.bed_led - name: Bed - type: vertical-stack diff --git a/config/packages/devices/bedroom/bed_led.yaml b/config/packages/devices/bedroom/bed_led.yaml deleted file mode 100644 index c342d89..0000000 --- a/config/packages/devices/bedroom/bed_led.yaml +++ /dev/null @@ -1,44 +0,0 @@ -mqtt: - light: - - name: "Bed LED" - state_topic: "z2m_deconz/bed_led" - availability_topic: "z2m_deconz/bridge/state" - brightness: true - color_temp: true - xy: true - schema: "json" - command_topic: "z2m_deconz/bed_led/set" - brightness_scale: 254 - sensor: - - name: "Bed LED LQI" - state_topic: "z2m_deconz/bed_led" - availability_topic: "z2m_deconz/bridge/state" - device_class: "signal_strength" - unit_of_measurement: "lqi" - value_template: "{{ value_json.linkquality }}" - -script: - bed_led_on: - sequence: - - delay: "00:00:01" - - service: light.turn_on - entity_id: light.bed_led - - delay: "00:00:03" - - service: light.turn_on - entity_id: light.bed_led - data_template: - brightness_pct: "{{ brightness_pct | default(100) }}" - - bed_led_toggle: - sequence: - - choose: - - conditions: - - condition: state - entity_id: light.bed_led - state: "off" - sequence: - - service: script.bed_led_on - - default: - - service: light.turn_off - entity_id: light.bed_led diff --git a/config/packages/devices/bedroom/bedroom_opple.yaml b/config/packages/devices/bedroom/bedroom_opple.yaml index c3d8fda..5ac37b7 100644 --- a/config/packages/devices/bedroom/bedroom_opple.yaml +++ b/config/packages/devices/bedroom/bedroom_opple.yaml @@ -52,14 +52,12 @@ automation: - service: light.turn_off entity_id: - light.bedside - - light.bed_led button_2_triple: - service: light.turn_on data_template: entity_id: - light.bedside - - light.bed_led brightness_pct: "{{ is_state('input_select.bedroom_mode', 'day') | iif(100, 40) }}" button_3_single: diff --git a/config/packages/devices/bedroom/bedside_switch.yaml b/config/packages/devices/bedroom/bedside_switch.yaml index 7a9e3d8..65e7e6c 100644 --- a/config/packages/devices/bedroom/bedside_switch.yaml +++ b/config/packages/devices/bedroom/bedside_switch.yaml @@ -30,10 +30,6 @@ automation: {% endif %} brightness_pct: 100 - # - service: script.bed_led_toggle - # data_template: - # brightness_pct: "{{ is_state('input_select.bedroom_mode', 'night') | iif(40, 100)}}" - double_click: - service: light.toggle entity_id: light.bedside diff --git a/config/packages/devices/bedroom/bedside_switch_2.yaml b/config/packages/devices/bedroom/bedside_switch_2.yaml index 2b84f7d..ad9870e 100644 --- a/config/packages/devices/bedroom/bedside_switch_2.yaml +++ b/config/packages/devices/bedroom/bedside_switch_2.yaml @@ -31,10 +31,6 @@ automation: {% endif %} brightness_pct: 100 - # - service: script.bed_led_toggle - # data_template: - # brightness_pct: "{{ is_state('input_select.bedroom_mode', 'night') | iif(40, 100)}}" - double_click: - service: media_player.media_play_pause entity_id: media_player.master_bedroom diff --git a/config/packages/modules/lighting/areas/bedroom.yaml b/config/packages/modules/lighting/areas/bedroom.yaml index 44ad540..f7c9592 100644 --- a/config/packages/modules/lighting/areas/bedroom.yaml +++ b/config/packages/modules/lighting/areas/bedroom.yaml @@ -1,15 +1,10 @@ script: apply_bedroom_ambient_neon: sequence: - - service: light.turn_off - entity_id: light.bed_led - - delay: "00:00:03" - service: scene.turn_on entity_id: scene.bedroom_ambient_neon apply_bedroom_neon: sequence: - - service: light.turn_off - entity_id: light.bed_led - service: light.turn_on entity_id: light.master_bedroom_main - delay: "00:00:01" @@ -23,8 +18,6 @@ script: entity_id: scene.bedroom_ambient_neon apply_bedroom_pink: sequence: - - service: light.turn_off - entity_id: light.bed_led - service: light.turn_on entity_id: light.master_bedroom_main - delay: "00:00:01" @@ -49,10 +42,6 @@ scene: state: "on" rgb_color: [0, 255, 190] brightness: 230 - light.bed_led: - state: "on" - xy_color: [0.66, 0.28] - brightness: 254 - name: Bedroom Ambient Neon icon: "mdi:weather-night" @@ -61,10 +50,6 @@ scene: state: "on" rgb_color: [0, 255, 190] brightness: 230 - light.bed_led: - state: "on" - xy_color: [0.66, 0.28] - brightness: 254 - name: Bedroom Pink icon: "mdi:weather-night" @@ -77,10 +62,6 @@ scene: state: "on" rgb_color: [255, 36, 145] brightness: 230 - light.bed_led: - state: "on" - xy_color: [0.66, 0.28] - brightness: 254 - name: Bedroom Ambient Pink icon: "mdi:weather-night" @@ -89,10 +70,6 @@ scene: state: "on" rgb_color: [255, 36, 145] brightness: 230 - light.bed_led: - state: "on" - xy_color: [0.66, 0.28] - brightness: 254 - name: Bedroom Ambient Default icon: "mdi:weather-sunny" @@ -101,10 +78,6 @@ scene: state: "on" color_temp: 359 brightness: 255 - light.bed_led: - state: "on" - color_temp: 500 - brightness: 255 - name: Bedroom Default icon: "mdi:weather-sunny" @@ -117,10 +90,6 @@ scene: state: "on" color_temp: 359 brightness: 255 - light.bed_led: - state: "on" - color_temp: 500 - brightness: 255 automation: - alias: Lighting · Bedroom · Door open diff --git a/config/packages/modules/lighting/color_mode.yaml b/config/packages/modules/lighting/color_mode.yaml index e13657c..10d24a9 100644 --- a/config/packages/modules/lighting/color_mode.yaml +++ b/config/packages/modules/lighting/color_mode.yaml @@ -64,7 +64,6 @@ automation: brightness_pct: 40 - service: light.turn_on entity_id: - - light.bed_led - light.light_lohas_2 # living room ambient Secondary - light.hue_1 # Hallway - light.neo_1 # Kitchen diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml index 2b18715..d1163d6 100644 --- a/config/packages/modules/lighting/setup/groups.yaml +++ b/config/packages/modules/lighting/setup/groups.yaml @@ -104,7 +104,6 @@ light: entities: - light.master_bedroom_main - light.bedside - - light.bed_led - platform: group name: Kitchen diff --git a/config/packages/modules/media/plex.yaml b/config/packages/modules/media/plex.yaml index 13f0bbc..fc04a9c 100644 --- a/config/packages/modules/media/plex.yaml +++ b/config/packages/modules/media/plex.yaml @@ -29,7 +29,6 @@ automation: - light.hallway_entrance - light.hallway_main - light.master_bedroom_main - - light.bed_led - light.kitchen_main - light.kitchen_secondary - service: light.turn_off @@ -45,7 +44,6 @@ automation: - service: light.turn_off entity_id: - light.master_bedroom_main - - light.bed_led - light.kitchen_main - light.kitchen_secondary diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml index 6656c6e..85a6ee6 100644 --- a/config/packages/modules/network.yaml +++ b/config/packages/modules/network.yaml @@ -40,7 +40,6 @@ homekit: - light.master_bedroom - light.master_bedroom_main - light.bedside - - light.bed_led - binary_sensor.bedroom_door - binary_sensor.bedroom_left_window - binary_sensor.bedroom_right_window @@ -108,8 +107,6 @@ homekit: name: Bedroom Main light.bedside: name: Bedside Lamp - light.bed_led: - name: Bed LED sensor.bedroom_weather_temperature: linked_battery_sensor: sensor.bedroom_weather_battery low_battery_threshold: 20 diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml index 4691faf..1fa9db9 100644 --- a/config/packages/routines/bedtime.yaml +++ b/config/packages/routines/bedtime.yaml @@ -23,7 +23,6 @@ script: - service: light.turn_on entity_id: - light.bedside - - light.bed_led - service: light.turn_off entity_id: light.master_bedroom_main diff --git a/config/packages/routines/good_night.yaml b/config/packages/routines/good_night.yaml index cfdaee5..5e07584 100644 --- a/config/packages/routines/good_night.yaml +++ b/config/packages/routines/good_night.yaml @@ -11,12 +11,6 @@ script: # data: # message: "Entering night mode. Good night!" - # Prepare Bed LED brightness to be turned on during night time - - service: light.turn_on - entity_id: light.bed_led - data: - brightness_pct: 40 - - service: fan.turn_on entity_id: fan.philips_airpurifier - service: input_select.select_option diff --git a/config/packages/routines/waking_up.yaml b/config/packages/routines/waking_up.yaml index 36a1564..d9a5d2b 100644 --- a/config/packages/routines/waking_up.yaml +++ b/config/packages/routines/waking_up.yaml @@ -63,7 +63,6 @@ script: - delay: 00:00:01 - service: light.turn_on entity_id: - - light.bed_led - light.bedside - service: script.routine_morning_briefing