A whole bunch of cleanup

automations/rooms/driveway_lights.yaml

@@ -24,7 +24,7 @@ trigger:
       - binary_sensor.garage_door
     from: "on"
     to: "off"
-    for: "00:01:00"
+    for: "00:05:00"
 
   - platform: state
     id: got_bright

automations/rooms/entryway/entryway_lights_to_on.yaml

@@ -28,6 +28,7 @@ trigger:
     id: door
     entity_id:
       - binary_sensor.inner_garage_door
+      - binary_sensor.inner_garage_door_contact
       - binary_sensor.front_door_contact
     to: "on"
 

automations/rooms/front_porch_lights.yaml

@@ -15,16 +15,16 @@ trigger:
     entity_id: binary_sensor.front_porch_motion, binary_sensor.front_porch_person_occupancy
     to: "off"
     for:
-      minutes: 1
+      minutes: 5
 
   - platform: state
     id: door_open
-    entity_id: binary_sensor.outer_garage_door, binary_sensor.garage_door
+    entity_id: binary_sensor.outer_garage_door, binary_sensor.garage_door, binary_sensor.outer_garage_door_contact
     to: "on"
 
   - platform: state
     id: door_shut
-    entity_id: binary_sensor.outer_garage_door
+    entity_id: binary_sensor.outer_garage_door, binary_sensor.outer_garage_door_contact
     to: "off"
     for:
       minutes: 1
@@ -40,17 +40,17 @@ trigger:
     to: "on"
 
 condition:
-  - condition: or
-    conditions:
-      - alias: "Front porch not naturally lit"
-        condition: state
-        entity_id: binary_sensor.front_porch_naturally_lit
-        state: 'off'
+  # - condition: or
+  #   conditions:
+  #     - alias: "Front porch not naturally lit"
+  #       condition: state
+  #       entity_id: binary_sensor.front_porch_naturally_lit
+  #       state: 'off'
 
-      - alias: "Light is already on"
-        condition: state
-        entity_id: light.front_porch_overhead
-        state: 'on'
+  #     - alias: "Light is already off"
+  #       condition: state
+  #       entity_id: light.front_porch_overhead
+  #       state: 'off'
 
   - alias: "It is not late evening"
     condition: state
@@ -72,6 +72,11 @@ action:
         entity_id: light.front_porch_overhead
         state: 'off'
 
+      - alias: "Front porch not naturally lit"
+        condition: state
+        entity_id: binary_sensor.front_porch_naturally_lit
+        state: 'off'
+
       sequence:
         - service: light.turn_on
           target:
@@ -85,20 +90,42 @@ action:
         entity_id: light.front_porch_overhead
         state: 'off'
 
+      - alias: "Front porch not naturally lit"
+        condition: state
+        entity_id: binary_sensor.front_porch_naturally_lit
+        state: 'off'
+
       sequence:
         - service: light.turn_on
           target:
             entity_id: light.front_porch_overhead
 
+    - conditions:
+      - condition: trigger
+        id: "too_bright"
+
+      - condition: state
+        entity_id: light.front_porch_overhead
+        state: 'on'
+
+      sequence:
+        - service: light.turn_off
+          target:
+            entity_id: light.front_porch_overhead
+
     - conditions:
       - condition: state
         entity_id: binary_sensor.front_porch_motion
         state: "off"
         for:
-          minutes: 1
+          minutes: 5
+
+      # - condition: state
+      #   entity_id: binary_sensor.outer_garage_door
+      #   state: 'off'
 
       - condition: state
-        entity_id: binary_sensor.outer_garage_door
+        entity_id: binary_sensor.outer_garage_door_contact
         state: 'off'
 
       - condition: state

automations/rooms/furnace_room_lights.yaml

@@ -5,13 +5,13 @@ mode: queued
 trigger:
   - platform: state
     id: door_open
-    entity_id: binary_sensor.furnace_room_door
+    entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact
     from: "off"
     to: "on"
 
   - platform: state
     id: door_closed
-    entity_id: binary_sensor.furnace_room_door
+    entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact
     to: "off"
     for: "00:10:00"
 

automations/rooms/garage/garage_lights_to_off.yaml

@@ -12,6 +12,8 @@ trigger:
       - binary_sensor.inner_garage_door
       - binary_sensor.outer_garage_door
       - binary_sensor.garage_door
+      - binary_sensor.outer_garage_door_contact
+      - binary_sensor.inner_garage_door_contact
     to: 'off'
     for: '00:10:00'
 

automations/rooms/garage/garage_lights_to_on.yaml

@@ -38,7 +38,9 @@ trigger:
     id: "doors_open"
     entity_id:
       - binary_sensor.inner_garage_door
+      - binary_sensor.inner_garage_door_contact
       - binary_sensor.outer_garage_door
+      - binary_sensor.outer_garage_door_contact
     from: "off"
     to: "on"
 
@@ -46,7 +48,9 @@ trigger:
     id: "doors_closed"
     entity_id:
       - binary_sensor.inner_garage_door
+      - binary_sensor.inner_garage_door_contact
       - binary_sensor.outer_garage_door
+      - binary_sensor.outer_garage_door_contact
     from: "on"
     to: "off"
 

automations/rooms/nursery/nursery_white_noise_on.yaml

@@ -25,17 +25,20 @@ action:
   #  data:
   #    entity_id: input_select.nursery_mode
   #    option: 'Off'
-  - service: media_player.volume_set
-    data:
-      volume_level: 0.6
-    target:
-      entity_id: media_player.nursery_hub
-
-  - service: media_player.play_media
-    target:
-      entity_id: media_player.nursery_hub
-    data:
-      media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
-      media_content_type: audio/mpeg
+
+
+  # The kids can turn on their own sounds. Just stop the music
+  # - service: media_player.volume_set
+  #   data:
+  #     volume_level: 0.6
+  #   target:
+  #     entity_id: media_player.nursery_hub
+
+  # - service: media_player.play_media
+  #   target:
+  #     entity_id: media_player.nursery_hub
+  #   data:
+  #     media_content_id: media-source://media_source/local/Sounds/relaxing/thunderstorm.mp3
+  #     media_content_type: audio/mpeg