From 3361fdd9d91647e762060d98ccb798d61e7afa2c Mon Sep 17 00:00:00 2001
From: Georgi Gardev <georgi@gardev.com>
Date: Wed, 25 Mar 2020 22:33:43 +0200
Subject: [PATCH] Include new lights in automations

---
 config/lovelace/07_system.yaml            |  4 ++--
 config/packages/modes/domestina.yaml      |  2 +-
 config/packages/modules/lighting.yaml     | 16 ++++++++++++----
 config/packages/routines/bedtime.yaml     |  7 ++++++-
 config/packages/routines/coming_home.yaml |  6 ++++++
 5 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/config/lovelace/07_system.yaml b/config/lovelace/07_system.yaml
index 3f523a8..1009fba 100644
--- a/config/lovelace/07_system.yaml
+++ b/config/lovelace/07_system.yaml
@@ -33,9 +33,9 @@ cards:
           icon: mdi:lightbulb
         open: true
         entities:
-          - automation.lighting_turn_on_all_lights_after_sunset
+          - automation.lighting_turn_on_ceiling_lights_after_sunset
           - automation.lighting_turn_off_all_lights_after_sunrise
-          - automation.lighting_master_bedroom_toggle_bedside_light_on_bedisde_switch_single_click
+          - automation.lighting_master_bedroom_toggle_main_lights_on_bedisde_switch_single_click
           - automation.lighting_living_room_turn_all_lights_on_on_magic_cube_flip_90
           - automation.lighting_living_room_turn_all_lights_off_on_magic_cube_flip_180
           - automation.lighting_sync_tasmota_states_on_start_up
diff --git a/config/packages/modes/domestina.yaml b/config/packages/modes/domestina.yaml
index d35bedc..b818bd5 100644
--- a/config/packages/modes/domestina.yaml
+++ b/config/packages/modes/domestina.yaml
@@ -15,7 +15,7 @@ group:
     - automation.music_play_pause_on_magic_cube_knock
     - automation.music_volume_down_on_magic_cube_rotate_left
     - automation.music_volume_up_on_magic_cube_rotate_right
-    - automation.lighting_turn_on_all_lights_after_sunset
+    - automation.lighting_turn_on_ceiling_lights_after_sunset
     - automation.lighting_turn_off_all_lights_after_sunrise
     - automation.lighting_living_room_turn_all_lights_on_on_magic_cube_flip_90
     - automation.lighting_living_room_turn_all_lights_off_on_magic_cube_flip_180
diff --git a/config/packages/modules/lighting.yaml b/config/packages/modules/lighting.yaml
index d5b9bf5..da95074 100644
--- a/config/packages/modules/lighting.yaml
+++ b/config/packages/modules/lighting.yaml
@@ -232,6 +232,14 @@ light:
       - light.hallway_entrance_lights
       - light.hallway_main_lights
 
+  - platform: group
+    name: Ceiling lights
+    entities:
+      - light.living_room_all_lights
+      - light.master_bedroom_main_lights
+      - light.kitchen_main_lights
+      - light.hallway_all_lights
+
   - platform: group
     name: All lights
     entities:
@@ -390,7 +398,7 @@ switch:
     value_template: "{{ value_json.Fade }}"
 
 automation:
-  - alias: Lighting · Turn on all lights after sunset
+  - alias: Lighting · Turn on ceiling lights after sunset
     trigger:
       platform: sun
       event: sunset
@@ -401,7 +409,7 @@ automation:
         state: "on"
     action:
       - service: light.turn_on
-        entity_id: light.all_lights
+        entity_id: light.ceiling_lights
 
   - alias: Lighting · Turn off all lights after sunrise
     trigger:
@@ -412,7 +420,7 @@ automation:
       - service: light.turn_off
         entity_id: light.all_lights
 
-  - alias: Lighting · Master bedroom · Toggle bedside light on bedisde switch single click"
+  - alias: Lighting · Master bedroom · Toggle main lights on bedisde switch single click"
     trigger:
       platform: event
       event_type: zha_event
@@ -421,7 +429,7 @@ automation:
         command: single
     action:
       - service: light.toggle
-        entity_id: light.bedside_light
+        entity_id: light.master_bedroom_main_lights
 
   - alias: Lighting · Living room · Turn all lights on on Magic Cube flip 90
     trigger:
diff --git a/config/packages/routines/bedtime.yaml b/config/packages/routines/bedtime.yaml
index 259c956..70dc32f 100644
--- a/config/packages/routines/bedtime.yaml
+++ b/config/packages/routines/bedtime.yaml
@@ -7,6 +7,8 @@ script:
         entity_id: light.bedside_light
       - service: fan.turn_on
         entity_id: fan.philips_airpurifier
+      - service: light.turn_off
+        entity_id: light.master_bedroom_main_lights
       - service: sonos.unjoin
         entity_id:
           - media_player.living_room
@@ -28,7 +30,10 @@ script:
           - media_player.nvidia_shield
           - media_player.living_room_tv
       - service: light.turn_off
-        entity_id: light.living_room_all_lights
+        entity_id:
+          - light.living_room_all_lights
+          - light.hallway_all_lights
+          - light.kitchen_main_lights
 
 automation:
   - alias: Routine · Bedtime · Toggle on bedside switch hold
diff --git a/config/packages/routines/coming_home.yaml b/config/packages/routines/coming_home.yaml
index 16c4769..aa1fa11 100644
--- a/config/packages/routines/coming_home.yaml
+++ b/config/packages/routines/coming_home.yaml
@@ -10,6 +10,12 @@ script:
     sequence:
       # Enter home mode.
       - service: script.security_camera_off
+      - service: light.turn_on
+        entity_id: light.hallway_entrance_lights
+      - service: light.turn_on
+        entity_id: light.hallway_main_lights
+
+      # TODO: Only if it's dark in the living room
       - service: light.turn_on
         entity_id: light.living_room_all_lights
       - service: script.music_join_sonoses