Bunches of fixes nd changes

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: