Bunches of fixes nd changes

automations/people/Ebin/ebin_home.yaml

@@ -14,7 +14,7 @@ condition:
     conditions:
       - condition: state
         entity_id: binary_sensor.have_custody
-        state: "off"
+        state: "on"
       - condition: state
         entity_id: person.kristy
         state: "home"

automations/people/Ebin/ebin_location_update.yaml

@@ -6,6 +6,15 @@ trigger:
   # I've moved
   - platform: state
     entity_id:
+      - input_select.podein_kids
+      # Kristy moved
+      - input_select.kristy_status_dropdown
+      - input_boolean.kristy_home
+      # Custody changed
+      - binary_sensor.have_custody
+      # Sleeping status changed
+      - input_boolean.ebin_is_awake
+      - input_boolean.ebin_in_bed
       - input_select.ebin_status_dropdown
       - input_boolean.ebin_home
 condition:

automations/people/continue_nursery_noise.yaml

@@ -6,7 +6,7 @@ trigger:
     from: "playing"
 condition:
   - condition: state
-    entity_id: input_boolean.nursery_asleep
+    entity_id: input_boolean.girls_room_asleep
     state: "on"
   - condition: or
     conditions:

automations/people/goodnight_kids.yaml

@@ -164,29 +164,6 @@ action:
     target:
       entity_id: input_select.nursery_wled
 
-  # - action: automation.trigger
-  #   target:
-  #     entity_id: automation.nursery_wled_changed
-
-  # - choose:
-  #     - conditions: "{{is_state('input_boolean.bridget_home','on')}}"
-  #       sequence:
-  #         - action: input_boolean.turn_on
-  #           data: {}
-  #           target:
-  #             entity_id: input_boolean.nursery_asleep
-
-  #         - delay: "00:00:05"
-
-  # - choose:
-  #     - conditions: "{{is_state('media_player.ytube_music_player','on')}}"
-  #       sequence:
-  #         - action: media_player.turn_off
-  #           target:
-  #             entity_id: media_player.ytube_music_player
-
-  - delay: "00:25:00"
-
   - choose:
       - conditions: "{{is_state('input_boolean.emmett_home','on')}}"
         sequence:
@@ -195,6 +172,8 @@ action:
             target:
               entity_id: input_boolean.boys_room_asleep
 
+          - delay: "00:25:00"
+
           - action: input_select.select_option
             target:
               entity_id: input_select.boys_room_mode

automations/people/kids_awake.yaml

@@ -125,7 +125,9 @@ action:
                 state: "unavailable"
         sequence:
           - action: input_boolean.turn_off
-            entity_id: input_boolean.emmett_in_bed
+            entity_id:
+              - input_boolean.emmett_in_bed
+              - input_boolean.boys_room_asleep
           - action: input_boolean.turn_on
             entity_id: input_boolean.emmett_is_awake
 
@@ -147,7 +149,9 @@ action:
                 state: "unavailable"
         sequence:
           - action: input_boolean.turn_off
-            entity_id: input_boolean.bridget_in_bed
+            entity_id:
+              - input_boolean.bridget_in_bed
+              - input_boolean.girls_room_asleep
           - action: input_boolean.turn_on
             entity_id: input_boolean.bridget_is_awake
 

automations/rooms/boys_room/boys_room_white_noise_on.yaml

@@ -5,13 +5,14 @@ trigger:
   - platform: state
     entity_id: input_boolean.boys_room_asleep
     to: "on"
+
   - platform: state
     entity_id: media_player.ma_boys_room_clock
     to: "idle"
     for: 00:00:05
 
 condition:
-  - alias: "Do we want to be alerted?"
+  - alias: "Is the boys' room asleep?"
     condition: state
     entity_id: input_boolean.boys_room_asleep
     state: "on"

automations/rooms/furnace_room_lights.yaml

@@ -4,9 +4,7 @@ description: "Handles the lights in the furnace room"
 mode: queued
 triggers:
   - id: door_open
-    entity_id: >-
-      binary_sensor.hvac_multisensor_door,
-      binary_sensor.furnace_room_door_contact
+    entity_id: binary_sensor.water_softener_multisensor_door
     from: "off"
     to: "on"
     trigger: state
@@ -14,9 +12,7 @@ triggers:
       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
+    entity_id: binary_sensor.water_softener_multisensor_door
     to: "off"
     for: "00:10:00"
     trigger: state

automations/rooms/girls_room/girls_room_awake_button.yaml

@@ -28,4 +28,4 @@ action:
   - action: input_boolean.turn_off
     data: {}
     target:
-      entity_id: input_boolean.nursery_asleep
+      entity_id: input_boolean.girls_room_asleep

automations/rooms/girls_room/girls_room_continue_white_noise.yaml

@@ -1,35 +0,0 @@
-alias: Continue Nursery White Noise
-id: automation_continue_nursery_white_noise
-
-trigger:
-  - platform: state
-    entity_id: media_player.girls_room_hub
-    to: "off"
-    for: "00:00:02"
-  - platform: state
-    entity_id: media_player.girls_room_hub
-    to: "idle"
-    for: "00:00:02"
-condition:
-  - condition: state
-    entity_id: input_boolean.nursery_asleep
-    state: "on"
-
-action:
-  #- action: input_select.select_option
-  #  data:
-  #    entity_id: input_select.master_bedroom_mode
-  #    option: 'Off'
-  - action: input_select.select_option
-    data:
-      entity_id: input_select.google_home
-      option: "Nursery"
-  - action: input_select.select_option
-    data:
-      entity_id: input_select.ambient_sound
-      option: "Thunderstorm"
-  - action: input_number.set_value
-    data:
-      entity_id: input_number.volume_ambientsounds
-      value: "0.6"
-  - action: script.ambientsounds

automations/rooms/girls_room/girls_room_white_noise_off.yaml

@@ -3,7 +3,7 @@ id: automation_nursery_white_noise_off
 
 trigger:
   - platform: state
-    entity_id: input_boolean.nursery_asleep
+    entity_id: input_boolean.girls_room_asleep
     to: "off"
 
 action:

automations/rooms/girls_room/girls_room_white_noise_on.yaml

@@ -3,9 +3,21 @@ id: automation_nursery_white_noise_on
 
 trigger:
   - platform: state
-    entity_id: input_boolean.nursery_asleep
+    entity_id: input_boolean.girls_room_asleep
     to: "on"
 
+  - platform: state
+    entity_id: media_player.ma_girls_room_hub
+    to: "idle"
+    for: 00:00:05
+
+condition:
+  - alias: "Is the girls' room asleep?"
+    condition: state
+    entity_id: input_boolean.girls_room_asleep
+    state: "on"
+
+
 action:
   - choose:
       - conditions:

automations/things/automatic_fan_speeds.yaml

@@ -59,7 +59,7 @@ triggers:
     entity_id: input_boolean.master_bedroom_occupied
 
   - trigger: state
-    entity_id: input_boolean.nursery_asleep
+    entity_id: input_boolean.girls_room_asleep
 
   - trigger: state
     entity_id: input_boolean.master_bedroom_asleep
@@ -115,7 +115,7 @@ action:
             state: "off"
           - alias: "Nusery not asleep"
             condition: state
-            entity_id: input_boolean.nursery_asleep
+            entity_id: input_boolean.girls_room_asleep
             state: "off"
           - alias: "Nursery fan on"
             condition: state

automations/time_of_day/early_afternoon_on.yaml

@@ -1,7 +1,11 @@
 id: set_house_to_early_afternoon
 alias: Set House to Early Afternoon
 mode: single
-# Testing if this will update, save, and push just fine
+
+# platform: tod
+# name: Early Afternoon
+# after: '12:00'
+# before: '15:00'
 
 trigger:
   - platform: state
@@ -19,10 +23,6 @@ condition:
         state: Early Afternoon
 
 action:
-  # - action: homeassistant.turn_on
-  #   entity_id:
-  #     - input_boolean.clint_needs_pm_meds
-
   - action: input_select.select_option
     data:
       entity_id: input_select.time_of_day

automations/time_of_day/early_evening_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_early_evening
 alias: Set House to Early Evening
 mode: single
 
+# platform: tod
+# name: Early Evening
+# after: '17:00'
+# before: '19:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.early_evening

automations/time_of_day/early_morning_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_early_morning
 alias: Set House to Early Morning
 mode: single
 
+# platform: tod
+# name: Early Morning
+# after: '04:00'
+# before: '06:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.early_morning

automations/time_of_day/evening_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_evening
 alias: Set House to Evening
 mode: single
 
+# platform: tod
+# name: Evening
+# after: '19:00'
+# before: '22:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.evening

automations/time_of_day/late_afternoon_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_late_afternoon
 alias: Set House to Late Afternoon
 mode: single
 
+# platform: tod
+# name: Late Afternoon
+# after: '15:00'
+# before: '17:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.late_afternoon

automations/time_of_day/late_evening_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_late_evening
 alias: Set House to Late Evening
 mode: single
 
+# platform: tod
+# name: Late Evening
+# after: '22:00'
+# before: '00:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.late_evening
@@ -53,7 +58,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.ebin_in_bed
+            entity_id: input_boolean.ebin_home
             state: "on"
           - condition: state
             entity_id: input_boolean.ebin_in_bed
@@ -64,13 +69,4 @@ action:
           - action: homeassistant.turn_off
             entity_id: input_boolean.ebin_is_awake
 
-  - choose:
-      - conditions:
-          - condition: state
-            entity_id: media_player.girls_room_hub
-            state: "playing"
-        sequence:
-          - action: media_player.turn_off
-            entity_id: media_player.girls_room_hub
-
   - delay: "00:00:30"

automations/time_of_day/late_morning_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_late_morning
 alias: Set House to Late Morning
 mode: single
 
+# platform: tod
+# name: Late Morning
+# after: '09:00'
+# before: '12:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.late_morning
@@ -66,7 +71,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.kristy_in_bed
+            entity_id: input_boolean.kristy_home
             state: "on"
           - condition: state
             entity_id: input_boolean.kristy_in_bed
@@ -79,7 +84,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.marshall_in_bed
+            entity_id: input_boolean.marshall_home
             state: "on"
           - condition: state
             entity_id: input_boolean.marshall_in_bed
@@ -92,7 +97,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.tess_in_bed
+            entity_id: input_boolean.tess_home
             state: "on"
           - condition: state
             entity_id: input_boolean.tess_in_bed
@@ -105,7 +110,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.ebin_in_bed
+            entity_id: input_boolean.ebin_home
             state: "on"
           - condition: state
             entity_id: input_boolean.ebin_in_bed

automations/time_of_day/morning_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_morning
 alias: Set House to Morning
 mode: single
 
+# platform: tod
+# name: Morning
+# after: '06:00'
+# before: '09:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.morning
@@ -24,6 +29,9 @@ action:
       option: Morning
 
   - action: homeassistant.turn_off
-    entity_id: input_boolean.nursery_asleep
+    entity_id: input_boolean.boys_room_asleep
+
+  - action: homeassistant.turn_off
+    entity_id: input_boolean.girls_room_asleep
 
   - delay: "00:00:30"

automations/time_of_day/night_on.yaml

@@ -2,6 +2,11 @@ id: set_house_to_night
 alias: Set House to Night
 mode: single
 
+# platform: tod
+# name: Night
+# after: '00:00'
+# before: '04:00'
+
 trigger:
   - platform: state
     entity_id: binary_sensor.night
@@ -41,7 +46,7 @@ action:
   - choose:
       - conditions:
           - condition: state
-            entity_id: input_boolean.tess_in_bed
+            entity_id: input_boolean.tess_home
             state: "on"
           - condition: state
             entity_id: input_boolean.tess_in_bed