Moar lights

config/lovelace/advanced_dashboard/02_lights.yaml

@@ -138,9 +138,9 @@ cards:
                 - type: custom:decluttering-card
                   template: light_with_fade_and_switch
                   variables:
-                    - light: light.light_lohas_4
+                    - light: light.light_lohas_6
-                    - fade: switch.light_lohas_4_fade
+                    - fade: switch.light_lohas_6_fade
-                    - wifi: sensor.light_lohas_4_wifi
+                    - wifi: sensor.light_lohas_6_wifi
             - light.bedside
             - light.bed_led
 
@@ -156,7 +156,7 @@ cards:
               entity: light.kitchen_main
               name: Main lights
               entities:
-                - light.osram_2
+                - light.ledvance_1 # light.osram_2
                 - light.osram_3
                 - light.neo_1
             - type: divider
@@ -165,7 +165,7 @@ cards:
               entity: light.kitchen_secondary
               name: Secondary lights
               entities:
-                - light.osram_6
+                - light.hue_1 # light.osram_6
                 - light.osram_7
                 - light.osram_8
                 - light.osram_9
@@ -186,26 +186,24 @@ cards:
                   name: Brightness
                   hide_state: true
                   step: 5
-                - type: custom:slider-entity-row
-                  entity: light.hallway_entrance
-                  name: Temperature
-                  attribute: color_temp
-                  hide_state: true
-                  min: 153
-                  max: 500
-                  step: 5
-                - light.osram_5
                 - type: custom:decluttering-card
-                  template: light_with_fade_and_switch
+                  template: light_with_update_and_lqi
                   variables:
-                    - light: light.light_lohas_6
+                    - light: light.hue_white_1
-                    - fade: switch.light_lohas_6_fade
+                    - lqi: sensor.hue_white_1_lqi
-                    - wifi: sensor.light_lohas_6_wifi
+                    - update: binary_sensor.hue_white_1_update_available
+                - type: custom:decluttering-card
+                  template: light_with_update_and_lqi
+                  variables:
+                    - light: light.hue_white_2
+                    - lqi: sensor.hue_white_2_lqi
+                    - update: binary_sensor.hue_white_2_update_available
+
             - type: divider
             - light.hallway_main
             - type: custom:fold-entity-row
               entity: light.hallway_main
               name: Main lights
               entities:
-                - light.osram_1
                 - light.osram_4
+                - light.osram_1

config/lovelace/decluttering_templates/lights.yaml

@@ -12,3 +12,17 @@ light_with_fade_and_switch:
       - entity: "[[light]]"
         name: Switch
         toggle: true
+
+light_with_update_and_lqi:
+  card:
+    type: custom:multiple-entity-row
+    entity: "[[light]]"
+    show_state: false
+    entities:
+      - entity: "[[update]]"
+        name: Update
+      - entity: "[[lqi]]"
+        name: LQI
+      - entity: "[[light]]"
+        name: Switch
+        toggle: true

config/packages/modules/lighting/areas/hallway.yaml

@@ -25,12 +25,12 @@ automation:
         # Night Mode
         default:
           - service: light.turn_on
-            entity_id: light.light_lohas_6
+            entity_id: light.osram_4
             data:
               brightness_pct: 30
           - service: light.turn_on
             entity_id:
-              - light.osram_1
+              - light.hue_white_1
               - light.browser_hallway
             data:
               brightness_pct: 1
@@ -58,8 +58,8 @@ automation:
         default:
           - service: light.turn_off
             entity_id:
-              - light.osram_1
+              - light.hue_white_1
-              - light.light_lohas_6
+              - light.osram_4
           - service: light.turn_on
             entity_id: light.browser_hallway
             data:

config/packages/modules/lighting/areas/kitchen.yaml

@@ -36,7 +36,8 @@ automation:
         default:
           - service: light.turn_on
             entity_id:
-              - light.osram_2
+              - light.ledvance_1
+              - light.hue_1
               - light.browser_kitchen
             data:
               brightness_pct: 1
@@ -65,11 +66,15 @@ automation:
         # Night Mode
         default:
           - service: light.turn_on
-            entity_id: light.osram_2
+            entity_id:
+              - light.ledvance_1
+              - light.hue_1
             data:
               brightness_pct: 100
           - service: light.turn_off
-            entity_id: light.osram_2
+            entity_id:
+              - light.ledvance_1
+              - light.hue_1
           - service: light.turn_on
             entity_id: light.browser_kitchen
             data:

config/packages/modules/lighting/setup/groups.yaml

@@ -31,7 +31,7 @@ light:
       - light.light_lohas_1
       - light.light_lohas_2
       - light.light_lohas_3
-      - light.light_lohas_4
+      - light.light_lohas_6
 
   - platform: group
     name: Master bedroom
@@ -43,14 +43,14 @@ light:
   - platform: group
     name: Kitchen main
     entities:
-      - light.osram_2
+      - light.ledvance_1 # osram_2
       - light.osram_3
       - light.neo_1
 
   - platform: group
     name: Kitchen secondary
     entities:
-      - light.osram_6
+      - light.hue_1 # osram_6
       - light.osram_7
       - light.osram_8
       - light.osram_9
@@ -70,8 +70,8 @@ light:
   - platform: group
     name: Hallway entrance
     entities:
-      - light.osram_5
+      - light.hue_white_1
-      - light.light_lohas_6
+      - light.hue_white_2
 
   - platform: group
     name: Hallway main
@@ -122,14 +122,6 @@ homeassistant:
 
     light.living_room_main:
       icon: bha:ceiling-lamp-plafond
-    light.light_le_1:
-      friendly_name: Living room 1
-    light.light_le_2:
-      friendly_name: Living room 2
-    light.light_le_3:
-      friendly_name: Living room 3
-    light.light_le_4:
-      friendly_name: Living room 4
 
     light.pc:
       friendly_name: PC
@@ -149,21 +141,10 @@ homeassistant:
       friendly_name: Bedroom main
       icon: bha:ceiling-lamp-plafond
 
-    light.light_lohas_1:
-      friendly_name: Bedroom 1
-    light.light_lohas_2:
-      friendly_name: Bedroom 2
-    light.light_lohas_3:
-      friendly_name: Bedroom 3
-    light.light_lohas_4:
-      friendly_name: Bedroom 4
-
     light.bedside:
       icon: mdi:desk-lamp
 
     # Kitchen
-    # light.tuya_kitchen:
-    #   icon: mdi:lightbulb-group
     light.kitchen_main:
       icon: bha:ceiling-lamp-plafond
     light.kitchen_secondary:
@@ -175,17 +156,6 @@ homeassistant:
 
     light.hallway_entrance:
       icon: bha:ceiling-lamp-plafond
-    # light.light_lohas_5:
-    #   friendly_name: Entrance 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.osram_1:
-      friendly_name: Hallway 1
-    light.osram_4:
-      friendly_name: Hallway 2

config/packages/modules/lighting/setup/hue.yaml

@@ -0,0 +1,112 @@
+light:
+  - platform: "mqtt"
+    name: "hue_white_1"
+    state_topic: "z2m_deconz/hue_white_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    brightness: true
+    color_temp: false
+    xy: false
+    hs: false
+    schema: "json"
+    command_topic: "z2m_deconz/hue_white_1/set"
+    brightness_scale: 254
+  - platform: "mqtt"
+    name: "hue_white_2"
+    state_topic: "z2m_deconz/hue_white_2"
+    availability_topic: "z2m_deconz/bridge/state"
+    brightness: true
+    color_temp: false
+    xy: false
+    hs: false
+    schema: "json"
+    command_topic: "z2m_deconz/hue_white_2/set"
+    brightness_scale: 254
+
+  - platform: "mqtt"
+    name: "hue_1"
+    state_topic: "z2m_deconz/hue_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    brightness: true
+    color_temp: true
+    xy: true
+    hs: false
+    schema: "json"
+    command_topic: "z2m_deconz/hue_1/set"
+    brightness_scale: 254
+    max_mireds: 500
+    min_mireds: 150
+    effect: true
+    effect_list:
+      - "blink"
+      - "breathe"
+      - "okay"
+      - "channel_change"
+      - "finish_effect"
+      - "stop_effect"
+
+sensor:
+  - platform: "mqtt"
+    name: "hue_white_1_lqi"
+    state_topic: "z2m_deconz/hue_white_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    value_template: "{{ value_json.linkquality }}"
+    unit_of_measurement: "lqi"
+    icon: "mdi:signal"
+  - platform: "mqtt"
+    name: "hue_white_1_update_state"
+    state_topic: "z2m_deconz/hue_white_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    icon: "mdi:update"
+    value_template: "{{ value_json['update']['state'] }}"
+
+  - platform: "mqtt"
+    name: "hue_white_2_lqi"
+    state_topic: "z2m_deconz/hue_white_2"
+    availability_topic: "z2m_deconz/bridge/state"
+    value_template: "{{ value_json.linkquality }}"
+    unit_of_measurement: "lqi"
+    icon: "mdi:signal"
+  - platform: "mqtt"
+    name: "hue_white_2_update_state"
+    state_topic: "z2m_deconz/hue_white_2"
+    availability_topic: "z2m_deconz/bridge/state"
+    icon: "mdi:update"
+    value_template: "{{ value_json['update']['state'] }}"
+
+  - platform: "mqtt"
+    name: "hue_1_lqi"
+    state_topic: "z2m_deconz/hue_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    value_template: "{{ value_json.linkquality }}"
+    unit_of_measurement: "lqi"
+    icon: "mdi:signal"
+  - platform: "mqtt"
+    name: "hue_1_update_state"
+    state_topic: "z2m_deconz/hue_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    icon: "mdi:update"
+    value_template: "{{ value_json['update']['state'] }}"
+
+
+binary_sensor:
+  - platform: "mqtt"
+    name: "hue_white_1_update_available"
+    state_topic: "z2m_deconz/hue_white_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    payload_on: true
+    payload_off: false
+    value_template: "{{ value_json.update_available}}"
+  - platform: "mqtt"
+    name: "hue_white_2_update_available"
+    state_topic: "z2m_deconz/hue_white_2"
+    availability_topic: "z2m_deconz/bridge/state"
+    payload_on: true
+    payload_off: false
+    value_template: "{{ value_json.update_available}}"
+  - platform: "mqtt"
+    name: "hue_1_update_available"
+    state_topic: "z2m_deconz/hue_1"
+    availability_topic: "z2m_deconz/bridge/state"
+    payload_on: true
+    payload_off: false
+    value_template: "{{ value_json.update_available}}"

config/packages/modules/lighting/setup/mqtt.yaml

@@ -306,22 +306,13 @@ light:
     availability_topic: "z2m_deconz/bridge/state"
     brightness: true
     color_temp: true
-    xy: true
+    xy: false
     hs: false
     schema: "json"
     command_topic: "z2m_deconz/ledvance_1/set"
     brightness_scale: 254
     max_mireds: 500
     min_mireds: 150
-    effect: true
-    effect_list:
-      - "blink"
-      - "breathe"
-      - "okay"
-      - "channel_change"
-      - "finish_effect"
-      - "stop_effect"
-
 
 sensor:
   - platform: mqtt
@@ -578,7 +569,7 @@ automation:
           topic: "cmnd/tasmotas/STATE"
           payload: ""
 
-  - alias: Lighting · Sync Osram states on start-up
+  - alias: Lighting · Sync Zigbee states on start-up
     initial_state: true
     trigger:
       platform: homeassistant
@@ -600,3 +591,39 @@ automation:
         data:
           topic: "z2m_deconz/osram_4/get"
           payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/osram_5/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/osram_6/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/osram_7/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/osram_8/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/osram_9/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/hue_white_1/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/hue_white_2/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/hue_1/get"
+          payload: ""
+      - service: mqtt.publish
+        data:
+          topic: "z2m_deconz/ledvance_1/get"
+          payload: ""

config/packages/modules/lighting/temperature.yaml

@@ -8,21 +8,11 @@ automation:
         - light.light_lohas_1
         - light.light_lohas_2
         - light.light_lohas_3
-        - light.light_lohas_4
+        - light.light_lohas_6
         - light.light_le_1
         - light.light_le_2
         - light.light_le_3
         - light.light_le_4
-        - light.osram_1
-        - light.osram_4
-        - light.osram_5
-        - light.light_lohas_6
-        - light.osram_2
-        - light.osram_3
-        - light.osram_6
-        - light.osram_7
-        - light.osram_8
-        - light.osram_9
       to: "on"
     action:
       - service: light.turn_on