Living room motion light adjustments, close #149

packages/lighting_and_scenes.yaml

@@ -593,14 +593,7 @@ automation:
       state: 'off'
     action:
     - choose:
-      - conditions:
+      - conditions: "{{ (trigger.id == 'motion-on' and is_state('input_boolean.night_mode','on')) and (is_state('input_boolean.kallen_sleeping','on') or is_state('input_boolean.kallen_overnight','on')) }}"
-        - condition: and
-          conditions:
-          - condition: trigger
-            id: motion-on
-          - condition: state
-            entity_id: input_boolean.night_mode
-            state: 'on'
         sequence:
         - service: timer.cancel
           target:
@@ -622,14 +615,7 @@ automation:
               - input_select.dining_room_lamp_scenes
           data:
             option: Adaptive
-      - conditions:
+      - conditions: "{{ (trigger.id == 'motion-off' and is_state('input_boolean.night_mode','on')) and (is_state('input_boolean.kallen_sleeping','on') or is_state('input_boolean.kallen_overnight','on')) }}"
-        - condition: and
-          conditions:
-          - condition: trigger
-            id: motion-off
-          - condition: state
-            entity_id: input_boolean.night_mode
-            state: 'on'
         sequence:
         - service: timer.start
           target:

packages/presence.yaml

@@ -471,14 +471,13 @@ automation:
           title: "Kallen Location Alert"
           tag: kallen-dropoff
       - if:
-        - condition: state
+        - condition: template
-          entity_id: input_boolean.master_bedroom_sleeping
+          value_template: "{{ is_state('input_boolean.master_bedroom_sleeping','on') and is_state('input_boolean.kallen_overnight','off') }}"
-          state: 'on'
         then:
         - service: light.turn_off
           target:
-            entity_id: light.living_room_lights
+            entity_id:
-    initial_state: true
+              - light.first_floor_lights
 
   - id: kallen_left_school
     alias: Kallen left School