more small fixes and consolidating the driveway

automations/rooms/furnace_room_lights.yaml

@@ -1,48 +1,56 @@
 alias: Furnace Room Lights
 id: automation_furnace_room_lights
+description: "Handles the lights in the furnace room"
 mode: queued
-
-trigger:
-  - platform: state
-    id: door_open
-    entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact
+triggers:
+  - id: door_open
+    entity_id: >-
+      binary_sensor.hvac_multisensor_door,
+      binary_sensor.furnace_room_door_contact
     from: "off"
     to: "on"
-
-  - platform: state
-    id: door_closed
-    entity_id: binary_sensor.furnace_room_door, binary_sensor.furnace_room_door_contact
+    trigger: state
+    alias: >-
+      When one of the door sensors detect that the furnace room door has been
+      opened
+  - id: door_closed
+    entity_id: >-
+      binary_sensor.hvac_multisensor_door,
+      binary_sensor.furnace_room_door_contact
     to: "off"
     for: "00:10:00"
-
-  - platform: state
-    id: motion_off
+    trigger: state
+    alias: When the furnace room door has been closed for 10 minutes
+  - id: motion_off
     entity_id: binary_sensor.furnace_room_motion_switch_home_security_motion_detection
     to: "off"
     for: "00:15:00"
-
-action:
+    trigger: state
+actions:
   - choose:
-    # - conditions:
-    #   - condition: trigger
-    #     id: "door_open"
-    #   - condition: state
-    #     entity_id: light.furnace_room
-    #     state: 'off'
-    #   sequence:
-    #     - service: light.turn_on
-    #       target:
-    #         entity_id: light.furnace_room
-    - conditions:
-      - condition: trigger
-        id: "door_closed"
-      - condition: state
-        entity_id: binary_sensor.furnace_room_motion_switch_home_security_motion_detection
-        state: "off"
-      - condition: state
-        entity_id: light.furnace_room
-        state: 'on'
-      sequence:
-        - service: light.turn_off
-          target:
-            entity_id: light.furnace_room
+      - conditions:
+          - condition: trigger
+            id: door_open
+          - condition: state
+            entity_id: light.furnace_room
+            state: "off"
+        sequence:
+          - target:
+              entity_id: light.furnace_room
+            action: light.turn_on
+            data: {}
+      - conditions:
+          - condition: trigger
+            id: door_closed
+          - condition: state
+            entity_id: >-
+              binary_sensor.furnace_room_motion_switch_home_security_motion_detection
+            state: "off"
+          - condition: state
+            entity_id: light.furnace_room
+            state: "on"
+        sequence:
+          - target:
+              entity_id: light.furnace_room
+            action: light.turn_off
+            data: {}

automations/rooms/mancave_lights.yaml

@@ -2,21 +2,21 @@ alias: Mancave Lights
 id: automation_mancave_lights
 mode: queued
 
-trigger:
-  - platform: state
+triggers:
+  - trigger: state
     id: door_open
     entity_id: binary_sensor.mancave_door_contact
     from: "off"
     to: "on"
 
-  - platform: state
+  - trigger: state
     id: door_closed
     entity_id: binary_sensor.mancave_door_contact
     from: "on"
     to: "off"
     for: "00:10:00"
 
-  - platform: state
+  - trigger: state
     id: motion_off
     entity_id: binary_sensor.mancave_motion_switch_home_security_motion_detection
     to: "off"