diff --git a/config/lovelace/advanced_dashboard/02_lights.yaml b/config/lovelace/advanced_dashboard/02_lights.yaml index 385ac77..a8c9bcf 100644 --- a/config/lovelace/advanced_dashboard/02_lights.yaml +++ b/config/lovelace/advanced_dashboard/02_lights.yaml @@ -85,12 +85,12 @@ cards: type: custom:decluttering-card template: light_with_fade_and_switch variables: - - light: light.light_avatar_small_1 - - fade: switch.light_avatar_small_1_fade - - wifi: sensor.light_avatar_small_1_wifi + - light: light.light_lohas_2 + - fade: switch.light_lohas_2 + - wifi: sensor.light_lohas_2_wifi entities: - type: custom:slider-entity-row - entity: light.light_avatar_small_1 + entity: light.light_lohas_2 name: Brightness hide_state: true step: 5 @@ -243,3 +243,15 @@ cards: - light: light.hue_1 - lqi: sensor.hue_1_lqi - update: binary_sensor.hue_1_update_available + + - type: entities + title: Guest Bedroom + icon: mdi:door-closed + show_header_toggle: false + entities: + - type: custom:decluttering-card + template: light_with_fade_and_switch + variables: + - light: light.light_lohas_6 + - fade: switch.light_lohas_6 + - wifi: sensor.light_lohas_6_wifi diff --git a/config/lovelace/home_dashboard/living_room_dashboard.yaml b/config/lovelace/home_dashboard/living_room_dashboard.yaml index 5d7c038..d32ebd3 100644 --- a/config/lovelace/home_dashboard/living_room_dashboard.yaml +++ b/config/lovelace/home_dashboard/living_room_dashboard.yaml @@ -88,7 +88,7 @@ name: Ambient Main - type: custom:button-card template: v3_button - entity: light.light_avatar_small_1 + entity: light.light_lohas_2 name: Ambient 2nd - type: vertical-stack diff --git a/config/packages/devices/living_room/trust_remote.yaml b/config/packages/devices/living_room/trust_remote.yaml index 868ae92..6840878 100644 --- a/config/packages/devices/living_room/trust_remote.yaml +++ b/config/packages/devices/living_room/trust_remote.yaml @@ -44,7 +44,7 @@ automation: {% elif groupId == 3 %} {% set entityId = 'light.living_room_ambient_main' %} {% elif groupId == 4 %} - {% set entityId = 'light.light_avatar_small_1' %} + {% set entityId = 'light.light_lohas_2' %} {% endif %} {{ entityId }} @@ -80,7 +80,7 @@ automation: {% elif groupId == 3 %} light.living_room_ambient_main {% elif groupId == 4 %} - light.light_avatar_small_1 + light.light_lohas_2 {% endif %} brightness_pct: 100 @@ -108,7 +108,7 @@ automation: {% elif groupId == 3 %} {% set entityId = 'light.living_room_ambient_main' %} {% elif groupId == 4 %} - {% set entityId = 'light.light_avatar_small_1' %} + {% set entityId = 'light.light_lohas_2' %} {% endif %} {{ entityId }} diff --git a/config/packages/modules/lighting/areas/living_room.yaml b/config/packages/modules/lighting/areas/living_room.yaml index 7c29df3..fbe98ad 100644 --- a/config/packages/modules/lighting/areas/living_room.yaml +++ b/config/packages/modules/lighting/areas/living_room.yaml @@ -2,7 +2,7 @@ scene: - name: Living Room Ambient Neon icon: "mdi:weather-night" entities: - light.light_avatar_small_1: + light.light_lohas_2: state: "on" xy_color: [0.668, 0.284] brightness_pct: 80 @@ -13,9 +13,9 @@ scene: - name: Living Room Ambient Default icon: "mdi:weather-sunny" entities: - light.light_avatar_small_1: + light.light_lohas_2: state: "on" - white_value: 255 + color_temp: 500 brightness_pct: 100 light.living_room_ambient_main: state: "on" diff --git a/config/packages/modules/lighting/color_mode.yaml b/config/packages/modules/lighting/color_mode.yaml index 1493440..19da92a 100644 --- a/config/packages/modules/lighting/color_mode.yaml +++ b/config/packages/modules/lighting/color_mode.yaml @@ -65,7 +65,7 @@ automation: - service: light.turn_on entity_id: - light.bed_led - - light.light_avatar_small_1 # living room ambient Secondary + - light.light_lohas_2 # living room ambient Secondary - light.hue_1 # Hallway - light.neo_1 # Kitchen - light.neo_2 # Kitchen diff --git a/config/packages/modules/lighting/setup/groups.yaml b/config/packages/modules/lighting/setup/groups.yaml index b108c29..70c06f7 100644 --- a/config/packages/modules/lighting/setup/groups.yaml +++ b/config/packages/modules/lighting/setup/groups.yaml @@ -83,7 +83,7 @@ light: name: Living room ambient entities: - light.living_room_ambient_main - - light.light_avatar_small_1 + - light.light_lohas_2 - platform: group name: Living room @@ -263,7 +263,7 @@ homeassistant: light.living_room_ambient: icon: mdi:floor-lamp-dual - light.light_avatar_small_1: + light.light_lohas_2: friendly_name: Living room ambient secondary # Master bedroom @@ -293,3 +293,7 @@ homeassistant: light.hallway_main: icon: bha:ceiling-spot-lamp + + # Guest Bedroom + light.light_lohas_6: + icon: bha:table-lamp-variant diff --git a/config/packages/modules/lighting/setup/mqtt.yaml b/config/packages/modules/lighting/setup/mqtt.yaml index 5da05dc..72467e7 100644 --- a/config/packages/modules/lighting/setup/mqtt.yaml +++ b/config/packages/modules/lighting/setup/mqtt.yaml @@ -1,28 +1,28 @@ light: - - platform: mqtt - name: "light_hama_1" - state_topic: "stat/light_hama_1/RESULT" - state_value_template: "{{ value_json.POWER }}" - command_topic: "cmnd/light_hama_1/POWER" - payload_on: "ON" - payload_off: "OFF" - availability_topic: "tele/light_hama_1/LWT" - payload_available: "Online" - payload_not_available: "Offline" - on_command_type: "brightness" - brightness_command_topic: "cmnd/light_hama_1/Dimmer" - brightness_state_topic: "tele/light_hama_1/STATE" - brightness_scale: 100 - brightness_value_template: "{{ value_json.Dimmer }}" - color_temp_command_topic: "cmnd/light_hama_1/CT" - color_temp_state_topic: "tele/light_hama_1/STATE" - color_temp_value_template: "{{ value_json.CT }}" - rgb_command_topic: "cmnd/light_hama_1/Color" - rgb_state_topic: "tele/light_hama_1/STATE" - rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - rgb_value_template: "{{ (value_json.Color[0]|int(base=16),value_json.Color[1]|int(base=16),value_json.Color[2]|int(base=16)) | join(',')}}" - qos: 1 - retain: false + # - platform: mqtt + # name: "light_hama_1" + # state_topic: "stat/light_hama_1/RESULT" + # state_value_template: "{{ value_json.POWER }}" + # command_topic: "cmnd/light_hama_1/POWER" + # payload_on: "ON" + # payload_off: "OFF" + # availability_topic: "tele/light_hama_1/LWT" + # payload_available: "Online" + # payload_not_available: "Offline" + # on_command_type: "brightness" + # brightness_command_topic: "cmnd/light_hama_1/Dimmer" + # brightness_state_topic: "tele/light_hama_1/STATE" + # brightness_scale: 100 + # brightness_value_template: "{{ value_json.Dimmer }}" + # color_temp_command_topic: "cmnd/light_hama_1/CT" + # color_temp_state_topic: "tele/light_hama_1/STATE" + # color_temp_value_template: "{{ value_json.CT }}" + # rgb_command_topic: "cmnd/light_hama_1/Color" + # rgb_state_topic: "tele/light_hama_1/STATE" + # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" + # rgb_value_template: "{{ (value_json.Color[0]|int(base=16),value_json.Color[1]|int(base=16),value_json.Color[2]|int(base=16)) | join(',')}}" + # qos: 1 + # retain: false - platform: mqtt name: "light_le_1" @@ -129,68 +129,68 @@ light: color_temp_command_topic: "cmnd/light_lohas_2/CT" color_temp_state_topic: "tele/light_lohas_2/STATE" color_temp_value_template: "{{ value_json.CT }}" - rgb_command_topic: "cmnd/light_lohas_2/Color" - rgb_state_topic: "tele/light_lohas_2/STATE" - rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" + # rgb_command_topic: "cmnd/light_lohas_2/Color" + # rgb_state_topic: "tele/light_lohas_2/STATE" + # rgb_command_template: "{{ '%02X%02X%02X' | format(red, green, blue) }}" + # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" qos: 1 retain: false - - platform: mqtt - name: "light_lohas_3" - state_topic: "tele/light_lohas_3/STATE" - state_value_template: "{{ value_json.POWER }}" - command_topic: "cmnd/light_lohas_3/POWER" - payload_on: "ON" - payload_off: "OFF" - availability_topic: "tele/light_lohas_3/LWT" - payload_available: "Online" - payload_not_available: "Offline" - on_command_type: "brightness" - brightness_command_topic: "cmnd/light_lohas_3/Dimmer" - brightness_state_topic: "tele/light_lohas_3/STATE" - brightness_scale: 100 - brightness_value_template: "{{ value_json.Dimmer }}" - hs_command_topic: "cmnd/light_lohas_3/HSBColor" - hs_state_topic: "tele/light_lohas_3/STATE" - hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" - color_temp_command_topic: "cmnd/light_lohas_3/CT" - color_temp_state_topic: "tele/light_lohas_3/STATE" - color_temp_value_template: "{{ value_json.CT }}" - rgb_command_topic: "cmnd/light_lohas_3/Color" - rgb_state_topic: "tele/light_lohas_3/STATE" - rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" - qos: 1 - retain: false + # - platform: mqtt + # name: "light_lohas_3" + # state_topic: "tele/light_lohas_3/STATE" + # state_value_template: "{{ value_json.POWER }}" + # command_topic: "cmnd/light_lohas_3/POWER" + # payload_on: "ON" + # payload_off: "OFF" + # availability_topic: "tele/light_lohas_3/LWT" + # payload_available: "Online" + # payload_not_available: "Offline" + # on_command_type: "brightness" + # brightness_command_topic: "cmnd/light_lohas_3/Dimmer" + # brightness_state_topic: "tele/light_lohas_3/STATE" + # brightness_scale: 100 + # brightness_value_template: "{{ value_json.Dimmer }}" + # hs_command_topic: "cmnd/light_lohas_3/HSBColor" + # hs_state_topic: "tele/light_lohas_3/STATE" + # hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" + # color_temp_command_topic: "cmnd/light_lohas_3/CT" + # color_temp_state_topic: "tele/light_lohas_3/STATE" + # color_temp_value_template: "{{ value_json.CT }}" + # rgb_command_topic: "cmnd/light_lohas_3/Color" + # rgb_state_topic: "tele/light_lohas_3/STATE" + # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" + # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" + # qos: 1 + # retain: false - - platform: mqtt - name: "light_lohas_4" - state_topic: "tele/light_lohas_4/STATE" - state_value_template: "{{ value_json.POWER }}" - command_topic: "cmnd/light_lohas_4/POWER" - payload_on: "ON" - payload_off: "OFF" - availability_topic: "tele/light_lohas_4/LWT" - payload_available: "Online" - payload_not_available: "Offline" - on_command_type: "brightness" - brightness_command_topic: "cmnd/light_lohas_4/Dimmer" - brightness_state_topic: "tele/light_lohas_4/STATE" - brightness_scale: 100 - brightness_value_template: "{{ value_json.Dimmer }}" - hs_command_topic: "cmnd/light_lohas_4/HSBColor" - hs_state_topic: "tele/light_lohas_4/STATE" - hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" - color_temp_command_topic: "cmnd/light_lohas_4/CT" - color_temp_state_topic: "tele/light_lohas_4/STATE" - color_temp_value_template: "{{ value_json.CT }}" - rgb_command_topic: "cmnd/light_lohas_4/Color" - rgb_state_topic: "tele/light_lohas_4/STATE" - rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" - qos: 1 - retain: false + # - platform: mqtt + # name: "light_lohas_4" + # state_topic: "tele/light_lohas_4/STATE" + # state_value_template: "{{ value_json.POWER }}" + # command_topic: "cmnd/light_lohas_4/POWER" + # payload_on: "ON" + # payload_off: "OFF" + # availability_topic: "tele/light_lohas_4/LWT" + # payload_available: "Online" + # payload_not_available: "Offline" + # on_command_type: "brightness" + # brightness_command_topic: "cmnd/light_lohas_4/Dimmer" + # brightness_state_topic: "tele/light_lohas_4/STATE" + # brightness_scale: 100 + # brightness_value_template: "{{ value_json.Dimmer }}" + # hs_command_topic: "cmnd/light_lohas_4/HSBColor" + # hs_state_topic: "tele/light_lohas_4/STATE" + # hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}" + # color_temp_command_topic: "cmnd/light_lohas_4/CT" + # color_temp_state_topic: "tele/light_lohas_4/STATE" + # color_temp_value_template: "{{ value_json.CT }}" + # rgb_command_topic: "cmnd/light_lohas_4/Color" + # rgb_state_topic: "tele/light_lohas_4/STATE" + # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" + # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" + # qos: 1 + # retain: false # - platform: mqtt # name: "light_lohas_5" @@ -240,35 +240,10 @@ light: color_temp_command_topic: "cmnd/light_lohas_6/CT" color_temp_state_topic: "tele/light_lohas_6/STATE" color_temp_value_template: "{{ value_json.CT }}" - rgb_command_topic: "cmnd/light_lohas_6/Color" - rgb_state_topic: "tele/light_lohas_6/STATE" - rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" - rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" - qos: 1 - retain: false - - - platform: mqtt - name: "light_avatar_small_1" - availability_topic: "tele/light_avatar_small_1/LWT" - command_topic: "cmnd/light_avatar_small_1/POWER" - state_topic: "tele/light_avatar_small_1/STATE" - state_value_template: "{{ value_json.POWER }}" - brightness_command_topic: "cmnd/light_avatar_small_1/Dimmer" - brightness_state_topic: "tele/light_avatar_small_1/STATE" - brightness_scale: 100 - brightness_value_template: "{{ value_json.Dimmer }}" - on_command_type: "brightness" - white_value_command_topic: "cmnd/light_avatar_small_1/WHITE" - white_value_scale: 100 - white_value_state_topic: "tele/light_avatar_small_1/STATE" - white_value_template: "{{ value_json.White }}" - rgb_command_topic: "cmnd/light_avatar_small_1/Color" - rgb_state_topic: "tele/light_avatar_small_1/STATE" - rgb_value_template: "{{ value_json.Color.split(',')[0:3]|join(',') }}" - payload_on: "ON" - payload_off: "OFF" - payload_available: "Online" - payload_not_available: "Offline" + # rgb_command_topic: "cmnd/light_lohas_6/Color" + # rgb_state_topic: "tele/light_lohas_6/STATE" + # rgb_command_template: "{{ '%02X%02X%02X=' | format(red, green, blue)}}" + # rgb_value_template: "{{ (value_json.Color[0:2]|int(base=16),value_json.Color[2:4]|int(base=16),value_json.Color[4:6]|int(base=16)) | join(',')}}" qos: 1 retain: false @@ -287,15 +262,15 @@ light: min_mireds: 150 sensor: - - platform: mqtt - name: "light_hama_1_wifi" - availability_topic: "tele/light_hama_1/LWT" - device_class: signal_strength - payload_available: "Online" - payload_not_available: "Offline" - state_topic: "tele/light_hama_1/STATE" - unit_of_measurement: "%" - value_template: "{{ value_json.Wifi.RSSI }}" + # - platform: mqtt + # name: "light_hama_1_wifi" + # availability_topic: "tele/light_hama_1/LWT" + # device_class: signal_strength + # payload_available: "Online" + # payload_not_available: "Offline" + # state_topic: "tele/light_hama_1/STATE" + # unit_of_measurement: "%" + # value_template: "{{ value_json.Wifi.RSSI }}" - platform: mqtt name: "light_le_1_wifi" @@ -347,25 +322,25 @@ sensor: unit_of_measurement: "%" value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt - name: "light_lohas_3_wifi" - availability_topic: "tele/light_lohas_3/LWT" - device_class: signal_strength - payload_available: "Online" - payload_not_available: "Offline" - state_topic: "tele/light_lohas_3/STATE" - unit_of_measurement: "%" - value_template: "{{ value_json.Wifi.RSSI }}" + # - platform: mqtt + # name: "light_lohas_3_wifi" + # availability_topic: "tele/light_lohas_3/LWT" + # device_class: signal_strength + # payload_available: "Online" + # payload_not_available: "Offline" + # state_topic: "tele/light_lohas_3/STATE" + # unit_of_measurement: "%" + # value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt - name: "light_lohas_4_wifi" - availability_topic: "tele/light_lohas_4/LWT" - device_class: signal_strength - payload_available: "Online" - payload_not_available: "Offline" - state_topic: "tele/light_lohas_4/STATE" - unit_of_measurement: "%" - value_template: "{{ value_json.Wifi.RSSI }}" + # - platform: mqtt + # name: "light_lohas_4_wifi" + # availability_topic: "tele/light_lohas_4/LWT" + # device_class: signal_strength + # payload_available: "Online" + # payload_not_available: "Offline" + # state_topic: "tele/light_lohas_4/STATE" + # unit_of_measurement: "%" + # value_template: "{{ value_json.Wifi.RSSI }}" - platform: mqtt name: "light_lohas_6_wifi" @@ -377,16 +352,6 @@ sensor: unit_of_measurement: "%" value_template: "{{ value_json.Wifi.RSSI }}" - - platform: mqtt - name: "light_avatar_small_1_wifi" - availability_topic: "tele/light_avatar_small_1/LWT" - device_class: signal_strength - payload_available: "Online" - payload_not_available: "Offline" - state_topic: "tele/light_avatar_small_1/STATE" - unit_of_measurement: "%" - value_template: "{{ value_json.Wifi.RSSI }}" - - platform: "mqtt" name: "ledvance_1_lqi" state_topic: "z2m_deconz/ledvance_1" @@ -398,16 +363,16 @@ sensor: ## Switch switch: - - platform: mqtt - name: "light_hama_1_fade" - availability_topic: "tele/light_hama_1/LWT" - command_topic: "cmnd/light_hama_1/FADE" - icon: mdi:gradient - payload_available: "Online" - payload_not_available: "Offline" - qos: 1 - state_topic: "stat/light_hama_1/RESULT" - value_template: "{{ value_json.Fade }}" + # - platform: mqtt + # name: "light_hama_1_fade" + # availability_topic: "tele/light_hama_1/LWT" + # command_topic: "cmnd/light_hama_1/FADE" + # icon: mdi:gradient + # payload_available: "Online" + # payload_not_available: "Offline" + # qos: 1 + # state_topic: "stat/light_hama_1/RESULT" + # value_template: "{{ value_json.Fade }}" - platform: mqtt name: "light_le_1_fade" @@ -475,16 +440,16 @@ switch: state_topic: "stat/light_lohas_3/RESULT" value_template: "{{ value_json.Fade }}" - - platform: mqtt - name: "light_lohas_4_fade" - availability_topic: "tele/light_lohas_4/LWT" - command_topic: "cmnd/light_lohas_4/FADE" - icon: mdi:gradient - payload_available: "Online" - payload_not_available: "Offline" - qos: 1 - state_topic: "stat/light_lohas_4/RESULT" - value_template: "{{ value_json.Fade }}" + # - platform: mqtt + # name: "light_lohas_4_fade" + # availability_topic: "tele/light_lohas_4/LWT" + # command_topic: "cmnd/light_lohas_4/FADE" + # icon: mdi:gradient + # payload_available: "Online" + # payload_not_available: "Offline" + # qos: 1 + # state_topic: "stat/light_lohas_4/RESULT" + # value_template: "{{ value_json.Fade }}" - platform: mqtt name: "light_lohas_6_fade" @@ -497,17 +462,6 @@ switch: state_topic: "stat/light_lohas_6/RESULT" value_template: "{{ value_json.Fade }}" - - platform: mqtt - name: "light_avatar_small_1_fade" - availability_topic: "tele/light_avatar_small_1/LWT" - command_topic: "cmnd/light_avatar_small_1/FADE" - icon: mdi:gradient - payload_available: "Online" - payload_not_available: "Offline" - qos: 1 - state_topic: "stat/light_avatar_small_1/RESULT" - value_template: "{{ value_json.Fade }}" - automation: - alias: Lighting ยท Sync Tasmota states on start-up initial_state: true diff --git a/config/packages/modules/media/plex.yaml b/config/packages/modules/media/plex.yaml index ca5838a..3bb5f1d 100644 --- a/config/packages/modules/media/plex.yaml +++ b/config/packages/modules/media/plex.yaml @@ -25,7 +25,7 @@ automation: - light.living_room_main - light.pc - light.living_room_ambient_main - - light.light_avatar_small_1 + - light.light_lohas_2 - light.hallway_entrance - light.hallway_main - light.master_bedroom_main @@ -40,7 +40,7 @@ automation: entity_id: - light.pc - light.living_room_ambient_main - - light.light_avatar_small_1 + - light.light_lohas_2 - light.hallway_main - service: light.turn_off entity_id: