more small fixes and consolidating the driveway

automations/climate/hvac_fan_on.yaml

@@ -1,102 +1,94 @@
 alias: HVAC Fan On
 id: automation_hvac_fan_on
 
-trigger:
+triggers:
   # Has the fan been off for ten minutes?
-  - platform: state
+  - trigger: state
     entity_id: switch.thermostat_fan_mode
-    to: 'off'
-    for: '00:10:00'
+    to: "off"
+    for: "00:10:00"
 
   # Did the temp just switch to just right?
-  - platform: state
+  - trigger: state
     entity_id: binary_sensor.temp_just_right
-    to: 'on'
+    to: "on"
 
   # Did it just become cooler inside or outside?
-  - platform: state
+  - trigger: state
     entity_id: binary_sensor.cooler_outside
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 
   # Did it just become warmer inside or outside?
-  - platform: state
+  - trigger: state
     entity_id: binary_sensor.warmer_outside
-    from: 'off'
-    to: 'on'
+    from: "off"
+    to: "on"
 
   # Is it starting to get too warm inside?
-  - platform: numeric_state
+  - trigger: numeric_state
     entity_id: sensor.thermostat_temperature
     above: 80
 
   # Is it starting to get too cool inside?
-  - platform: numeric_state
+  - trigger: numeric_state
     entity_id: sensor.thermostat_temperature
     below: 60
 
 condition:
   - condition: state
     entity_id: input_boolean.allow_fan
-    state: 'on'
+    state: "on"
 
   # Are the internal sensors above 67?
   # This is mainly to ensure those sensors are working
   - condition: numeric_state
-    entity_id: sensor.return_temperature
+    entity_id: sensor.hvac_multisensor_return
     above: 50
 
   - condition: numeric_state
-    entity_id: sensor.hvac_temperature
+    entity_id: sensor.hvac_multisensor_supply
     above: 50
 
   # Is the fan currently off?
   - condition: state
     entity_id: switch.thermostat_fan_mode
-    state:  'off'
+    state: "off"
 
   # Is the system currently idle?
   - condition: state
     entity_id: sensor.hvac_action
-    state:  'idle'
+    state: "idle"
 
   # Is the home occupied?
   - condition: state
     entity_id: input_boolean.home_occupied
-    state:  'on'
+    state: "on"
 
   # Is the outside temp just right?
   - condition: state
     entity_id: binary_sensor.temp_just_right
-    state:  'on'
+    state: "on"
 
   # Is it getting too warm or too cold in the house?
   - condition: or
     conditions:
       - condition: and
         conditions:
-        - condition: numeric_state
-          entity_id: sensor.thermostat_temperature
-          above:  75
-        - condition: state
-          entity_id: binary_sensor.cooler_outside
-          state: 'on'
+          - condition: numeric_state
+            entity_id: sensor.thermostat_temperature
+            above: 75
+          - condition: state
+            entity_id: binary_sensor.cooler_outside
+            state: "on"
       - condition: and
         conditions:
-        - condition: numeric_state
-          entity_id: sensor.thermostat_temperature
-          below:  65
-        - condition: state
-          entity_id: binary_sensor.warmer_outside
-          state: 'on'
+          - condition: numeric_state
+            entity_id: sensor.thermostat_temperature
+            below: 65
+          - condition: state
+            entity_id: binary_sensor.warmer_outside
+            state: "on"
 action:
-  - service: logbook.log
-    data_template:
-      name: HVAC Fan On
-      entity_id: automation.hvac_fan_on
-      message: >
-        Turned on HVAC fan
-
-
   - service: homeassistant.turn_on
-    entity_id: switch.thermostat_fan_mode
+    entity_id: switch.thermostat_fan_mode