diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml index beb1f29..1f31967 100644 --- a/config/lovelace/advanced_dashboard/02_lights.yaml +++ b/config/lovelace/advanced_dashboard/02_lights.yaml @@ -71,20 +71,7 @@ cards: - light: light.light_le_4 - fade: switch.light_le_4_fade - wifi: sensor.light_le_4_wifi - - type: custom:fold-entity-row - head: - type: custom:decluttering-card - template: light_with_fade_and_switch - variables: - - light: light.light_avatar_small_2 - - fade: switch.light_avatar_small_2_fade - - wifi: sensor.light_avatar_small_2_wifi - entities: - - type: custom:slider-entity-row - entity: light.light_avatar_small_2 - name: Brightness - hide_state: true - step: 5 + - light.light_le_8 - light.living_room_ambient - light.living_room_ambient_main - type: custom:fold-entity-row @@ -162,18 +149,18 @@ cards: icon: mdi:chef-hat show_header_toggle: false entities: - - light.tuya_kitchen + - light.kitchen - type: divider - - light.tuya_kitchen_main + - light.kitchen_main - type: custom:fold-entity-row entity: light.kitchen_main name: Main lights entities: - - light.light_le_11 - - light.light_le_12 + - light.osram_2 + - light.osram_3 - light.light_orbecco_1 - type: divider - - light.tuya_kitchen_secondary + - light.kitchen_secondary - type: custom:fold-entity-row entity: light.kitchen_secondary name: Secondary lights @@ -207,12 +194,7 @@ cards: min: 153 max: 500 step: 5 - - type: custom:decluttering-card - template: light_with_fade_and_switch - variables: - - light: light.light_hama_1 - - fade: switch.light_hama_1_fade - - wifi: sensor.light_hama_1_wifi + - light.osram_5 - type: custom:decluttering-card template: light_with_fade_and_switch variables: @@ -220,10 +202,10 @@ cards: - fade: switch.light_lohas_6_fade - wifi: sensor.light_lohas_6_wifi - type: divider - - light.tuya_hallway_main + - light.hallway_main - type: custom:fold-entity-row entity: light.hallway_main name: Main lights entities: - - light.light_le_7 - - light.light_le_8 + - light.osram_1 + - light.osram_4 diff --git a/config/lovelace/advanced_dashboard/08_automations.yaml b/config/lovelace/advanced_dashboard/08_automations.yaml index 7b45602..fc0fbb7 100644 --- a/config/lovelace/advanced_dashboard/08_automations.yaml +++ b/config/lovelace/advanced_dashboard/08_automations.yaml @@ -187,6 +187,8 @@ cards: - automation.system_telegram_announce_status - automation.speech_telegram_action_do_nothing - automation.ifttt_call_service + - automation.lighting_tuya_update_states_on_start + - automation.lighting_sync_osram_states_on_start_up - type: entities title: Wallmote diff --git a/config/lovelace/floorplan_dashboard/picture_elements/light_overlays.yaml b/config/lovelace/floorplan_dashboard/picture_elements/light_overlays.yaml index 311c48b..c330c99 100644 --- a/config/lovelace/floorplan_dashboard/picture_elements/light_overlays.yaml +++ b/config/lovelace/floorplan_dashboard/picture_elements/light_overlays.yaml @@ -24,7 +24,7 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.light_avatar_small_2 + - entity: light.light_le_8 state: "on" - entity: light.living_room_main state: "off" @@ -42,7 +42,7 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.light_avatar_small_2 + - entity: light.light_le_8 state: "off" - entity: light.living_room_main state: "on" @@ -60,7 +60,7 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.light_avatar_small_2 + - entity: light.light_le_8 state: "on" - entity: light.living_room_main state: "on" @@ -136,9 +136,9 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.tuya_kitchen_main + - entity: light.kitchen_main state: "on" - - entity: light.tuya_kitchen_secondary + - entity: light.kitchen_secondary state: "off" elements: - type: image @@ -155,9 +155,9 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.tuya_kitchen_main + - entity: light.kitchen_main state: "off" - - entity: light.tuya_kitchen_secondary + - entity: light.kitchen_secondary state: "on" elements: - type: image @@ -174,9 +174,9 @@ conditions: - entity: binary_sensor.floorplan_night_mode state: "on" - - entity: light.tuya_kitchen_main + - entity: light.kitchen_main state: "on" - - entity: light.tuya_kitchen_secondary + - entity: light.kitchen_secondary state: "on" elements: - type: image @@ -196,7 +196,7 @@ state: "on" - entity: light.hallway_entrance state: "on" - - entity: light.tuya_hallway_main + - entity: light.hallway_main state: "off" elements: - type: image @@ -214,7 +214,7 @@ state: "on" - entity: light.hallway_entrance state: "off" - - entity: light.tuya_hallway_main + - entity: light.hallway_main state: "on" elements: - type: image @@ -232,7 +232,7 @@ state: "on" - entity: light.hallway_entrance state: "on" - - entity: light.tuya_hallway_main + - entity: light.hallway_main state: "on" elements: - type: image diff --git a/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml b/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml index f8349e5..3dfd27b 100644 --- a/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml +++ b/config/lovelace/floorplan_dashboard/picture_elements/light_switches.yaml @@ -1,7 +1,7 @@ - type: custom:decluttering-card template: floorplan_state_icon variables: - - entity: light.light_avatar_small_2 + - entity: light.light_le_8 - top: 69.8% - left: 77.8% @@ -36,14 +36,14 @@ - type: custom:decluttering-card template: floorplan_state_icon variables: - - entity: light.tuya_kitchen_secondary + - entity: light.kitchen_secondary - top: 29% - left: 12.9% - type: custom:decluttering-card template: floorplan_state_icon variables: - - entity: light.tuya_kitchen_main + - entity: light.kitchen_main - top: 29% - left: 20.3% @@ -57,6 +57,6 @@ - type: custom:decluttering-card template: floorplan_state_icon variables: - - entity: light.tuya_hallway_main + - entity: light.hallway_main - top: 41% - left: 34.8% diff --git a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml index 8f6f964..f1f70fb 100644 --- a/config/lovelace/hallway_dashboard/at_home_dashboard.yaml +++ b/config/lovelace/hallway_dashboard/at_home_dashboard.yaml @@ -3,6 +3,28 @@ layout: horizontal max_columns: 2 cards: # Column 1 + - type: horizontal-stack + cards: + - type: custom:button-card + entity: input_select.light_color_mode + name: PRESS ME + tap_action: + action: call-service + service: input_select.select_option + service_data: + entity_id: input_select.light_color_mode + option: "blue" + - type: custom:button-card + name: back to normal pls + entity: input_select.light_color_mode + tap_action: + action: call-service + service: input_select.select_option + service_data: + entity_id: input_select.light_color_mode + option: "normal" + + - type: vertical-stack cards: - type: custom:button-card @@ -31,7 +53,7 @@ cards: name: Main - type: custom:button-card template: [small, with_state_background] - entity: light.light_avatar_small_2 + entity: light.light_le_8 - type: custom:button-card template: [small, with_state_background] entity: light.living_room_ambient @@ -61,11 +83,11 @@ cards: cards: - type: custom:button-card template: [small, with_state_background] - entity: light.tuya_kitchen + entity: light.kitchen name: Kitchen - type: custom:button-card template: [small, with_state_background] - entity: light.tuya_hallway_main + entity: light.hallway_main name: Hallway - type: custom:button-card template: [small, with_state_background] diff --git a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml index 064632d..7e38499 100644 --- a/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml +++ b/config/lovelace/hallway_dashboard/coming_home_dashboard.yaml @@ -31,7 +31,7 @@ cards: name: Main - type: custom:button-card template: [small, with_state_background] - entity: light.light_avatar_small_2 + entity: light.light_le_8 - type: custom:button-card template: [small, with_state_background] entity: light.living_room_ambient @@ -61,11 +61,11 @@ cards: cards: - type: custom:button-card template: [small, with_state_background] - entity: light.tuya_kitchen + entity: light.kitchen name: Kitchen - type: custom:button-card template: [small, with_state_background] - entity: light.tuya_hallway_main + entity: light.hallway_main name: Hallway - type: custom:button-card template: [small, with_state_background] diff --git a/config/lovelace/home_dashboard/kitchen_dashboard.yaml b/config/lovelace/home_dashboard/kitchen_dashboard.yaml index a641049..790d36d 100644 --- a/config/lovelace/home_dashboard/kitchen_dashboard.yaml +++ b/config/lovelace/home_dashboard/kitchen_dashboard.yaml @@ -21,15 +21,15 @@ cards: - type: custom:button-card template: default - entity: light.tuya_kitchen + entity: light.kitchen name: Kitchen - type: custom:button-card template: default - entity: light.tuya_kitchen_main + entity: light.kitchen_main name: Main - type: custom:button-card template: default - entity: light.tuya_kitchen_secondary + entity: light.kitchen_secondary name: Secondary - type: vertical-stack cards: @@ -39,7 +39,7 @@ name: Entrance - type: custom:button-card template: half - entity: light.tuya_hallway_main + entity: light.hallway_main name: Hallway styles: card: diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml index 3403719..2313223 100644 --- a/config/lovelace/home_dashboard/living_room_dashboard.yaml +++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml @@ -29,7 +29,7 @@ name: Main - type: custom:button-card template: default - entity: light.light_avatar_small_2 + entity: light.light_le_8 name: PC - type: custom:button-card template: default diff --git a/config/lovelace/home_dashboard/main_dashboard.yaml b/config/lovelace/home_dashboard/main_dashboard.yaml index e997c6c..986e95a 100644 --- a/config/lovelace/home_dashboard/main_dashboard.yaml +++ b/config/lovelace/home_dashboard/main_dashboard.yaml @@ -44,7 +44,7 @@ name: Main - type: custom:button-card template: default - entity: light.light_avatar_small_2 + entity: light.light_le_8 - type: custom:button-card template: default entity: light.living_room_ambient @@ -74,11 +74,11 @@ cards: - type: custom:button-card template: default - entity: light.tuya_kitchen + entity: light.kitchen name: Kitchen - type: custom:button-card template: default - entity: light.tuya_hallway_main + entity: light.hallway_main name: Hallway - type: custom:button-card template: default diff --git a/config/packages/devices/bedroom/aqara_switch.yaml b/config/packages/devices/bedroom/aqara_switch.yaml index 8c8e32e..fac16cd 100644 --- a/config/packages/devices/bedroom/aqara_switch.yaml +++ b/config/packages/devices/bedroom/aqara_switch.yaml @@ -31,8 +31,8 @@ automation: - service: script.sonos_volume_10 double_click: - - service: scene.turn_on - entity_id: scene.bedroom_default + - service: input_select.select_next + entity_id: input_select.light_color_mode hold: - service: media_player.media_play_pause diff --git a/config/packages/devices/living_room/trust_remote.yaml b/config/packages/devices/living_room/trust_remote.yaml index 3465d83..0fa4ffa 100644 --- a/config/packages/devices/living_room/trust_remote.yaml +++ b/config/packages/devices/living_room/trust_remote.yaml @@ -38,7 +38,7 @@ automation: {% elif groupId == 0 %} {% set entityId = 'light.living_room_main' %} {% elif groupId == 1 %} - {% set entityId = 'light.light_avatar_small_2' %} + {% set entityId = 'light.light_le_8' %} {% elif groupId == 2 %} {% set entityId = 'light.living_room_ambient' %} {% elif groupId == 3 %} @@ -74,7 +74,7 @@ automation: {% elif groupId == 0 %} light.living_room_main {% elif groupId == 1 %} - light.light_avatar_small_2 + light.light_le_8 {% elif groupId == 2 %} light.living_room_ambient {% elif groupId == 3 %} @@ -102,7 +102,7 @@ automation: {% elif groupId == 0 %} {% set entityId = 'light.living_room_main' %} {% elif groupId == 1 %} - {% set entityId = 'light.light_avatar_small_2' %} + {% set entityId = 'light.light_le_8' %} {% elif groupId == 2 %} {% set entityId = 'light.living_room_ambient' %} {% elif groupId == 3 %} diff --git a/config/packages/devices/living_room/wallmote.yaml b/config/packages/devices/living_room/wallmote.yaml index 059b968..23a6b1f 100644 --- a/config/packages/devices/living_room/wallmote.yaml +++ b/config/packages/devices/living_room/wallmote.yaml @@ -79,7 +79,7 @@ automation: - service: light.toggle entity_id: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - alias: Wallmote · Living room · 3 · Hold · Toggle Ambient lights trigger: diff --git a/config/packages/modules/lighting/areas/hallway.yaml b/config/packages/modules/lighting/areas/hallway.yaml index 9c12e28..042757d 100644 --- a/config/packages/modules/lighting/areas/hallway.yaml +++ b/config/packages/modules/lighting/areas/hallway.yaml @@ -30,7 +30,7 @@ automation: brightness_pct: 30 - service: light.turn_on entity_id: - - light.light_le_8 + - light.osram_1 - light.browser_hallway data: brightness_pct: 13 @@ -60,13 +60,13 @@ automation: default: - service: light.turn_on entity_id: - - light.light_le_8 + - light.light_osram_1 - light.light_lohas_6 data: brightness_pct: 100 - service: light.turn_off entity_id: - - light.light_le_8 + - light.light_osram_1 - light.light_lohas_6 - service: light.turn_on entity_id: light.browser_hallway diff --git a/config/packages/modules/lighting/areas/kitchen.yaml b/config/packages/modules/lighting/areas/kitchen.yaml index bd15063..fe69272 100644 --- a/config/packages/modules/lighting/areas/kitchen.yaml +++ b/config/packages/modules/lighting/areas/kitchen.yaml @@ -29,14 +29,14 @@ automation: entity_id: sensor.dark_sky_cloud_coverage above: 80 - service: light.turn_on - entity_id: light.tuya_kitchen + entity_id: light.kitchen data: brightness_pct: 100 # Night Mode default: - service: light.turn_on entity_id: - - light.light_le_12 + - light.osram_2 - light.browser_kitchen data: brightness_pct: 13 # this is the lowest LE will go ¯\_(ツ)_/¯ @@ -57,7 +57,7 @@ automation: state: 'day' sequence: - service: light.turn_off - entity_id: light.tuya_kitchen + entity_id: light.kitchen - service: light.turn_on entity_id: light.browser_kitchen data: @@ -65,11 +65,11 @@ automation: # Night Mode default: - service: light.turn_on - entity_id: light.light_le_12 + entity_id: light.osram_2 data: brightness_pct: 100 - service: light.turn_off - entity_id: light.light_le_12 + entity_id: light.osram_2 - service: light.turn_on entity_id: light.browser_kitchen data: diff --git a/config/packages/modules/lighting/color_mode.yaml b/config/packages/modules/lighting/color_mode.yaml new file mode 100644 index 0000000..0c6d5aa --- /dev/null +++ b/config/packages/modules/lighting/color_mode.yaml @@ -0,0 +1,95 @@ +input_select: + light_color_mode: + name: Light color mode + icon: mdi:format-color-fill + options: + - normal + - blue + +automation: + - alias: Light · Color · Default + trigger: + platform: state + entity_id: input_select.light_color_mode + to: "normal" + action: + - service: scene.turn_on + entity_id: + - scene.living_room_ambient_neon + - scene.bedroom_ambient_neon + - service: light.turn_on + entity_id: light.light_orbecco_1 + data: + brightness_pct: 100 + rgb_color: [255, 182, 109] + + - service: light.turn_on + entity_id: + - light.master_bedroom_main + - light.light_lohas_6 + - light.kitchen_secondary + - light.osram_2 + - light.osram_3 + data: + brightness_pct: 100 + color_temp: 500 + - service: light.turn_on + entity_id: + - light.living_room_main + - light.hallway_main + - light.tuya_kitchen + - service: automation.turn_on + entity_id: + - automation.lighting_hallway_motion_on + - automation.lighting_hallway_motion_off + - automation.lighting_kitchen_motion_on + - automation.lighting_kitchen_motion_off + + + + - alias: Light · Color · Blue + trigger: + platform: state + entity_id: input_select.light_color_mode + to: "blue" + action: + - service: automation.turn_off + entity_id: + - automation.lighting_hallway_motion_on + - automation.lighting_hallway_motion_off + - automation.lighting_kitchen_motion_on + - automation.lighting_kitchen_motion_off + - service: light.turn_off + entity_id: + - light.living_room_main + - light.hallway_main + # kitchen.... + - light.tuya_kitchen_main + - light.tuya_kitchen_secondary + - light.kitchen_secondary + - light.osram_2 + - light.osram_3 + - service: light.turn_on + entity_id: + - light.living_room_ambient_main + - light.bedside + - light.bed_led + - light.master_bedroom_main + data: + rgb_color: [0, 0, 255] + brightness_pct: 40 + - service: light.turn_on + entity_id: + - light.light_avatar_small_1 # living room ambient Secondary + - light.light_lohas_6 # entrance 1 + - light.light_orbecco_1 + data: + rgb_color: [0, 0, 255] + brightness_pct: 100 + + + - service: light.turn_off + entity_id: + - light.kitchen_secondary + - light.osram_2 + - light.osram_3 diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml index 5da15e7..adf7a96 100644 --- a/config/packages/modules/lighting/setup/groups.yaml +++ b/config/packages/modules/lighting/setup/groups.yaml @@ -11,7 +11,7 @@ light: name: Living room ceiling entities: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - platform: group name: Living room ambient @@ -43,8 +43,8 @@ light: - platform: group name: Kitchen main entities: - - light.light_le_11 - - light.light_le_12 + - light.osram_2 + - light.osram_3 - light.light_orbecco_1 - platform: group @@ -55,6 +55,12 @@ light: - light.light_le_9 - light.light_le_10 + - platform: group + name: Kitchen + entities: + - light.kitchen_main + - light.kitchen_secondary + - platform: group name: Tuya Kitchen entities: @@ -64,21 +70,20 @@ light: - platform: group name: Hallway entrance entities: - # - light.light_lohas_5 - - light.light_hama_1 + - light.osram_5 - light.light_lohas_6 - platform: group name: Hallway main entities: - - light.light_le_7 - - light.light_le_8 + - light.osram_1 + - light.osram_4 - platform: group name: Hallway entities: - light.hallway_entrance - - light.tuya_hallway_main + - light.hallway_main - platform: group name: On after dark @@ -91,9 +96,9 @@ light: name: Ceiling entities: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - light.master_bedroom_main - - light.tuya_kitchen + - light.kitchen - light.hallway - platform: group @@ -101,7 +106,7 @@ light: entities: - light.living_room - light.master_bedroom - - light.tuya_kitchen + - light.kitchen - light.hallway homeassistant: @@ -127,7 +132,7 @@ homeassistant: light.light_le_4: friendly_name: Living room 4 - light.light_avatar_small_2: + light.light_le_8: friendly_name: PC icon: bha:outdoor-lamp-variant @@ -177,14 +182,20 @@ homeassistant: icon: bha:ceiling-lamp-plafond # light.light_lohas_5: # friendly_name: Entrance 1 - light.light_hama_1: + light.osram_5: friendly_name: Entrance 1 light.light_lohas_6: friendly_name: Entrance 2 light.hallway_main: icon: bha:ceiling-lamp-plafond - light.light_le_7: + + light.osram_1: friendly_name: Hallway 1 - light.light_le_8: + light.osram_4: friendly_name: Hallway 2 + + # light.light_le_7: + # friendly_name: Hallway 1 + # light.light_le_8: + # friendly_name: Hallway 2 diff --git a/config/packages/modules/lighting/setup/mqtt.yaml b/config/packages/modules/lighting/setup/mqtt.yaml index 1e96402..8a9ede4 100644 --- a/config/packages/modules/lighting/setup/mqtt.yaml +++ b/config/packages/modules/lighting/setup/mqtt.yaml @@ -300,31 +300,6 @@ light: qos: 1 retain: false - - platform: mqtt - name: "light_avatar_small_2" - availability_topic: "tele/light_avatar_small_2/LWT" - command_topic: "cmnd/light_avatar_small_2/POWER" - state_topic: "tele/light_avatar_small_2/STATE" - state_value_template: "{{ value_json.POWER }}" - brightness_command_topic: "cmnd/light_avatar_small_2/Dimmer" - brightness_scale: 100 - brightness_state_topic: "tele/light_avatar_small_2/STATE" - brightness_value_template: "{{ value_json.Dimmer }}" - on_command_type: "brightness" - white_value_command_topic: "cmnd/light_avatar_small_2/WHITE" - white_value_scale: 100 - white_value_state_topic: "tele/light_avatar_small_2/STATE" - white_value_template: "{{ value_json.White }}" - rgb_command_topic: "cmnd/light_avatar_small_2/Color" - rgb_state_topic: "tele/light_avatar_small_2/STATE" - rgb_value_template: "{{ value_json.Color.split(',')[0:3]|join(',') }}" - payload_on: "ON" - payload_off: "OFF" - payload_available: "Online" - payload_not_available: "Offline" - qos: 1 - retain: false - sensor: - platform: mqtt name: "light_hama_1_wifi" @@ -416,16 +391,6 @@ sensor: unit_of_measurement: "%" value_template: "{{ value_json.Wifi.RSSI }}" - # - platform: mqtt - # name: "light_lohas_5_wifi" - # availability_topic: "tele/light_lohas_5/LWT" - # device_class: signal_strength - # payload_available: "Online" - # payload_not_available: "Offline" - # state_topic: "tele/light_lohas_5/STATE" - # unit_of_measurement: "%" - # value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt name: "light_lohas_6_wifi" availability_topic: "tele/light_lohas_6/LWT" @@ -446,16 +411,6 @@ sensor: unit_of_measurement: "%" value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt - name: "light_avatar_small_2_wifi" - availability_topic: "tele/light_avatar_small_2/LWT" - device_class: signal_strength - payload_available: "Online" - payload_not_available: "Offline" - state_topic: "tele/light_avatar_small_2/STATE" - unit_of_measurement: "%" - value_template: "{{ value_json.Wifi.RSSI }}" - switch: - platform: mqtt name: "light_hama_1_fade" @@ -556,17 +511,6 @@ switch: state_topic: "stat/light_lohas_4/RESULT" value_template: "{{ value_json.Fade }}" - # - platform: mqtt - # name: "light_lohas_5_fade" - # availability_topic: "tele/light_lohas_5/LWT" - # command_topic: "cmnd/light_lohas_5/FADE" - # icon: mdi:gradient - # payload_available: "Online" - # payload_not_available: "Offline" - # qos: 1 - # state_topic: "stat/light_lohas_5/RESULT" - # value_template: "{{ value_json.Fade }}" - - platform: mqtt name: "light_lohas_6_fade" availability_topic: "tele/light_lohas_6/LWT" @@ -589,18 +533,6 @@ switch: state_topic: "stat/light_avatar_small_1/RESULT" value_template: "{{ value_json.Fade }}" - - platform: mqtt - name: "light_avatar_small_2_fade" - availability_topic: "tele/light_avatar_small_2/LWT" - command_topic: "cmnd/light_avatar_small_2/FADE" - icon: mdi:gradient - payload_available: "Online" - payload_not_available: "Offline" - qos: 1 - state_topic: "stat/light_avatar_small_2/RESULT" - value_template: "{{ value_json.Fade }}" - - automation: - alias: Lighting · Sync Tasmota states on start-up initial_state: true @@ -612,3 +544,26 @@ automation: data: topic: "cmnd/tasmotas/STATE" payload: "" + + - alias: Lighting · Sync Osram states on start-up + initial_state: true + trigger: + platform: homeassistant + event: start + action: + - service: mqtt.publish + data: + topic: "z2m_deconz/osram_1/get" + payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/osram_2/get" + payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/osram_3/get" + payload: "" + - service: mqtt.publish + data: + topic: "z2m_deconz/osram_4/get" + payload: "" diff --git a/config/packages/modules/lighting/setup/osram.yaml b/config/packages/modules/lighting/setup/osram.yaml new file mode 100644 index 0000000..27f8d44 --- /dev/null +++ b/config/packages/modules/lighting/setup/osram.yaml @@ -0,0 +1,107 @@ +light: + - platform: "mqtt" + name: "osram_1" + state_topic: "z2m_deconz/osram_1" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/osram_1/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + + - platform: "mqtt" + name: "osram_2" + state_topic: "z2m_deconz/osram_2" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/osram_2/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + + - platform: "mqtt" + name: "osram_3" + state_topic: "z2m_deconz/osram_3" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/osram_3/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + + - platform: "mqtt" + name: "osram_4" + state_topic: "z2m_deconz/osram_4" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/osram_4/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + + - platform: "mqtt" + name: "osram_5" + state_topic: "z2m_deconz/osram_5" + availability_topic: "z2m_deconz/bridge/state" + brightness: true + color_temp: true + xy: false + hs: false + schema: "json" + command_topic: "z2m_deconz/osram_5/set" + brightness_scale: 254 + max_mireds: 500 + min_mireds: 150 + +sensor: + - platform: "mqtt" + name: "osram_1_lqi" + state_topic: "z2m_deconz/osram_1" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "osram_2_lqi" + state_topic: "z2m_deconz/osram_2" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "osram_3_lqi" + state_topic: "z2m_deconz/osram_3" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "osram_4_lqi" + state_topic: "z2m_deconz/osram_4" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" + - platform: "mqtt" + name: "osram_5_lqi" + state_topic: "z2m_deconz/osram_5" + availability_topic: "z2m_deconz/bridge/state" + value_template: "{{ value_json.linkquality }}" + unit_of_measurement: "lqi" + icon: "mdi:signal" diff --git a/config/packages/modules/media/plex.yaml b/config/packages/modules/media/plex.yaml index af740ac..340ce4d 100644 --- a/config/packages/modules/media/plex.yaml +++ b/config/packages/modules/media/plex.yaml @@ -23,25 +23,25 @@ automation: scene_id: plex_before_start snapshot_entities: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - light.living_room_ambient_main - light.light_avatar_small_1 - light.master_bedroom_main - - light.tuya_kitchen_main - - light.tuya_kitchen_secondary + - light.kitchen_main + - light.kitchen_secondary - light.hallway_entrance - - light.tuya_hallway_main + - light.hallway_main - service: light.turn_off entity_id: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - light.living_room_ambient_main - light.light_avatar_small_1 - light.master_bedroom_main - - light.tuya_kitchen_main - - light.tuya_kitchen_secondary + - light.kitchen_main + - light.kitchen_secondary - light.hallway_entrance - - light.tuya_hallway_main + - light.hallway_main - alias: TV · Plex · Restore house after Plex trigger: @@ -53,14 +53,4 @@ automation: from: "playing" action: - service: scene.turn_on - # FIXME: Light colors are not being snapshotted/restored properly. entity_id: scene.plex_before_start - # - delay: 00:00:01 - # - condition: state - # entity_id: light.light_avatar_small_2 - # state: "on" - # # FIXME: There is nothing else to fix the temperature of the PC light - # - service: light.turn_on - # entity_id: light.light_avatar_small_2 - # data: - # color_temp: 250 diff --git a/config/packages/modules/network.yaml b/config/packages/modules/network.yaml index 7a84660..5e460a2 100644 --- a/config/packages/modules/network.yaml +++ b/config/packages/modules/network.yaml @@ -36,7 +36,7 @@ homekit: filter: include_entities: - light.living_room_main - - light.light_avatar_small_2 + - light.light_le_8 - light.living_room_ambient - light.master_bedroom_main - light.bedside @@ -63,7 +63,7 @@ homekit: - switch.titanium - fan.philips_airpurifier entity_config: - light.light_avatar_small_2: + light.light_le_8: name: PC binary_sensor.kitchen_motion_occupancy: linked_battery_sensor: sensor.kitchen_motion_battery