More lights!

config/home-lovelace.yaml

@@ -73,7 +73,7 @@ views:
                           name: Hallway
                         - type: custom:button-card
                           template: small
-                          entity: light.tuya_hallway_entrance_lights
+                          entity: light.hallway_entrance_lights
                           name: Entrance
 
                 - type: vertical-stack

config/lovelace/floorplan-dashboard/picture_elements/light_overlays.yaml

@@ -194,7 +194,7 @@
   conditions:
     - entity: binary_sensor.floorplan_night_mode
       state: "on"
-    - entity: light.tuya_hallway_entrance_lights
+    - entity: light.hallway_entrance_lights
       state: "on"
     - entity: light.tuya_hallway_main_lights
       state: "off"
@@ -212,7 +212,7 @@
   conditions:
     - entity: binary_sensor.floorplan_night_mode
       state: "on"
-    - entity: light.tuya_hallway_entrance_lights
+    - entity: light.hallway_entrance_lights
       state: "off"
     - entity: light.tuya_hallway_main_lights
       state: "on"
@@ -230,7 +230,7 @@
   conditions:
     - entity: binary_sensor.floorplan_night_mode
       state: "on"
-    - entity: light.tuya_hallway_entrance_lights
+    - entity: light.hallway_entrance_lights
       state: "on"
     - entity: light.tuya_hallway_main_lights
       state: "on"

config/lovelace/floorplan-dashboard/picture_elements/light_switches.yaml

@@ -50,7 +50,7 @@
 - type: custom:decluttering-card
   template: floorplan_state_icon
   variables:
-    - entity: light.tuya_hallway_entrance_lights
+    - entity: light.hallway_entrance_lights
     - top: 25%
     - left: 50.2%
 

config/lovelace/home_dashboard/03_kitchen.yaml

@@ -24,12 +24,24 @@ cards:
           cards:
             - type: entities
               title: Lights
+              entities: []
+            - type: horizontal-stack
+              cards:
+                - type: custom:button-card
+                  template: small
+                  entity: light.tuya_kitchen_all_lights
+                  name: All lights
+                - type: custom:button-card
+                  template: small
+                  entity: light.tuya_kitchen_main_lights
+                  name: Main
+                - type: custom:button-card
+                  template: small
+                  entity: light.tuya_kitchen_secondary_lights
+                  name: Secondary
+            - type: entities
               show_header_toggle: false
               entities:
-                - light.tuya_kitchen_all_lights
-                - light.tuya_kitchen_main_lights
-                - light.tuya_kitchen_secondary_lights
-                - type: divider
                 - type: custom:fold-entity-row
                   entity: light.kitchen_main_lights
                   name: Main lights
@@ -37,6 +49,14 @@ cards:
                     - light.light_le_11
                     - light.light_le_12
                     - light.light_orbecco_1
+                - type: custom:fold-entity-row
+                  entity: light.kitchen_secondary_lights
+                  name: Secondary lights
+                  entities:
+                    - light.light_le_5
+                    - light.light_le_6
+                    - light.light_le_9
+                    - light.light_le_10
 
             - type: custom:decluttering-card
               template: sonos_media_player

config/lovelace/home_dashboard/05_hallway.yaml

@@ -18,26 +18,65 @@ cards:
       type: custom:layout-card
       layout: horizontal
       cards:
-        - type: entities
-          title: Lights
-          show_header_toggle: false
-          entities:
-            - light.tuya_hallway_all_lights
-            - light.tuya_hallway_entrance_lights
-            - light.tuya_hallway_main_lights
-            - type: divider
-            - type: custom:fold-entity-row
-              entity: light.hallway_entrance_lights
-              name: Entrance lights
+        - type: vertical-stack
+          cards:
+            - type: entities
+              title: Lights
+              entities: []
+
+            - type: horizontal-stack
+              cards:
+                - type: custom:button-card
+                  template: small
+                  entity: light.hallway_all_lights
+                  name: All lights
+                - type: custom:button-card
+                  template: small
+                  entity: light.hallway_entrance_lights
+                  name: Entrance
+                - type: custom:button-card
+                  template: small
+                  entity: light.tuya_hallway_main_lights
+                  name: Main
+
+            - type: entities
+              show_header_toggle: false
               entities:
-                - light.light_le_5
-                - light.light_le_6
-            - type: custom:fold-entity-row
-              entity: light.hallway_main_lights
-              name: Main lights
-              entities:
-                - light.light_le_7
-                - light.light_le_8
+                - type: custom:fold-entity-row
+                  entity: light.hallway_entrance_lights
+                  name: Entrance lights
+                  entities:
+                    - type: custom:slider-entity-row
+                      entity: light.hallway_entrance_lights
+                      name: Brightness
+                      hide_state: true
+                      step: 5
+                    - type: custom:slider-entity-row
+                      entity: light.hallway_entrance_lights
+                      name: Temperature
+                      attribute: color_temp
+                      hide_state: true
+                      min: 153
+                      max: 500
+                      step: 5
+                    - type: custom:decluttering-card
+                      template: light_with_fade_and_switch
+                      variables:
+                        - light: light.light_lohas_5
+                        - fade: switch.light_lohas_5_fade
+                        - wifi: sensor.light_lohas_5_wifi
+                    - type: custom:decluttering-card
+                      template: light_with_fade_and_switch
+                      variables:
+                        - light: light.light_lohas_6
+                        - fade: switch.light_lohas_6_fade
+                        - wifi: sensor.light_lohas_6_wifi
+                - type: custom:fold-entity-row
+                  entity: light.hallway_main_lights
+                  name: Main lights
+                  entities:
+                    - light.light_le_7
+                    - light.light_le_8
 
         - type: vertical-stack
           cards:

config/lovelace/home_dashboard/06_lights.yaml

@@ -24,11 +24,13 @@ cards:
           show_header_toggle: false
           entities:
             - light.living_room_all_lights
+            - type: divider
             - light.living_room_main_lights
             - light.light_lohas_1
             - light.light_lohas_2
             - light.light_lohas_3
             - light.light_lohas_4
+            - type: divider
             - light.pc
 
         - type: entities
@@ -37,11 +39,13 @@ cards:
           show_header_toggle: false
           entities:
             - light.master_bedroom_all_lights
+            - type: divider
             - light.master_bedroom_main_lights
             - light.light_le_1
             - light.light_le_2
             - light.light_le_3
             - light.light_le_4
+            - type: divider
             - light.bedside_light
 
         - type: entities
@@ -50,14 +54,17 @@ cards:
           show_header_toggle: false
           entities:
             - light.tuya_kitchen_all_lights
-            - light.tuya_kitchen_main_lights
-            - light.tuya_kitchen_secondary_lights
             - type: divider
+            - light.tuya_kitchen_main_lights
             - light.kitchen_main_lights
             - light.light_le_11
             - light.light_le_12
             - light.light_orbecco_1
+            - type: divider
+            - light.tuya_kitchen_secondary_lights
             - light.kitchen_secondary_lights
+            - light.light_le_5
+            - light.light_le_6
             - light.light_le_9
             - light.light_le_10
 
@@ -66,14 +73,13 @@ cards:
           icon: mdi:door-closed
           show_header_toggle: false
           entities:
-            - light.tuya_hallway_all_lights
-            - light.tuya_hallway_main_lights
-            - light.tuya_hallway_entrance_lights
-            - type: divider
             - light.hallway_all_lights
-            - light.hallway_main_lights
+            - type: divider
             - light.hallway_entrance_lights
-            - light.light_le_5
-            - light.light_le_6
+            - light.light_lohas_5
+            - light.light_lohas_6
+            - type: divider
+            - light.tuya_hallway_main_lights
+            - light.hallway_main_lights
             - light.light_le_7
             - light.light_le_8

config/packages/modules/alexa.yaml

@@ -8,8 +8,8 @@ alexa:
         - light.master_bedroom_main_lights
         - light.bedside_light
         - light.tuya_kitchen_all_lights
-        - light.tuya_hallway_entrance_lights
-        - light.tuya_hallway_all_lights
+        - light.hallway_entrance_lights
+        - light.hallway_all_lights
         - light.tuya_hallway_main_lights
 
         - switch.camera
@@ -51,10 +51,10 @@ alexa:
         name: "Bedroom"
       light.tuya_kitchen_all_lights:
         name: "Kitchen"
-      light.tuya_hallway_entrance_lights:
-        name: "Entrance"
-      light.tuya_hallway_all_lights:
+      light.hallway_all_lights:
         name: "Hallway"
+      light.hallway_entrance_lights:
+        name: "Entrance"
       light.tuya_hallway_main_lights:
         name: "Hallway main"
       media_player.master_bedroom:

config/packages/modules/lighting/groups.yaml

@@ -38,6 +38,8 @@ light:
   - platform: group
     name: Kitchen secondary lights
     entities:
+      - light.light_le_5
+      - light.light_le_6
       - light.light_le_9
       - light.light_le_10
 
@@ -50,8 +52,8 @@ light:
   - platform: group
     name: Hallway entrance lights
     entities:
-      - light.light_le_5
-      - light.light_le_6
+      - light.light_lohas_5
+      - light.light_lohas_6
 
   - platform: group
     name: Hallway main lights
@@ -63,12 +65,6 @@ light:
     name: Hallway all lights
     entities:
       - light.hallway_entrance_lights
-      - light.hallway_main_lights
-
-  - platform: group
-    name: Tuya Hallway all lights
-    entities:
-      - light.tuya_hallway_entrance_lights
       - light.tuya_hallway_main_lights
 
   - platform: group
@@ -77,7 +73,7 @@ light:
       - light.living_room_all_lights
       - light.master_bedroom_main_lights
       - light.tuya_kitchen_all_lights
-      - light.tuya_hallway_all_lights
+      - light.hallway_all_lights
 
   - platform: group
     name: All lights
@@ -85,7 +81,7 @@ light:
       - light.living_room_all_lights
       - light.master_bedroom_all_lights
       - light.tuya_kitchen_all_lights
-      - light.tuya_hallway_all_lights
+      - light.hallway_all_lights
 
 homeassistant:
   customize:
@@ -97,6 +93,8 @@ homeassistant:
       icon: bha:ceiling-lamp-plafond
     light.kitchen_main_lights:
       icon: bha:ceiling-lamp-plafond
+    light.kitchen_secondary_lights:
+      icon: bha:ceiling-lamp-plafond
     light.tuya_kitchen_all_lights:
       icon: bha:ceiling-lamp-plafond
     light.hallway_entrance_lights:
@@ -105,8 +103,6 @@ homeassistant:
       icon: bha:ceiling-lamp-plafond
     light.hallway_all_lights:
       icon: bha:ceiling-lamp-plafond
-    light.tuya_hallway_all_lights:
-      icon: bha:ceiling-lamp-plafond
     light.ceiling_lights:
       icon: mdi:ceiling-light
     light.pc:

config/packages/modules/lighting/mqtt.yaml

@@ -218,6 +218,60 @@ light:
     qos: 1
     retain: false
 
+  - platform: mqtt
+    name: "light_lohas_5"
+    availability_topic: "tele/light_lohas_5/LWT"
+    command_topic: "cmnd/light_lohas_5/POWER"
+    state_topic: "tele/light_lohas_5/STATE"
+    state_value_template: "{{ value_json.POWER }}"
+    brightness_command_topic: "cmnd/light_lohas_5/Dimmer"
+    brightness_state_topic: "tele/light_lohas_5/STATE"
+    brightness_scale: 100
+    on_command_type: "brightness"
+    brightness_value_template: "{{ value_json.Dimmer }}"
+    hs_command_topic: "cmnd/light_lohas_5/HSBColor"
+    hs_state_topic: "tele/light_lohas_5/STATE"
+    hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}"
+    color_temp_command_topic: "cmnd/light_lohas_5/CT"
+    color_temp_state_topic: "tele/light_lohas_5/STATE"
+    color_temp_value_template: "{{ value_json.CT }}"
+    rgb_command_topic: "cmnd/light_lohas_5/Color"
+    rgb_state_topic: "tele/pc_light/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
+
+  - platform: mqtt
+    name: "light_lohas_6"
+    availability_topic: "tele/light_lohas_6/LWT"
+    command_topic: "cmnd/light_lohas_6/POWER"
+    state_topic: "tele/light_lohas_6/STATE"
+    state_value_template: "{{ value_json.POWER }}"
+    brightness_command_topic: "cmnd/light_lohas_6/Dimmer"
+    brightness_state_topic: "tele/light_lohas_6/STATE"
+    brightness_scale: 100
+    on_command_type: "brightness"
+    brightness_value_template: "{{ value_json.Dimmer }}"
+    hs_command_topic: "cmnd/light_lohas_6/HSBColor"
+    hs_state_topic: "tele/light_lohas_6/STATE"
+    hs_value_template: "{{ value_json.HSBColor.split(',')[0:2]|join(',') }}"
+    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/pc_light/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: "PC light WiFi"
@@ -309,6 +363,26 @@ 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"
+    device_class: signal_strength
+    payload_available: "Online"
+    payload_not_available: "Offline"
+    state_topic: "tele/light_lohas_6/STATE"
+    unit_of_measurement: "%"
+    value_template: "{{ value_json.Wifi.RSSI }}"
+
 switch:
   - platform: mqtt
     name: "PC Light Fade"
@@ -409,6 +483,28 @@ 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"
+    command_topic: "cmnd/light_lohas_6/FADE"
+    icon: mdi:gradient
+    payload_available: "Online"
+    payload_not_available: "Offline"
+    qos: 1
+    state_topic: "stat/light_lohas_6/RESULT"
+    value_template: "{{ value_json.Fade }}"
+
 automation:
   - alias: Lighting · Sync Tasmota states on start-up
     initial_state: true

config/packages/modules/lighting/state.yaml

@@ -132,8 +132,7 @@ automation:
     action:
       - service: light.turn_on
         entity_id:
-          - light.light_le_6
-          - light.light_le_8
+          - light.light_lohas_6
         data:
           brightness_pct: 13 # this is the lowest it'll go ¯\_(ツ)_/¯
 
@@ -150,11 +149,9 @@ automation:
     action:
       - service: light.turn_on
         entity_id:
-          - light.light_le_6
-          - light.light_le_8
+          - light.light_lohas_6
         data:
           brightness_pct: 100
       - service: light.turn_off
         entity_id:
-          - light.light_le_6
-          - light.light_le_8
+          - light.light_lohas_6

config/packages/modules/lighting/tuya.yaml

@@ -12,7 +12,6 @@ input_boolean:
   tuya_kitchen_main_lights_state:
   tuya_kitchen_secondary_lights_state:
   tuya_hallway_main_lights_state:
-  tuya_hallway_entrance_lights_state:
 
 light:
   - platform: template
@@ -50,17 +49,6 @@ light:
           service: input_boolean.turn_off
           entity_id: input_boolean.tuya_hallway_main_lights_state
 
-      tuya_hallway_entrance_lights:
-        friendly_name: Entrance lights (scene)
-        value_template: "{{ is_state('input_boolean.tuya_hallway_entrance_lights_state', 'on') }}"
-        icon_template: bha:ceiling-lamp-plafond
-        turn_on:
-          service: input_boolean.turn_on
-          entity_id: input_boolean.tuya_hallway_entrance_lights_state
-        turn_off:
-          service: input_boolean.turn_off
-          entity_id: input_boolean.tuya_hallway_entrance_lights_state
-
 # Try to keep input_booleans consistent.
 automation:
   - alias: Lighting · Tuya · Update kitchen lights
@@ -70,7 +58,6 @@ automation:
         - input_boolean.tuya_kitchen_main_lights_state
         - input_boolean.tuya_kitchen_secondary_lights_state
         - input_boolean.tuya_hallway_main_lights_state
-        - input_boolean.tuya_hallway_entrance_lights_state
     action:
       - service: scene.turn_on
         data_template:
@@ -95,6 +82,3 @@ automation:
 
       - service_template: "input_boolean.turn_{{ states('light.hallway_main_lights') }}"
         entity_id: input_boolean.tuya_hallway_main_lights_state
-
-      - service_template: "input_boolean.turn_{{ states('light.hallway_entrance_lights') }}"
-        entity_id: input_boolean.tuya_hallway_entrance_lights_state

config/packages/modules/media/plex.yaml

@@ -31,17 +31,18 @@ automation:
             - light.living_room_main_lights
             - light.pc
             - light.master_bedroom_main_lights
-            - light.tuya_hallway_entrance_lights
+            - light.hallway_entrance_lights
             - light.tuya_hallway_main_lights
             - light.tuya_kitchen_main_lights
+            - light.tuya_kitchen_secondary_lights
       - service: light.turn_off
         entity_id:
           - light.living_room_main_lights
           - light.pc
           - light.master_bedroom_main_lights
-          - light.tuya_hallway_entrance_lights
+          - light.hallway_entrance_lights
           - light.tuya_hallway_main_lights
-          - light.tuya_kitchen_main_lights
+          - light.tuya_kitchen_secondary_lights
 
   - alias: TV · Plex · Restore house after Plex
     trigger:

config/packages/routines/coming_home.yaml

@@ -11,7 +11,7 @@ script:
       - service: script.security_camera_off
       - service: light.turn_on
         entity_id:
-          - light.tuya_hallway_entrance_lights
+          - light.hallway_entrance_lights
           - light.tuya_hallway_main_lights
           - light.bed_led
       - service: script.routine_coming_home_after_sunset

config/packages/routines/waking_up.yaml

@@ -16,7 +16,7 @@ script:
       - delay: 00:00:01
 
       - service: light.turn_on
-        entity_id: light.tuya_hallway_entrance_lights
+        entity_id: light.hallway_entrance_lights
 
       - condition: state
         entity_id: input_boolean.guest_mode