Moving zigbee devices around since moving to the sonoff zigbee bridge

config/packages/daily.yaml

@@ -295,8 +295,7 @@ automation:
     action:
     - service: scene.turn_on
       entity_id: scene.skylar_room_day
-    - service: scene.turn_on
-      entity_id: scene.master_bedroom_off
+    
    
 
   - id: 86fd5de9-3136-4d86-aef9-268f097eae35
@@ -413,4 +412,4 @@ script:
     - condition: state
       entity_id: group.garage_doors
       state: 'on'
-    - service: script.driveway_all_on
+    - service: script.driveway_on

config/packages/lighting.yaml

@@ -8,19 +8,44 @@
 
 automation:
 
+  # Kitchen lights needed when dark and there is motion
+  - id: e1cb3d56-0423-11eb-adc1-0242ac120002
+    alias: Living Room Lights Needed
+    initial_state: true
+    trigger:
+    - entity_id: binary_sensor.kitchen_motion_2
+      from: 'off'
+      platform: state
+      to: 'on'
+    - entity_id: binary_sensor.kitchen_motion
+      from: 'off'
+      platform: state
+      to: 'on'
+    condition:
+    - below: 70
+      condition: numeric_state
+      entity_id: sensor.kitchen_illuminance
+    - condition: time
+      after: '05:30:00'
+      before: '22:30:00'
+    action:
+    - service: scene.turn_on  
+      data:
+        entity_id: scene.normal_kitchen_lighting
+
   # Living lights needed when dark and there is motion
   - id: e1c9379a-0423-11eb-adc1-0242ac120002
     alias: Living Room Lights Needed
     initial_state: true
     trigger:
-    - entity_id: binary_sensor.0x00158d0002751bb4_occupancy
+    - entity_id: binary_sensor.lumi_lumi_sensor_motion_aq2_ias_zone
       from: 'off'
       platform: state
       to: 'on'
     condition:
     - below: 50
       condition: numeric_state
-      entity_id: sensor.0x00158d0002751bb4_illuminance
+      entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance
     - condition: time
       after: '05:30:00'
       before: '22:30:00'
@@ -35,23 +60,17 @@ automation:
     alias: Inside Lights Not Needed
     initial_state: true
     trigger:
-    - entity_id: sensor.0x00158d0002751bb4_illuminance
+    - entity_id: sensor.lumi_lumi_sensor_motion_aq2_illuminance
       above: 99
       platform: numeric_state
     condition:
       - condition: state
-        entity_id: light.kitchen_cabinets
-        state: "on"
-      - condition: state
-        entity_id: light.0xb0ce18140003608a_light
+        entity_id: light.living_room_tower_lamp_level_light_color_on_off
         state: "on"
     action:
     - service: scene.turn_on  
       data:
         entity_id: scene.livingroom_lighting_off
-    - service: scene.turn_on  
-      data:
-        entity_id: scene.kitchen_lighting_off
     - service: script.twitter_notify
       data:
         message: >-
@@ -112,7 +131,7 @@ script:
         entity_id: switch.driveway_light
       service: switch.turn_on
     - data:
-        entity_id: light.side_door_light
+        entity_id: light.cree_side_door_lightlevel_on_off
       service: light.turn_on
   
   driveway_off:
@@ -128,7 +147,7 @@ script:
     - service: switch.turn_off
       entity_id: switch.driveway_light
     - service: light.turn_off
-      entity_id: light.side_door_light
+      entity_id: light.cree_side_door_lightlevel_on_off
 
   # Turn on Living Room Lights if sun is down or cloud coverage is above 70%
   livingroom_lamps_on: