Will pushing from the server break anything?

components/alerts/hvac_delta_too_small_for_too_long.yaml

@@ -1,5 +1,5 @@
 # name: "The AC is probably broken again!"
-# message: "It is {{states('sensor.front_porch_temperature')}} outside and {{state_attr('climate.thermostat','current_temperature')}} inside. The thermostat is set to {{state_attr('climate.thermostat','target_temp_low')}} and the delta is {{states('sensor.hvac_multisensor_delta')}}"
+# message: "It is {{states('sensor.front_porch_hue_motion_sensor_temperature')}} outside and {{state_attr('climate.thermostat','current_temperature')}} inside. The thermostat is set to {{state_attr('climate.thermostat','target_temp_low')}} and the delta is {{states('sensor.hvac_multisensor_delta')}}"
 # done_message: "AC is now {{states('sensor.hvac_multisensor_delta')}}"
 # entity_id: binary_sensor.hvac_multisensor_delta_too_small_for_too_long
 # state: "on"

components/binary_sensors/bayesian_window_open_hvac.yaml

@@ -1,31 +1,31 @@
-platform: 'bayesian'
-name: 'Window Open HVAC On'
+platform: "bayesian"
+name: "Window Open HVAC On"
 device_class: problem
 prior: 0
 probability_threshold: 0.6
 observations:
-  - entity_id: 'group.my_exterior_windows'
+  - entity_id: "group.my_exterior_windows"
     prob_given_true: .5
     prob_given_false: 0.01
-    platform: 'state'
-    to_state: 'on'
-  - entity_id: 'group.my_exterior_doors'
+    platform: "state"
+    to_state: "on"
+  - entity_id: "binary_sensor.exterior_doors"
     prob_given_true: .5
     prob_given_false: 0.01
-    platform: 'state'
-    to_state: 'on'
+    platform: "state"
+    to_state: "on"
   - entity_id: sensor.hvac_action
     prob_given_true: .5
     prob_given_false: 0.01
-    platform: 'state'
-    to_state: 'cooling'
+    platform: "state"
+    to_state: "cooling"
   - entity_id: sensor.hvac_action
     prob_given_true: .5
     prob_given_false: 0.01
-    platform: 'state'
-    to_state: 'heating'
+    platform: "state"
+    to_state: "heating"
   - entity_id: sensor.hvac_action
     prob_given_true: .01
     prob_given_false: 0.01
-    platform: 'state'
-    to_state: 'idle'
+    platform: "state"
+    to_state: "idle"

components/binary_sensors/rooms/back_yard_occupied.yaml

@@ -1,19 +1,19 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.back_yard_occupied
-name: Back Yard Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.back_yard_occupied
+# name: Back Yard Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .01
-    prob_given_false: 0.01
-    to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .01
+#     prob_given_false: 0.01
+#     to_state: 'off'
 
-  - entity_id: group.back_yard_motion
-    prob_given_true: .9
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.back_yard_motion
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/boys_room_occupied.yaml

@@ -1,30 +1,30 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.boys_room_occupied
-name: Boys Room Occupied
-prior: 0.25
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.boys_room_occupied
+# name: Boys Room Occupied
+# prior: 0.25
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: binary_sensor.white_bed_occupied
-    platform: state
-    prob_given_true: .83
-    prob_given_false: 0.0
-    to_state: 'on'
+#   - entity_id: binary_sensor.white_bed_occupied
+#     platform: state
+#     prob_given_true: .83
+#     prob_given_false: 0.0
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.boys_room_person_occupancy
-    prob_given_true: .4
-    prob_given_false: 0.0
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.boys_room_person_occupancy
+#     prob_given_true: .4
+#     prob_given_false: 0.0
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.67
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .99
+#     prob_given_false: 0.67
+#     to_state: 'on'
 
-  - entity_id: group.boys_room_motion
-    platform: state
-    prob_given_true: .5
-    prob_given_false: 0.0
-    to_state: 'on'
+#   - entity_id: binary_sensor.boys_room_motion
+#     platform: state
+#     prob_given_true: .5
+#     prob_given_false: 0.0
+#     to_state: 'on'

components/binary_sensors/rooms/computer_area_occupied.yaml

@@ -1,25 +1,19 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.computer_area_occupied
-name: Computer Area Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.7
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.computer_area_occupied
+# name: Computer Area Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.7
+# observations:
 
-  - entity_id: group.computer_area_motion
-    prob_given_true: .99
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.computer_area_motion
+#     prob_given_true: .99
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'on'
 
-  # - entity_id: binary_sensor.computer_chair_contact_occupied
-  #   prob_given_true: .99
-  #   prob_given_false: 0.5
-  #   platform: state
-  #   to_state: 'on'
-
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .7
-    prob_given_false: 0.1
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .7
+#     prob_given_false: 0.1
+#     to_state: 'on'

components/binary_sensors/rooms/dining_room_occupied.yaml

@@ -1,25 +1,25 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.dining_room_occupied
-name: Dining Room Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.7
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.dining_room_occupied
+# name: Dining Room Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.7
+# observations:
 
-  - entity_id: group.dining_room_motion
-    prob_given_true: .99
-    prob_given_false: .85
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.dining_room_motion
+#     prob_given_true: .99
+#     prob_given_false: .85
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.dining_room_person_occupancy
-    prob_given_true: .99
-    prob_given_false: .85
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.dining_room_person_occupancy
+#     prob_given_true: .99
+#     prob_given_false: .85
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.01
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .99
+#     prob_given_false: 0.01
+#     to_state: 'on'

components/binary_sensors/rooms/entryway_occupied.yaml

@@ -1,36 +1,36 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.entryway_occupied
-name: Entryway Occupied
-device_class: occupancy
-prior: 0.02
-probability_threshold: 0.65
-observations:
-  - entity_id: group.entryway_motion
-    prob_given_true: 0.9
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+# platform: bayesian
+# unique_id: bayesianbinarysensor.entryway_occupied
+# name: Entryway Occupied
+# device_class: occupancy
+# prior: 0.02
+# probability_threshold: 0.65
+# observations:
+#   - entity_id: binary_sensor.entryway_motion
+#     prob_given_true: 0.9
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .98
-    prob_given_false: 0.85
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .98
+#     prob_given_false: 0.85
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.entryway_person_occupancy
-    prob_given_true: .02
-    prob_given_false: 0.0
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.entryway_person_occupancy
+#     prob_given_true: .02
+#     prob_given_false: 0.0
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.inner_garage_door_contact
-    prob_given_true: 0.02
-    prob_given_false: 0.0
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.inner_garage_door_contact
+#     prob_given_true: 0.02
+#     prob_given_false: 0.0
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.front_door_contact
-    prob_given_true: 0.02
-    prob_given_false: 0.0
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.front_door_contact
+#     prob_given_true: 0.02
+#     prob_given_false: 0.0
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/front_room_occupied.yaml

@@ -1,37 +1,32 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.front_room_occupied
-name: Front Room Occupied
-device_class: occupancy
-prior: 0.5
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.front_room_occupied
+# name: Front Room Occupied
+# device_class: occupancy
+# prior: 0.5
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: group.front_room_motion
-    prob_given_true: .75
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.front_room_motion
+#     prob_given_true: .75
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: media_player.front_room_tv
-    prob_given_true: .9
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'playing'
+#   - entity_id: media_player.front_room_tv
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'playing'
 
-  - entity_id: media_player.front_room_tv
-    prob_given_true: .5
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'home'
+#   - entity_id: media_player.front_room_tv
+#     prob_given_true: .5
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'home'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .01
-    prob_given_false: 0.01
-    to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .01
+#     prob_given_false: 0.01
+#     to_state: 'off'
 
-  # - entity_id: binary_sensor.front_room_person_occupancy
-  #   prob_given_true: .99
-  #   prob_given_false: 0.01
-  #   platform: state
-  #   to_state: 'on'

components/binary_sensors/rooms/front_yard_occupied.yaml

@@ -1,19 +1,19 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.front_yard_occupied
-name: Front Yard Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.front_yard_occupied
+# name: Front Yard Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .01
-    prob_given_false: 0.01
-    to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .01
+#     prob_given_false: 0.01
+#     to_state: 'off'
 
-  - entity_id: group.front_yard_motion
-    prob_given_true: .9
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.front_yard_motion
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/furnace_room_occupied.yaml

@@ -1,13 +1,13 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.furnace_room_occupied
-name: Furnace Room Occupied
-device_class: occupancy
-prior: 0.2
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.furnace_room_occupied
+# name: Furnace Room Occupied
+# device_class: occupancy
+# prior: 0.2
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: group.furnace_room_motion
-    prob_given_true: .99
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.furnace_room_motion
+#     prob_given_true: .99
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/garage_occupied.yaml

@@ -1,67 +1,67 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.garage_occupied
-name: Garage Occupied
-device_class: occupancy
-prior: 0.4
-probability_threshold: 0.6
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.garage_occupied
+# name: Garage Occupied
+# device_class: occupancy
+# prior: 0.4
+# probability_threshold: 0.6
+# observations:
 
-  - entity_id: group.garage_motion
-    prob_given_true: .8
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.garage_motion
+#     prob_given_true: .8
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: group.garage_motion
-    prob_given_true: .5
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'off'
+#   - entity_id: binary_sensor.garage_motion
+#     prob_given_true: .5
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'off'
 
-  - entity_id: cover.garage_door
-    prob_given_true: .60
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'open'
+#   - entity_id: cover.garage_door
+#     prob_given_true: .60
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'open'
 
-  - entity_id: cover.garage_door
-    prob_given_true: .50
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'closed'
+#   - entity_id: cover.garage_door
+#     prob_given_true: .50
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'closed'
 
-  - entity_id: binary_sensor.inner_garage_door_contact
-    prob_given_true: .75
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.inner_garage_door_contact
+#     prob_given_true: .75
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.inner_garage_door_contact
-    prob_given_true: .5
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'off'
+#   - entity_id: binary_sensor.inner_garage_door_contact
+#     prob_given_true: .5
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'off'
 
-  - entity_id: binary_sensor.outer_garage_door_contact
-    prob_given_true: .75
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.outer_garage_door_contact
+#     prob_given_true: .75
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.outer_garage_door_contact
-    prob_given_true: 0.5
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'off'
+#   - entity_id: binary_sensor.outer_garage_door_contact
+#     prob_given_true: 0.5
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'off'
 
-  - entity_id: binary_sensor.workshop_person_occupancy
-    prob_given_true: .99
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.workshop_person_occupancy
+#     prob_given_true: .99
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.workshop_person_occupancy
-    prob_given_true: 0.5
-    prob_given_false: 0.5
-    platform: state
-    to_state: 'off'
+#   - entity_id: binary_sensor.workshop_person_occupancy
+#     prob_given_true: 0.5
+#     prob_given_false: 0.5
+#     platform: state
+#     to_state: 'off'

components/binary_sensors/rooms/girls_room_occupied.yaml

@@ -1,30 +0,0 @@
-platform: bayesian
-unique_id: 608783dd-0d18-4e9b-a7f9-3f35eee41fc4
-name: Girls Room Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.90
-observations:
-  - platform: state
-    entity_id: binary_sensor.girls_room_motion
-    to_state: "on"
-    prob_given_true: .33
-    prob_given_false: 0.0
-
-  - entity_id: binary_sensor.girls_room_person_occupancy
-    prob_given_true: .33
-    prob_given_false: 0.0
-    platform: state
-    to_state: "on"
-
-  - platform: state
-    entity_id: binary_sensor.black_bed_occupied
-    to_state: "on"
-    prob_given_true: .67
-    prob_given_false: 0.0
-
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .92
-    prob_given_false: 0.5
-    to_state: "on"

components/binary_sensors/rooms/great_room_occupied.yaml

@@ -1,43 +1,43 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.great_room_occupied
-name: Great Room Occupied
-device_class: occupancy
-prior: 0.5
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.great_room_occupied
+# name: Great Room Occupied
+# device_class: occupancy
+# prior: 0.5
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: group.great_room_motion
-    platform: state
-    prob_given_true: .9
-    prob_given_false: 0.01
-    to_state: 'on'
+#   - entity_id: binary_sensor.great_room_motion
+#     platform: state
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .01
-    prob_given_false: 0.01
-    to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .01
+#     prob_given_false: 0.01
+#     to_state: 'off'
 
-  - entity_id: media_player.downstairs_roku
-    platform: state
-    prob_given_true: .9
-    prob_given_false: 0.01
-    to_state: 'playing'
+#   - entity_id: media_player.downstairs_roku
+#     platform: state
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     to_state: 'playing'
 
-  - entity_id: media_player.downstairs_roku
-    platform: state
-    prob_given_true: .9
-    prob_given_false: 0.01
-    to_state: 'paused'
+#   - entity_id: media_player.downstairs_roku
+#     platform: state
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     to_state: 'paused'
 
-  - entity_id: media_player.downstairs_roku
-    platform: state
-    prob_given_true: .5
-    prob_given_false: 0.01
-    to_state: 'idle'
+#   - entity_id: media_player.downstairs_roku
+#     platform: state
+#     prob_given_true: .5
+#     prob_given_false: 0.01
+#     to_state: 'idle'
 
-  - entity_id: binary_sensor.great_room_person_occupancy
-    prob_given_true: .99
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.great_room_person_occupancy
+#     prob_given_true: .99
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/kitchen_occupied.yaml

@@ -1,25 +1,25 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.kitchen_occupied
-name: Kitchen Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.7
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.kitchen_occupied
+# name: Kitchen Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.7
+# observations:
 
-  - entity_id: group.kitchen_motion
-    prob_given_true: .99
-    prob_given_false: .85
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.kitchen_motion
+#     prob_given_true: .99
+#     prob_given_false: .85
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.kitchen_person_occupancy
-    prob_given_true: .99
-    prob_given_false: .85
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.kitchen_person_occupancy
+#     prob_given_true: .99
+#     prob_given_false: .85
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.01
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .99
+#     prob_given_false: 0.01
+#     to_state: 'on'

components/binary_sensors/rooms/mancave_occupied.yaml

@@ -1,19 +1,19 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.mancave_occupied
-name: Mancave Occupied
-device_class: occupancy
-prior: 0.5
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.mancave_occupied
+# name: Mancave Occupied
+# device_class: occupancy
+# prior: 0.5
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: group.mancave_motion
-    prob_given_true: .9
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.mancave_motion
+#     prob_given_true: .9
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .01
-    prob_given_false: 0.01
-    to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .01
+#     prob_given_false: 0.01
+#     to_state: 'off'

components/binary_sensors/rooms/master_bathroom_occupied.yaml

@@ -1,37 +1,25 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.master_bathroom_occupied
-name: Master Bathroom Occupied
-device_class: occupancy
-prior: 0.2
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.master_bathroom_occupied
+# name: Master Bathroom Occupied
+# device_class: occupancy
+# prior: 0.2
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: group.master_bathroom_motion
-    prob_given_true: .99
-    prob_given_false: 0.05
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.master_bathroom_motion
+#     prob_given_true: .99
+#     prob_given_false: 0.05
+#     platform: state
+#     to_state: 'on'
 
-  # - entity_id: binary_sensor.bathroom_getting_humid
-  #   prob_given_true: .75
-  #   prob_given_false: 0.01
-  #   platform: state
-  #   to_state: 'on'
+#   - entity_id: binary_sensor.bathroom_multisensor_too_humid
+#     prob_given_true: .99
+#     prob_given_false: 0.05
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.bathroom_multisensor_too_humid
-    prob_given_true: .99
-    prob_given_false: 0.05
-    platform: state
-    to_state: 'on'
-
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.01
-    to_state: 'on'
-
-  # - entity_id: input_boolean.home_occupied
-  #   platform: state
-  #   prob_given_true: .01
-  #   prob_given_false: 0.5
-  #   to_state: 'off'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .99
+#     prob_given_false: 0.01
+#     to_state: 'on'

components/binary_sensors/rooms/master_bedroom_occupied.yaml

@@ -1,31 +1,31 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.master_bedroom_occupied
-name: Master Bedroom Occupied
-device_class: occupancy
-prior: 0.25
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.master_bedroom_occupied
+# name: Master Bedroom Occupied
+# device_class: occupancy
+# prior: 0.25
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either
-    platform: state
-    prob_given_true: .83
-    prob_given_false: 0.0
-    to_state: 'on'
+#   - entity_id: binary_sensor.bed_presence_c175a4_bed_occupied_either
+#     platform: state
+#     prob_given_true: .83
+#     prob_given_false: 0.0
+#     to_state: 'on'
 
-  - entity_id: binary_sensor.master_bedroom_person_occupancy
-    prob_given_true: .4
-    prob_given_false: 0.0
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.master_bedroom_person_occupancy
+#     prob_given_true: .4
+#     prob_given_false: 0.0
+#     platform: state
+#     to_state: 'on'
 
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.67
-    to_state: 'on'
+#   - entity_id: input_boolean.home_occupied
+#     platform: state
+#     prob_given_true: .99
+#     prob_given_false: 0.67
+#     to_state: 'on'
 
-  - entity_id: group.master_bedroom_motion
-    platform: state
-    prob_given_true: .5
-    prob_given_false: 0.0
-    to_state: 'on'
+#   - entity_id: binary_sensor.master_bedroom_motion
+#     platform: state
+#     prob_given_true: .5
+#     prob_given_false: 0.0
+#     to_state: 'on'

components/binary_sensors/rooms/storage_room_occupied.yaml

@@ -1,13 +1,13 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.storage_room_occupied
-name: Storage Room Occupied
-device_class: occupancy
-prior: 0.5
-probability_threshold: 0.75
-observations:
+# platform: bayesian
+# unique_id: bayesianbinarysensor.storage_room_occupied
+# name: Storage Room Occupied
+# device_class: occupancy
+# prior: 0.5
+# probability_threshold: 0.75
+# observations:
 
-  - entity_id: binary_sensor.storage_room_door_contact
-    prob_given_true: .4
-    prob_given_false: 0.01
-    platform: state
-    to_state: 'on'
+#   - entity_id: binary_sensor.storage_room_door_contact
+#     prob_given_true: .4
+#     prob_given_false: 0.01
+#     platform: state
+#     to_state: 'on'

components/binary_sensors/rooms/utility_room_occupied.yaml

@@ -1,31 +0,0 @@
-platform: bayesian
-unique_id: bayesianbinarysensor.utility_room_occupied
-name: Utility Room Occupied
-device_class: occupancy
-prior: 0.2
-probability_threshold: 0.75
-observations:
-
-  - entity_id: group.utility_room_motion
-    prob_given_true: .99
-    prob_given_false: 0.05
-    platform: state
-    to_state: 'on'
-
-  # - entity_id: binary_sensor.utility_room_getting_humid
-  #   prob_given_true: .75
-  #   prob_given_false: 0.01
-  #   platform: state
-  #   to_state: 'on'
-
-  - entity_id: binary_sensor.utility_room_multisensor_too_humid
-    prob_given_true: .99
-    prob_given_false: 0.05
-    platform: state
-    to_state: 'on'
-
-  - entity_id: input_boolean.home_occupied
-    platform: state
-    prob_given_true: .99
-    prob_given_false: 0.01
-    to_state: 'on'

components/input_booleans/rooms/back_yard_occupied.yaml

@@ -1,2 +1,2 @@
-name: Back Yard
-icon: mdi:slide
+# name: Back Yard
+# icon: mdi:slide

components/input_booleans/rooms/boys_room_light_cycle.yaml

@@ -1 +0,0 @@
-name: Boys Room Light Cycle

components/input_booleans/rooms/boys_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Boys Room
-icon: mdi:earth
+# name: Boys Room
+# icon: mdi:earth

components/input_booleans/rooms/computer_area_occupied.yaml

@@ -1,2 +1,2 @@
-name: Computer Area
-icon: mdi:desktop-classic
+# name: Computer Area
+# icon: mdi:desktop-classic

components/input_booleans/rooms/deck_occupied.yaml

@@ -1,2 +1,2 @@
-name: Deck
-icon: mdi:fence
+# name: Deck
+# icon: mdi:fence

components/input_booleans/rooms/dining_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Dining Room
-icon: mdi:table-chair
+# name: Dining Room
+# icon: mdi:table-chair

components/input_booleans/rooms/entryway_occupied.yaml

@@ -1,2 +1,2 @@
-name: Entryway
-icon: mdi:ceiling-light
+# name: Entryway
+# icon: mdi:ceiling-light

components/input_booleans/rooms/front_porch_occupied.yaml

@@ -1,2 +1,2 @@
-name: Front Porch
-icon: mdi:outdoor-lamp
+# name: Front Porch
+# icon: mdi:outdoor-lamp

components/input_booleans/rooms/front_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Front Room
-icon: mdi:television
+# name: Front Room
+# icon: mdi:television

components/input_booleans/rooms/front_yard_occupied.yaml

@@ -1,2 +1,2 @@
-name: Front Yard
-icon: mdi:grass
+# name: Front Yard
+# icon: mdi:grass

components/input_booleans/rooms/furnace_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Furnace Room
-icon: mdi:hvac
+# name: Furnace Room
+# icon: mdi:hvac

components/input_booleans/rooms/garage_occupied.yaml

@@ -1,2 +1,2 @@
-name: Garage
-icon: mdi:garage
+# name: Garage
+# icon: mdi:garage

components/input_booleans/rooms/girls_room_automatic_lights.yaml

@@ -1,2 +0,0 @@
-name: Girls Room Automatic Lights
-icon: mdi:lightbulb-auto

components/input_booleans/rooms/girls_room_closet_occupied.yaml

@@ -1,2 +1,2 @@
-name: Girls Room Closet
-icon: mdi:hanger
+# name: Girls Room Closet
+# icon: mdi:hanger

components/input_booleans/rooms/girls_room_light_cycle.yaml

@@ -1 +0,0 @@
-name: Girls Room Light Cycle

components/input_booleans/rooms/girls_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Girls Room
-icon: mdi:teddy-bear
+# name: Girls Room
+# icon: mdi:teddy-bear

components/input_booleans/rooms/great_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Great Room
-icon: mdi:microsoft-xbox-controller
+# name: Great Room
+# icon: mdi:microsoft-xbox-controller

components/input_booleans/rooms/kitchen_occupied.yaml

@@ -1,2 +1,2 @@
-name: Kitchen
-icon: mdi:fridge
+# name: Kitchen
+# icon: mdi:fridge

components/input_booleans/rooms/mancave_occupied.yaml

@@ -1,2 +1,2 @@
-name: Mancave
-icon: mdi:human-male
+# name: Mancave
+# icon: mdi:human-male

components/input_booleans/rooms/master_bathroom_occupied.yaml

@@ -1,2 +1,2 @@
-name: Master Bathroom
-icon: mdi:shower
+# name: Master Bathroom
+# icon: mdi:shower

components/input_booleans/rooms/master_bedroom_closet_occupied.yaml

@@ -1,2 +1,2 @@
-name: Master Bedroom Closet
-icon: mdi:hanger
+# name: Master Bedroom Closet
+# icon: mdi:hanger

components/input_booleans/rooms/master_bedroom_occupied.yaml

@@ -1,2 +1,2 @@
-name: Master Bedroom
-icon: mdi:bed-king
+# name: Master Bedroom
+# icon: mdi:bed-king

components/input_booleans/rooms/utility_room_occupied.yaml

@@ -1,2 +1,2 @@
-name: Utility Room
-icon: mdi:washing-machine
+# name: Utility Room
+# icon: mdi:washing-machine

components/packages/batteries/hue_batteries.yaml

@@ -4,8 +4,8 @@ sensor:
     name: Lowest Hue Device Battery
     type: min
     entity_ids:
-      - sensor.bar_battery
-      - sensor.entryway_battery
-      - sensor.front_room_battery
-      - sensor.front_porch_battery
-      - sensor.deck_battery
+      - sensor.bar_hue_motion_sensor_battery
+      - sensor.entryway_hue_motion_sensor_battery
+      - sensor.front_room_hue_motion_sensor_battery
+      - sensor.front_porch_hue_motion_sensor_battery
+      - sensor.deck_hue_motion_sensor_battery

components/packages/camera_casting.yaml

@@ -25,6 +25,62 @@ script:
   execute_cast_dropdown:
     alias: Press to execute
     sequence:
+      - variables:
+          media_player: >
+            {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %}
+              media_player.front_room_hub
+            {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %}
+              media_player.girls_room_hub
+            {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %}
+              media_player.computer_area_hub
+            {% endif %}
+          camera: >
+            {% if is_state('input_select.camera_dropdown', 'Boys Room') %}
+              media-source://camera/camera.frigate_cam01
+            {% elif is_state('input_select.camera_dropdown', 'Kitchen') %}
+              media-source://camera/camera.frigate_cam12
+            {% elif is_state('input_select.camera_dropdown', 'Computer Area') %}
+              media-source://camera/camera.frigate_cam03
+            {% elif is_state('input_select.camera_dropdown', 'Garage') %}
+              media-source://camera/camera.frigate_cam04
+            {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %}
+              media-source://camera/camera.frigate_cam06
+            {% elif is_state('input_select.camera_dropdown', 'Girls Room') %}
+              media-source://camera/camera.frigate_cam08
+            {% elif is_state('input_select.camera_dropdown', 'Back Yard') %}
+              media-source://camera/camera.frigate_cam12
+            {% elif is_state('input_select.camera_dropdown', 'Front Yard') %}
+              media-source://camera/camera.frigate_cam18
+            {% elif is_state('input_select.camera_dropdown', 'Front Door') %}
+              media-source://camera/camera.frigate_cam19
+            {% elif is_state('input_select.camera_dropdown', 'Front Room') %}
+              media-source://camera/camera.frigate_cam12
+            {% endif %}
+
+
+      - action: media_player.volume_set
+        data:
+          entity_id: "{{ media_player }}"
+          volume_level: 0.100
+
+      - action: media_player.play_media
+        target:
+          entity_id: "{{ media_player }}"
+        data:
+          media:
+            media_content_id: "{{ camera }}"
+            media_content_type: image/jpeg
+            # metadata:
+            #   title: Frigate Cam01
+            #   thumbnail: /api/camera_proxy/camera.frigate_cam01
+            #   media_class: video
+            #   children_media_class: null
+            #   navigateIds:
+            #     - {}
+            #     - media_content_type: app
+            #       media_content_id: media-source://camera
+            #   browse_entity_id: media_player.front_room_hub
+
       # - action: media_player.play_media
       #   target:
       #     entity_id: >
@@ -58,18 +114,6 @@ script:
       #       {% endif %}
       #     media_content_type: 'image/jpeg'
 
-      - action: media_player.volume_set
-        data:
-          entity_id: >
-            {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %}
-              media_player.front_room_hub
-            {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %}
-              media_player.girls_room_hub
-            {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %}
-              media_player.computer_area_hub
-            {% endif %}
-          volume_level: 0.100
-
       # - action: webrtc.dash_cast
       #   data:
       #     entity_id: >
@@ -82,60 +126,60 @@ script:
       #       {% endif %}
       #     url: >
       #       {% if is_state('input_select.camera_dropdown', 'Boys Room') %}
-      #         rtsp://192.168.1.11:8554/cam01_sub_opus
+      #         rtsp://192.168.1.11:8554/cam01_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Kitchen') %}
-      #         rtsp://192.168.1.11:8554/cam12_sub_opus
+      #         rtsp://192.168.1.11:8554/cam12_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Computer Area') %}
-      #         rtsp://192.168.1.11:8554/cam03_sub_opus
+      #         rtsp://192.168.1.11:8554/cam03_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Garage') %}
-      #         rtsp://192.168.1.11:8554/cam04_sub_opus
+      #         rtsp://192.168.1.11:8554/cam04_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %}
-      #         rtsp://192.168.1.11:8554/cam06_sub_opus
+      #         rtsp://192.168.1.11:8554/cam06_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Girls Room') %}
-      #         rtsp://192.168.1.11:8554/cam08_sub_opus
+      #         rtsp://192.168.1.11:8554/cam08_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Back Yard') %}
-      #         rtsp://192.168.1.11:8554/cam14_sub_opus
+      #         rtsp://192.168.1.11:8554/cam14_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Front Yard') %}
-      #         rtsp://192.168.1.11:8554/cam18_sub_opus
+      #         rtsp://192.168.1.11:8554/cam18_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Front Door') %}
-      #         rtsp://192.168.1.11:8554/cam19_sub_opus
+      #         rtsp://192.168.1.11:8554/cam19_sub
       #       {% elif is_state('input_select.camera_dropdown', 'Front Room') %}
-      #         rtsp://192.168.1.11:8554/cam13_sub_opus
+      #         rtsp://192.168.1.11:8554/cam13_sub
       #       {% endif %}
       #     force: true
       #     extra:
       #       mode: webrtc
 
-      - action: cast.show_lovelace_view
-        data:
-          entity_id: >
-            {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %}
-              media_player.front_room_hub
-            {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %}
-              media_player.girls_room_hub
-            {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %}
-              media_player.computer_area_hub
-            {% endif %}
-          dashboard_path: camera-casting-yml
-          view_path: >
-            {% if is_state('input_select.camera_dropdown', 'Boys Room') %}
-              boys-room-camera
-            {% elif is_state('input_select.camera_dropdown', 'Kitchen') %}
-              kitchen-camera
-            {% elif is_state('input_select.camera_dropdown', 'Computer Area') %}
-              computer-area-camera
-            {% elif is_state('input_select.camera_dropdown', 'Garage') %}
-              garage-camera
-            {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %}
-              mbr-camera
-            {% elif is_state('input_select.camera_dropdown', 'Girls Room') %}
-              girls-room-camera
-            {% elif is_state('input_select.camera_dropdown', 'Back Yard') %}
-              back-yard-camera
-            {% elif is_state('input_select.camera_dropdown', 'Front Yard') %}
-              front-yard-camera
-            {% elif is_state('input_select.camera_dropdown', 'Front Door') %}
-              front-porch-camera
-            {% elif is_state('input_select.camera_dropdown', 'Front Room') %}
-              front-room-camera
-            {% endif %}
+      # - action: cast.show_lovelace_view
+      #   data:
+      #     entity_id: >
+      #       {% if is_state('input_select.cast_to_screen_dropdown', 'Front Room Display') %}
+      #         media_player.front_room_hub
+      #       {% elif is_state('input_select.cast_to_screen_dropdown', 'Girls Room Hub') %}
+      #         media_player.girls_room_hub
+      #       {% elif is_state('input_select.cast_to_screen_dropdown', 'Computer Area Hub') %}
+      #         media_player.computer_area_hub
+      #       {% endif %}
+      #     dashboard_path: casting-yml
+      #     view_path: >
+      #       {% if is_state('input_select.camera_dropdown', 'Boys Room') %}
+      #         boys-room-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Kitchen') %}
+      #         kitchen-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Computer Area') %}
+      #         computer-area-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Garage') %}
+      #         garage-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Master Bedroom') %}
+      #         mbr-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Girls Room') %}
+      #         girls-room-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Back Yard') %}
+      #         back-yard-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Front Yard') %}
+      #         front-yard-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Front Door') %}
+      #         front-porch-camera
+      #       {% elif is_state('input_select.camera_dropdown', 'Front Room') %}
+      #         front-room-camera
+      #       {% endif %}

components/packages/fan.yaml

@@ -1 +0,0 @@
-fan: !include_dir_list ../fans

components/packages/google_assistant.yaml

@@ -52,25 +52,37 @@ google_assistant:
         - Computer Camera
       room: Computer Area
 
-    camera.frigate_cam13:
-      name: Front Room Camera
+    camera.frigate_cam12:
+      name: Kitchen Camera
       expose: true
       aliases:
-        - Front Room Cam
-      room: Front Room
+        - Kitchen Cam
+      room: Kitchen
 
     camera.frigate_cam08:
-      name: Nursery Camera
+      name: Girls Room Camera
       expose: true
       aliases:
-        - Baby Cam
-        - Baby Monitor
-        - Kids Cam
-        - Kids Room Camera
         - Nursery Cam
-        - Baby Monitor Cam
+        - Bridgets Cam
         - Baby Monitor Camera
-      room: Nursery
+      room: Girls Room
+
+    camera.frigate_cam01:
+      name: Boys Room Camera
+      expose: true
+      aliases:
+        - Blue Room Camera
+        - Emmetts Cam
+      room: Boys Room
+
+    camera.frigate_cam18:
+      name: Front Yard Camera
+      expose: true
+      aliases:
+        - Driveway Camera
+        - Out Front Cam
+      room: Front Yard
 
     input_boolean.announcement_pending:
       name: Announcement Pending

components/packages/hvac_stats.yaml

@@ -6,7 +6,7 @@ sensor:
       - sensor.master_bedroom_multisensor_air_temperature
       - sensor.girls_room_multisensor_air_temperature
       - sensor.thermostat_temperature
-      - sensor.bar_temperature
+      - sensor.bar_hue_motion_sensor_temperature
       - sensor.front_room_thermostat_temperature
       - sensor.kitchen_multisensor_air_temperature
 
@@ -17,7 +17,7 @@ sensor:
       - sensor.master_bedroom_multisensor_air_temperature
       - sensor.girls_room_multisensor_air_temperature
       - sensor.thermostat_temperature
-      - sensor.bar_temperature
+      - sensor.bar_hue_motion_sensor_temperature
       - sensor.front_room_thermostat_temperature
       - sensor.kitchen_multisensor_air_temperature
 
@@ -28,7 +28,7 @@ sensor:
   #     - sensor.master_bedroom_multisensor_air_temperature
   #     - sensor.girls_room_multisensor_air_temperature
   #     - sensor.thermostat_temperature
-  #     - sensor.bar_temperature
+  #     - sensor.bar_hue_motion_sensor_temperature
   #     - sensor.front_room_thermostat_temperature
   #     - sensor.kitchen_multisensor_air_temperature
 

components/packages/lovelace.yaml

@@ -32,12 +32,12 @@ lovelace:
       icon: mdi:camcorder
       show_in_sidebar: false
       filename: ui-cams.yaml
-    camera-casting-yml:
+    casting-yml:
       mode: yaml
-      title: Camera Casting
+      title: Casting
       icon: mdi:cast
       show_in_sidebar: false
-      filename: ui-camera-cast.yaml
+      filename: ui-cast.yaml
     details-yml:
       mode: yaml
       title: Details

components/packages/naturally_lit_rooms.yaml

@@ -65,7 +65,7 @@ template:
         entity_id: input_number.deck_light_level_trigger
 
       - platform: state
-        entity_id: sensor.deck_light_level
+        entity_id: sensor.deck_hue_motion_sensor_illuminance
 
     binary_sensor:
       - name: "Deck Naturally Lit"
@@ -75,15 +75,15 @@ template:
         delay_off:
           seconds: 3
         state: >
-          {{ states('sensor.deck_light_level') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) }}
+          {{ states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) }}
         icon: >
-          {% if states('sensor.deck_light_level') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) %}
+          {% if states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.deck_light_level_trigger') | float(default=0) %}
           mdi:weather-sunny
           {% else %}
           mdi:weather-sunny-off
           {% endif %}
         attributes:
-          illuminance: "{{ states('sensor.deck_light_level') | float(default=0) }}"
+          illuminance: "{{ states('sensor.deck_hue_motion_sensor_illuminance') | float(default=0) }}"
           trigger: "{{ states('input_number.deck_light_level_trigger') | float(default=0) }}"
 
   - trigger:
@@ -128,7 +128,7 @@ template:
         entity_id: input_number.entryway_light_level_trigger
 
       - platform: state
-        entity_id: sensor.entryway_light_level
+        entity_id: sensor.entryway_hue_motion_sensor_illuminance
 
     binary_sensor:
       - name: "Entryway Naturally Lit"
@@ -138,15 +138,15 @@ template:
         delay_off:
           seconds: 3
         state: >
-          {{ states('sensor.entryway_light_level') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) }}
+          {{ states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) }}
         icon: >
-          {% if states('sensor.entryway_light_level') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) %}
+          {% if states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.entryway_light_level_trigger') | float(default=0) %}
           mdi:weather-sunny
           {% else %}
           mdi:weather-sunny-off
           {% endif %}
         attributes:
-          illuminance: "{{ states('sensor.entryway_light_level') | float(default=0) }}"
+          illuminance: "{{ states('sensor.entryway_hue_motion_sensor_illuminance') | float(default=0) }}"
           trigger: "{{ states('input_number.entryway_light_level_trigger') | float(default=0) }}"
 
   - trigger:
@@ -157,7 +157,7 @@ template:
         entity_id: input_number.front_porch_light_level_trigger
 
       - platform: state
-        entity_id: sensor.front_porch_light_level
+        entity_id: sensor.front_porch_hue_motion_sensor_illuminance
 
     binary_sensor:
       - name: "Front Porch Naturally Lit"
@@ -167,15 +167,15 @@ template:
         delay_off:
           seconds: 3
         state: >
-          {{ states('sensor.front_porch_light_level') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) }}
+          {{ states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) }}
         icon: >
-          {% if states('sensor.front_porch_light_level') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) %}
+          {% if states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_porch_light_level_trigger') | float(default=0) %}
           mdi:weather-sunny
           {% else %}
           mdi:weather-sunny-off
           {% endif %}
         attributes:
-          illuminance: "{{ states('sensor.front_porch_light_level') | float(default=0) }}"
+          illuminance: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | float(default=0) }}"
           trigger: "{{ states('input_number.front_porch_light_level_trigger') | float(default=0) }}"
 
   - trigger:
@@ -186,7 +186,7 @@ template:
         entity_id: input_number.front_room_light_level_trigger
 
       - platform: state
-        entity_id: sensor.front_room_light_level
+        entity_id: sensor.front_room_hue_motion_sensor_illuminance
 
     binary_sensor:
       - name: "Front Room Naturally Lit"
@@ -196,15 +196,15 @@ template:
         delay_off:
           seconds: 3
         state: >
-          {{ states('sensor.front_room_light_level') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) }}
+          {{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) }}
         icon: >
-          {% if states('sensor.front_room_light_level') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) %}
+          {% if states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) > states('input_number.front_room_light_level_trigger') | float(default=0) %}
           mdi:weather-sunny
           {% else %}
           mdi:weather-sunny-off
           {% endif %}
         attributes:
-          illuminance: "{{ states('sensor.front_room_light_level') | float(default=0) }}"
+          illuminance: "{{ states('sensor.front_room_hue_motion_sensor_illuminance') | float(default=0) }}"
           trigger: "{{ states('input_number.front_room_light_level_trigger') | float(default=0) }}"
 
   - trigger:

components/packages/rtl_433_devices/back_yard_thermostat.yaml

@@ -1,53 +1,53 @@
-mqtt:
-  sensor:
-    - name: "Timestamp"
-      device_class: timestamp
-      icon: mdi:clock-in
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/time"
-      entity_category: diagnostic
-      unique_id: acurite-tower-1-a-time
-      device:
-        identifiers: acurite-tower-1-a
-        name: Back Yard Thermostat
-        model: Tower
-        manufacturer: Acurite
-
-    - name: "Battery"
-      device_class: battery
-      unit_of_measurement: "%"
-      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
-      state_class: measurement
-      entity_category: diagnostic
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/battery_ok"
-      unique_id: acurite-tower-1-a-battery-ok
-      device:
-        identifiers: acurite-tower-1-a
-        name: Back Yard Thermostat
-        model: Tower
-        manufacturer: Acurite
-
-    - name: "Temperature"
-      device_class: temperature
-      unit_of_measurement: "°C"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/temperature_C"
-      unique_id: acurite-tower-1-a-temperature-c
-      device:
-        identifiers: acurite-tower-1-a
-        name: Back Yard Thermostat
-        model: Tower
-        manufacturer: Acurite
-
-    - name: "Humidity"
-      device_class: humidity
-      unit_of_measurement: "%"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/humidity"
-      unique_id: acurite-tower-1-a-humidity
-      device:
-        identifiers: acurite-tower-1-a
-        name: Back Yard Thermostat
-        model: Tower
-        manufacturer: Acurite
+mqtt:
+  sensor:
+    - name: "Timestamp"
+      device_class: timestamp
+      icon: mdi:clock-in
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/time"
+      entity_category: diagnostic
+      unique_id: acurite-tower-1-a-time
+      device:
+        identifiers: acurite-tower-1-a
+        name: Back Yard Thermostat
+        model: Tower
+        manufacturer: Acurite
+
+    - name: "Battery"
+      device_class: battery
+      unit_of_measurement: "%"
+      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
+      state_class: measurement
+      entity_category: diagnostic
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/battery_ok"
+      unique_id: acurite-tower-1-a-battery-ok
+      device:
+        identifiers: acurite-tower-1-a
+        name: Back Yard Thermostat
+        model: Tower
+        manufacturer: Acurite
+
+    - name: "Temperature"
+      device_class: temperature
+      unit_of_measurement: "°C"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/temperature_C"
+      unique_id: acurite-tower-1-a-temperature-c
+      device:
+        identifiers: acurite-tower-1-a
+        name: Back Yard Thermostat
+        model: Tower
+        manufacturer: Acurite
+
+    - name: "Humidity"
+      device_class: humidity
+      unit_of_measurement: "%"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Acurite-Tower/A/6162/humidity"
+      unique_id: acurite-tower-1-a-humidity
+      device:
+        identifiers: acurite-tower-1-a
+        name: Back Yard Thermostat
+        model: Tower
+        manufacturer: Acurite

components/packages/rtl_433_devices/chevrolet_traverse_lt_awd.yaml

@@ -1,12 +1,12 @@
-mqtt:
-  device_tracker:
-    - name: "Location"
-      icon: mdi:car-estate
-      json_attributes_topic: "cleverdevices/clever_traverse/attributes"
-      unique_id: chevrolet-traverse-lt-awd
-      device:
-        name: Chevrolet Traverse
-        identifiers: chevrolet-traverse-lt-awd
-        model_id: LT AWD
-        model: Traverse
-        manufacturer: Chevrolet
+mqtt:
+  device_tracker:
+    - name: "Location"
+      icon: mdi:car-estate
+      json_attributes_topic: "cleverdevices/clever_traverse/attributes"
+      unique_id: chevrolet-traverse-lt-awd
+      device:
+        name: Chevrolet Traverse
+        identifiers: chevrolet-traverse-lt-awd
+        model_id: LT AWD
+        model: Traverse
+        manufacturer: Chevrolet

components/packages/rtl_433_devices/daisy_soil_sensor.yaml

@@ -1,42 +1,42 @@
-mqtt:
-  sensor:
-    - name: "Timestamp"
-      device_class: timestamp
-      icon: mdi:clock-in
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/time"
-      entity_category: diagnostic
-      unique_id: fine-offset-wh51-daisy-time
-      device:
-        identifiers: ecowitt-wh51-daisy
-        name: Daisy Soil Sensor
-        model: WH51
-        manufacturer: Ecowitt
-
-    - name: "Battery"
-      device_class: battery
-      unit_of_measurement: "%"
-      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
-      state_class: measurement
-      entity_category: diagnostic
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/battery_ok"
-      unique_id: fine-offset-wh51-battery-ok
-      device:
-        identifiers: ecowitt-wh51-daisy
-        name: Daisy Soil Sensor
-        model: WH51
-        manufacturer: Ecowitt
-
-    - name: "Moisture"
-      device_class: moisture
-      unit_of_measurement: "%"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/moisture"
-      unique_id: fine-offset-wh51-daisy-moisture
-      device:
-        identifiers: ecowitt-wh51-daisy
-        name: Daisy Soil Sensor
-        model: WH51
-        manufacturer: Ecowitt
-
-
+mqtt:
+  sensor:
+    - name: "Timestamp"
+      device_class: timestamp
+      icon: mdi:clock-in
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/time"
+      entity_category: diagnostic
+      unique_id: fine-offset-wh51-daisy-time
+      device:
+        identifiers: ecowitt-wh51-daisy
+        name: Daisy Soil Sensor
+        model: WH51
+        manufacturer: Ecowitt
+
+    - name: "Battery"
+      device_class: battery
+      unit_of_measurement: "%"
+      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
+      state_class: measurement
+      entity_category: diagnostic
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/battery_ok"
+      unique_id: fine-offset-wh51-battery-ok
+      device:
+        identifiers: ecowitt-wh51-daisy
+        name: Daisy Soil Sensor
+        model: WH51
+        manufacturer: Ecowitt
+
+    - name: "Moisture"
+      device_class: moisture
+      unit_of_measurement: "%"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/00e1cd/moisture"
+      unique_id: fine-offset-wh51-daisy-moisture
+      device:
+        identifiers: ecowitt-wh51-daisy
+        name: Daisy Soil Sensor
+        model: WH51
+        manufacturer: Ecowitt
+
+

components/packages/rtl_433_devices/front_yard_thermostat.yaml

@@ -1,53 +1,53 @@
-mqtt:
-  sensor:
-    - name: "Timestamp"
-      device_class: timestamp
-      icon: mdi:clock-in
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/time"
-      entity_category: diagnostic
-      unique_id: lacrosse-tx141thbv2-0-time
-      device:
-        identifiers: lacrosse-tx141thbv2-0
-        name: Front Yard Thermostat
-        model: TX141THBv2
-        manufacturer: LaCrosse
-
-    - name: "Battery"
-      device_class: battery
-      unit_of_measurement: "%"
-      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
-      state_class: measurement
-      entity_category: diagnostic
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/battery_ok"
-      unique_id: lacrosse-tx141thbv2-0-battery-ok
-      device:
-        identifiers: lacrosse-tx141thbv2-0
-        name: Front Yard Thermostat
-        model: TX141THBv2
-        manufacturer: LaCrosse
-
-    - name: "Temperature"
-      device_class: temperature
-      unit_of_measurement: "°C"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/temperature_C"
-      unique_id: lacrosse-tx141thbv2-0-temperature-c
-      device:
-        identifiers: lacrosse-tx141thbv2-0
-        name: Front Yard Thermostat
-        model: TX141THBv2
-        manufacturer: LaCrosse
-
-    - name: "Humidity"
-      device_class: humidity
-      unit_of_measurement: "%"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/humidity"
-      unique_id: lacrosse-tx141thbv2-0-humidity
-      device:
-        identifiers: lacrosse-tx141thbv2-0
-        name: Front Yard Thermostat
-        model: TX141THBv2
+mqtt:
+  sensor:
+    - name: "Timestamp"
+      device_class: timestamp
+      icon: mdi:clock-in
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/time"
+      entity_category: diagnostic
+      unique_id: lacrosse-tx141thbv2-0-time
+      device:
+        identifiers: lacrosse-tx141thbv2-0
+        name: Front Yard Thermostat
+        model: TX141THBv2
+        manufacturer: LaCrosse
+
+    - name: "Battery"
+      device_class: battery
+      unit_of_measurement: "%"
+      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
+      state_class: measurement
+      entity_category: diagnostic
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/battery_ok"
+      unique_id: lacrosse-tx141thbv2-0-battery-ok
+      device:
+        identifiers: lacrosse-tx141thbv2-0
+        name: Front Yard Thermostat
+        model: TX141THBv2
+        manufacturer: LaCrosse
+
+    - name: "Temperature"
+      device_class: temperature
+      unit_of_measurement: "°C"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/temperature_C"
+      unique_id: lacrosse-tx141thbv2-0-temperature-c
+      device:
+        identifiers: lacrosse-tx141thbv2-0
+        name: Front Yard Thermostat
+        model: TX141THBv2
+        manufacturer: LaCrosse
+
+    - name: "Humidity"
+      device_class: humidity
+      unit_of_measurement: "%"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/LaCrosse-TX141THBv2/0/233/humidity"
+      unique_id: lacrosse-tx141thbv2-0-humidity
+      device:
+        identifiers: lacrosse-tx141thbv2-0
+        name: Front Yard Thermostat
+        model: TX141THBv2
         manufacturer: LaCrosse

components/packages/rtl_433_devices/hasta_soil_sensor.yaml

@@ -1,40 +1,40 @@
-mqtt:
-  sensor:
-    - name: "Timestamp"
-      device_class: timestamp
-      icon: mdi:clock-in
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/time"
-      entity_category: diagnostic
-      unique_id: fine-offset-wh51-hasta-time
-      device:
-        identifiers: ecowitt-wh51-hasta
-        name: Hasta Soil Sensor
-        model: WH51
-        manufacturer: Ecowitt
-
-    - name: "Battery"
-      device_class: battery
-      unit_of_measurement: "%"
-      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
-      state_class: measurement
-      entity_category: diagnostic
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/battery_ok"
-      unique_id: fine-offset-wh51-hasta-battery-ok
-      device:
-        identifiers: ecowitt-wh51-hasta
-        name: Hasta Soil Sensor
-        model: WH51
-        manufacturer: Ecowitt
-
-    - name: "Moisture"
-      device_class: moisture
-      unit_of_measurement: "%"
-      value_template: "{{ value|float }}"
-      state_class: measurement
-      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/moisture"
-      unique_id: fine-offset-wh51-0ce593-moisture
-      device:
-        identifiers: ecowitt-wh51-hasta
-        name: Hasta Soil Sensor
-        model: WH51
+mqtt:
+  sensor:
+    - name: "Timestamp"
+      device_class: timestamp
+      icon: mdi:clock-in
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/time"
+      entity_category: diagnostic
+      unique_id: fine-offset-wh51-hasta-time
+      device:
+        identifiers: ecowitt-wh51-hasta
+        name: Hasta Soil Sensor
+        model: WH51
+        manufacturer: Ecowitt
+
+    - name: "Battery"
+      device_class: battery
+      unit_of_measurement: "%"
+      value_template: "{{ (float(value) * 99 + 1) | round(0) }}"
+      state_class: measurement
+      entity_category: diagnostic
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/battery_ok"
+      unique_id: fine-offset-wh51-hasta-battery-ok
+      device:
+        identifiers: ecowitt-wh51-hasta
+        name: Hasta Soil Sensor
+        model: WH51
+        manufacturer: Ecowitt
+
+    - name: "Moisture"
+      device_class: moisture
+      unit_of_measurement: "%"
+      value_template: "{{ value|float }}"
+      state_class: measurement
+      state_topic: "rtl_433/9b13b3f4-rtl433/devices/Fineoffset-WH51/0ce593/moisture"
+      unique_id: fine-offset-wh51-0ce593-moisture
+      device:
+        identifiers: ecowitt-wh51-hasta
+        name: Hasta Soil Sensor
+        model: WH51
         manufacturer: Ecowitt

components/packages/rtl_433_devices/podein_devices.yaml

@@ -1,11 +1,11 @@
-mqtt:
-  device_tracker:
-    - name: Kristy's Phone
-      icon: mdi:cellphone
-      json_attributes_topic: "cleverdevices/kristy_s_phone/attributes"
-      unique_id: kristys-phone
-
-    - name: nmap_tracker_fe_cf_82_b2_22_e0
-      icon: mdi:cellphone
-      json_attributes_topic: "cleverdevices/marshalls_phone/attributes"
+mqtt:
+  device_tracker:
+    - name: Kristy's Phone
+      icon: mdi:cellphone
+      json_attributes_topic: "cleverdevices/kristy_s_phone/attributes"
+      unique_id: kristys-phone
+
+    - name: nmap_tracker_fe_cf_82_b2_22_e0
+      icon: mdi:cellphone
+      json_attributes_topic: "cleverdevices/marshalls_phone/attributes"
       unique_id: marshalls-phone

components/packages/rtl_433_devices/tpms.yaml

@@ -1,112 +1,112 @@
-mqtt:
-  sensor:
-      - name: "Timestamp"
-        device_class: timestamp
-        icon: mdi:clock-in
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/time"
-        entity_category: diagnostic
-        unique_id: schrader-0d0d33-time
-        device:
-          name: "Tire 1"
-          identifiers: schrader-0d0d33
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Pressure"
-        device_class: pressure
-        unit_of_measurement: "kPa"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/pressure_kPa"
-        unique_id: schrader-0d0d33-pressure-kpa
-        device:
-          name: "Tire 1"
-          identifiers: schrader-0d0d33
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Temperature"
-        device_class: temperature
-        unit_of_measurement: "°C"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/temperature_C"
-        unique_id: schrader-0d0d33-temperature-c
-        device:
-          name: "Tire 1"
-          identifiers: schrader-0d0d33
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Timestamp"
-        device_class: timestamp
-        icon: mdi:clock-in
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/time"
-        entity_category: diagnostic
-        unique_id: schrader-0d31a0-time
-        device:
-          name: "Tire 2"
-          identifiers: schrader-0d31a0
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Pressure"
-        device_class: pressure
-        unit_of_measurement: "kPa"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/pressure_kPa"
-        unique_id: schrader-0d31a0-pressure-kpa
-        device:
-          name: "Tire 2"
-          identifiers: schrader-0d31a0
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Temperature"
-        device_class: temperature
-        unit_of_measurement: "°C"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/temperature_C"
-        unique_id: schrader-0d31a0-temperature-c
-        device:
-          name: "Tire 2"
-          identifiers: schrader-0d31a0
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Timestamp"
-        device_class: timestamp
-        icon: mdi:clock-in
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/time"
-        entity_category: diagnostic
-        unique_id: schrader-0d1909-time
-        device:
-          name: "Tire 3"
-          identifiers: schrader-0d1909
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Pressure"
-        device_class: pressure
-        unit_of_measurement: "kPa"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/pressure_kPa"
-        unique_id: schrader-0d1909-pressure-kpa
-        device:
-          name: "Tire 3"
-          identifiers: schrader-0d1909
-          via_device: chevrolet-traverse-lt-awd
-
-      - name: "Temperature"
-        device_class: temperature
-        unit_of_measurement: "°C"
-        value_template: "{{ value|float }}"
-        state_class: measurement
-        entity_category: diagnostic
-        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/temperature_C"
-        unique_id: schrader-0d1909-temperature-c
-        device:
-          name: "Tire 3"
-          identifiers: schrader-0d1909
+mqtt:
+  sensor:
+      - name: "Timestamp"
+        device_class: timestamp
+        icon: mdi:clock-in
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/time"
+        entity_category: diagnostic
+        unique_id: schrader-0d0d33-time
+        device:
+          name: "Tire 1"
+          identifiers: schrader-0d0d33
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Pressure"
+        device_class: pressure
+        unit_of_measurement: "kPa"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/pressure_kPa"
+        unique_id: schrader-0d0d33-pressure-kpa
+        device:
+          name: "Tire 1"
+          identifiers: schrader-0d0d33
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Temperature"
+        device_class: temperature
+        unit_of_measurement: "°C"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D0D33/temperature_C"
+        unique_id: schrader-0d0d33-temperature-c
+        device:
+          name: "Tire 1"
+          identifiers: schrader-0d0d33
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Timestamp"
+        device_class: timestamp
+        icon: mdi:clock-in
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/time"
+        entity_category: diagnostic
+        unique_id: schrader-0d31a0-time
+        device:
+          name: "Tire 2"
+          identifiers: schrader-0d31a0
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Pressure"
+        device_class: pressure
+        unit_of_measurement: "kPa"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/pressure_kPa"
+        unique_id: schrader-0d31a0-pressure-kpa
+        device:
+          name: "Tire 2"
+          identifiers: schrader-0d31a0
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Temperature"
+        device_class: temperature
+        unit_of_measurement: "°C"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D31A0/temperature_C"
+        unique_id: schrader-0d31a0-temperature-c
+        device:
+          name: "Tire 2"
+          identifiers: schrader-0d31a0
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Timestamp"
+        device_class: timestamp
+        icon: mdi:clock-in
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/time"
+        entity_category: diagnostic
+        unique_id: schrader-0d1909-time
+        device:
+          name: "Tire 3"
+          identifiers: schrader-0d1909
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Pressure"
+        device_class: pressure
+        unit_of_measurement: "kPa"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/pressure_kPa"
+        unique_id: schrader-0d1909-pressure-kpa
+        device:
+          name: "Tire 3"
+          identifiers: schrader-0d1909
+          via_device: chevrolet-traverse-lt-awd
+
+      - name: "Temperature"
+        device_class: temperature
+        unit_of_measurement: "°C"
+        value_template: "{{ value|float }}"
+        state_class: measurement
+        entity_category: diagnostic
+        state_topic: "rtl_433/9b13b3f4-rtl433/devices/TPMS/Schrader-EG53MA4/0D1909/temperature_C"
+        unique_id: schrader-0d1909-temperature-c
+        device:
+          name: "Tire 3"
+          identifiers: schrader-0d1909
           via_device: chevrolet-traverse-lt-awd

components/packages/template_binary_sensors.yaml

@@ -212,9 +212,9 @@ template:
           minutes: 5
         state: >-
           {% if is_state('binary_sensor.patio_door_contact', 'on') or is_state('group.my_exterior_windows', 'on') or is_state('binary_sensor.front_door_contact', 'on') %}
-            {% if is_state_attr('climate.thermostat', 'hvac_action', 'cooling') and states('sensor.master_bedroom_multisensor_air_temperature') | int < states('sensor.front_porch_temperature') | int %}
+            {% if is_state_attr('climate.thermostat', 'hvac_action', 'cooling') and states('sensor.master_bedroom_multisensor_air_temperature') | int < states('sensor.front_porch_hue_motion_sensor_temperature') | int %}
               {{'true'}}
-            {% elif is_state_attr('climate.thermostat', 'hvac_action', 'heating') and states('sensor.master_bedroom_multisensor_air_temperature') | int > states('sensor.front_porch_temperature') | int %}
+            {% elif is_state_attr('climate.thermostat', 'hvac_action', 'heating') and states('sensor.master_bedroom_multisensor_air_temperature') | int > states('sensor.front_porch_hue_motion_sensor_temperature') | int %}
               {{'true'}}
             {% else %}
               {{'false'}}
@@ -297,7 +297,7 @@ template:
         default_entity_id: binary_sensor.temp_just_right
         name: Temp Just Right
         state: >-
-          {% if states('sensor.front_porch_temperature') | float(default=0) > 50 and states('sensor.front_porch_temperature') | float(default=0) < 90 %}
+          {% if states('sensor.front_porch_hue_motion_sensor_temperature') | float(default=0) > 50 and states('sensor.front_porch_hue_motion_sensor_temperature') | float(default=0) < 90 %}
             {{'true'}}
           {% else %}
             {{ 'false' }}
@@ -306,17 +306,17 @@ template:
       - unique_id: templatebinarysensor.is_dark
         default_entity_id: binary_sensor.is_dark
         name: Is Dark
-        state: "{{ (states('sensor.front_porch_light_level') | int(0) < states('input_number.is_dark') | int(0)) or (states('sensor.front_porch_light_level') | int(0) < 30 and is_state('light.front_porch_overhead','on')) }}"
+        state: "{{ (states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < states('input_number.is_dark') | int(0)) or (states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < 30 and is_state('light.front_porch_overhead','on')) }}"
 
       - unique_id: templatebinarysensor.is_dim
         default_entity_id: binary_sensor.is_dim
         name: Is Dim
-        state: "{{ states('sensor.front_porch_light_level') | int(0) >= states('input_number.is_dark') | int(0) and states('sensor.front_porch_light_level') | int(0) < states('input_number.is_daylight') | int(0) }}"
+        state: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) >= states('input_number.is_dark') | int(0) and states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) < states('input_number.is_daylight') | int(0) }}"
 
       - unique_id: templatebinarysensor.is_daylight
         default_entity_id: binary_sensor.is_daylight
         name: Is Daylight
-        state: "{{ states('sensor.front_porch_light_level') | int(0) >= states('input_number.is_daylight') | int(0) }}"
+        state: "{{ states('sensor.front_porch_hue_motion_sensor_illuminance') | int(0) >= states('input_number.is_daylight') | int(0) }}"
 
       - unique_id: templatebinarysensor.garage_open_nobody_home
         default_entity_id: binary_sensor.garage_open_nobody_home
@@ -515,7 +515,7 @@ template:
       - unique_id: templatebinarysensor.dining_room_light_left_on
         default_entity_id: binary_sensor.dining_room_light_left_on
         name: Dining Room Light Left On
-        state: "{{ is_state('light.dining_room_switch','on') and is_state('input_boolean.dining_room_occupied','off') }}"
+        state: "{{ is_state('light.dining_room','on') and is_state('input_boolean.dining_room_occupied','off') }}"
         delay_on:
           seconds: 30
 
@@ -557,14 +557,14 @@ template:
       - unique_id: templatebinarysensor.master_bathroom_light_left_on
         default_entity_id: binary_sensor.master_bathroom_light_left_on
         name: Master Bathroom Light Left On
-        state: "{{ is_state('light.master_bathroom_hue','on') and is_state('input_boolean.master_bathroom_occupied','off') }}"
+        state: "{{ is_state('light.master_bathroom_hue','on') and is_state('input_boolean.bathroom_occupied','off') }}"
         delay_on:
           seconds: 30
 
       - unique_id: templatebinarysensor.master_bedroom_light_left_on
         default_entity_id: binary_sensor.master_bedroom_light_left_on
         name: Master Bedroom Light Left On
-        state: "{{ is_state('light.master_bedroom_hue','on') and is_state('input_boolean.master_bedroom_occupied','off') }}"
+        state: "{{ is_state('light.master_bedroom_hue','on') and is_state('input_boolean.bedroom_occupied','off') }}"
         delay_on:
           seconds: 30
 

components/packages/template_fans.yaml

@@ -1,27 +1,27 @@
 template:
-- fan:
-  - unique_id: template_fan.utility_room_vent
-    turn_on:
-    - action: switch.turn_on
-      entity_id:
-      - switch.utility_room_vent_switch
-    turn_off:
-    - action: switch.turn_off
-      entity_id:
-      - switch.utility_room_vent_switch
-    default_entity_id: fan.utility_room_vent
-    name: Utility Room Vent
-    state: "{{ states('switch.utility_room_vent_switch') }}"
+  - fan:
+      - unique_id: template_fan.utility_room_vent
+        turn_on:
+          - action: switch.turn_on
+            entity_id:
+              - switch.utility_room_vent_switch
+        turn_off:
+          - action: switch.turn_off
+            entity_id:
+              - switch.utility_room_vent_switch
+        default_entity_id: fan.utility_room_vent
+        name: Utility Room Vent
+        state: "{{ states('switch.utility_room_vent_switch') }}"
 
-  - unique_id: templatefan.bathroom_vent
-    turn_on:
-    - action: switch.turn_on
-      entity_id:
-      - switch.bathroom_vent_switch
-    turn_off:
-    - action: switch.turn_off
-      entity_id:
-      - switch.bathroom_vent_switch
-    default_entity_id: fan.bathroom_vent
-    name: Bathroom Vent
-    state: "{{ states('switch.bathroom_vent_switch') }}"
+      - unique_id: templatefan.bathroom_vent
+        turn_on:
+          - action: switch.turn_on
+            entity_id:
+              - switch.master_bathroom_vent_switch
+        turn_off:
+          - action: switch.turn_off
+            entity_id:
+              - switch.master_bathroom_vent_switch
+        default_entity_id: fan.bathroom_vent
+        name: Bathroom Vent
+        state: "{{ states('switch.master_bathroom_vent_switch') }}"

components/packages/template_sensors.yaml

@@ -213,8 +213,8 @@ template:
       - unique_id: temlatesensor.open_external_doors_count
         default_entity_id: sensor.open_external_doors_count
         name: Open External Doors
-        state: "{{ (expand('group.my_exterior_doors') | selectattr('state', 'eq', 'on')) | list | count |int(default=0) }}"
-        icon: "{{ iif(is_state('group.my_exterior_windows', 'on'), 'mdi:door-open','mdi:door') }}"
+        state: "{{ (expand('binary_sensor.exterior_doors') | selectattr('state', 'eq', 'on')) | list | count |int(default=0) }}"
+        icon: "{{ iif(is_state('binary_sensor.exterior_doors', 'on'), 'mdi:door-open','mdi:door') }}"
 
       - unique_id: temlatesensor.frigate_person_count
         default_entity_id: sensor.frigate_person_count

components/packages/weather_forecast_templates.yaml

@@ -31,20 +31,20 @@ template:
         data:
           type: daily
         target:
-          entity_id: weather.forecast_home
+          entity_id: weather.home
         response_variable: daily
 
       - action: weather.get_forecasts
         data:
           type: hourly
         target:
-          entity_id: weather.forecast_home
+          entity_id: weather.home
         response_variable: hourly
 
     binary_sensor:
       - name: "Impending Rain"
         unique_id: templatebinarysensor.impending_rain
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
         icon: mdi:weather-rainy
         # This looks too far into the future. Cutting it down a bit
         state: >-
@@ -53,8 +53,8 @@ template:
           {%- set ns = namespace() -%}
           {%- set ns.totalprecipitation = 0 -%}
           {%- for daypart in range(0, 8) -%}
-            {%- set precipitation = hourly['weather.forecast_home'].forecast[daypart].precipitation -%}
-            {%- set wind_speed = hourly['weather.forecast_home'].forecast[daypart].wind_speed -%}
+            {%- set precipitation = hourly['weather.home'].forecast[daypart].precipitation -%}
+            {%- set wind_speed = hourly['weather.home'].forecast[daypart].wind_speed -%}
             {% if wind_speed > states('input_number.wind_speed_blowing_rain') |float(default=0) %}
               {%- set upcoming_precipitation = precipitation -%}
             {%- endif -%}
@@ -67,14 +67,14 @@ template:
         unique_id: "custom_sensor.sprinkler_total_expected_precipitation"
         icon: mdi:weather-pouring
         unit_of_measurement: mm
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
         state: >
           {%- set totalprecipitation = 0 | float -%}
           {%- set upcoming_precipitation = 0 | float -%}
           {%- set ns = namespace() -%}
           {%- set ns.totalprecipitation = 0 -%}
           {%- for daypart in range(0, 5) -%}
-            {%- set precipitation = daily['weather.forecast_home'].forecast[daypart].precipitation * 25.4 -%}
+            {%- set precipitation = daily['weather.home'].forecast[daypart].precipitation * 25.4 -%}
             {%- set upcoming_precipitation = precipitation -%}
             {%- set ns.totalprecipitation = ns.totalprecipitation + upcoming_precipitation -%}
           {%- endfor %}
@@ -83,36 +83,36 @@ template:
       - name: "Today's Low Temperature"
         unique_id: templatesensor.templow_today
         unit_of_measurement: °F
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-        state: "{{ daily['weather.forecast_home'].forecast[0].templow }}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+        state: "{{ daily['weather.home'].forecast[0].templow }}"
 
       - name: "Today's High Temperature"
         unique_id: templatesensor.temphigh_today
         unit_of_measurement: °F
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-        state: "{{ daily['weather.forecast_home'].forecast[0].temperature}}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+        state: "{{ daily['weather.home'].forecast[0].temperature}}"
 
       # - name: "Today's Chance of Precipitation"
       #   unique_id: templatesensor.precip_chance_today
       #   icon: mdi:cloud-percent
       #   unit_of_measurement: '%'
-      #   availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-      #   state: "{{ daily['weather.forecast_home'].forecast[0].precipitation_probability}}"
+      #   availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+      #   state: "{{ daily['weather.home'].forecast[0].precipitation_probability}}"
 
       - name: "Tomorrow's Low Temperature"
         unique_id: templatesensor.templow_tomorrow
         unit_of_measurement: °F
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-        state: "{{ daily['weather.forecast_home'].forecast[1].templow}}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+        state: "{{ daily['weather.home'].forecast[1].templow}}"
 
       - name: "Tomorrow's High Temperature"
         unique_id: templatesensor.temphigh_tomorrow
         unit_of_measurement: °F
-        availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-        state: "{{ daily['weather.forecast_home'].forecast[1].temperature}}"
+        availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+        state: "{{ daily['weather.home'].forecast[1].temperature}}"
       # - name: "Tomorrow's Chance of Precipitation"
       #   unique_id: templatesensor.precip_chance_tomorrow
       #   icon: mdi:cloud-percent
       #   unit_of_measurement: '%'
-      #   availability: "{{ states('weather.forecast_home') not in ['unknown', 'unavailable'] }}"
-      #   state: "{{ daily['weather.forecast_home'].forecast[1].precipitation_probability}}"
+      #   availability: "{{ states('weather.home') not in ['unknown', 'unavailable'] }}"
+      #   state: "{{ daily['weather.home'].forecast[1].precipitation_probability}}"

components/packages/zwave_nodes.yaml

@@ -1,7 +1,8 @@
 template:
   - sensor:
-      - name: "Alive ZWave Devices"
+      - name: "ZWave: All Devices"
         unique_id: template_sensor_alive_zwave
+        icon: mdi:z-wave
         state: >-
           {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") |
               selectattr('state', 'in', 'alive') |
@@ -9,14 +10,14 @@ template:
 
       - name: "Dead ZWave Devices"
         unique_id: template_sensor_failed_zwave
+        icon: mdi:z-wave
         state: >-
-          {% if states('sensor.alive_zwave_devices')|int(default=0) > 0 %}
+          {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") |
+              selectattr('state', 'in', 'alive') | map(attribute='entity_id')| list | count | int(default=0)}}
+        attributes:
+          devices: >-
             {{ expand(integration_entities('Z-Wave JS') )| selectattr("entity_id", "search", "node_status") |
-                selectattr('state', 'in', 'dead') |
-                map(attribute='entity_id')| list | count | int(default=0)}}
-          {% else %}
-            0
-          {% endif %}
+                selectattr('state', 'in', 'alive') | map(attribute='entity_id')| list }}
 
 automation:
   - id: automation_alert_failed_zwave_nodes