Too much stuff at once, but who cares

components/packages/ambientsounds.yaml

@@ -29,8 +29,9 @@ group:
       - media_player.kitchen
       - media_player.front_room_hub
       - media_player.girls_room_hub
+      - media_player.boys_room_clock
       - media_player.bathroom_mini
-      - media_player.master_bedroom_clock
+      - media_player.home_assistant_voice_097b44_media_player
       - media_player.computer_area_hub
 
 ###### INPUT SELECT ------------------------------------------
@@ -67,7 +68,8 @@ input_select:
       - Front Room
       - Master Bedroom
       - Kitchen
-      - Nursery
+      - Girls Room
+      - Boys Room
       - Computer Area
       - Downstairs
       - Master Bathroom
@@ -96,10 +98,11 @@ script:
         data_template:
           entity_id: >
             {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub
-            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock
+            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player
             {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room
             {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen
-            {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock
             {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub
             {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public
             {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers
@@ -110,10 +113,11 @@ script:
         data_template:
           entity_id: >
             {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub
-            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock
+            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player
             {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room
             {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen
-            {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock
             {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub
             {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public
             {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers
@@ -158,10 +162,11 @@ script:
         data_template:
           entity_id: >
             {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub
-            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock
+            {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player
             {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room
             {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen
-            {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub
+            {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock
             {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub
             {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public
             {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers
@@ -183,10 +188,11 @@ automation:
       data_template:
         entity_id: >
           {% if is_state("input_select.google_home", "Front Room") %} media_player.front_room_hub
-          {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.master_bedroom_clock
+          {% elif is_state("input_select.google_home", "Master Bedroom") %} media_player.home_assistant_voice_097b44_media_player
           {% elif is_state("input_select.google_home", "Master Bathroom") %} media_player.great_room
           {% elif is_state("input_select.google_home", "Kitchen") %} media_player.kitchen
-          {% elif is_state("input_select.google_home", "Nursery") %} media_player.girls_room_hub
+          {% elif is_state("input_select.google_home", "Girls Room") %} media_player.girls_room_hub
+          {% elif is_state("input_select.google_home", "Boys Room") %} media_player.boys_room_clock
           {% elif is_state("input_select.google_home", "Computer Area") %} media_player.computer_area_hub
           {% elif is_state("input_select.google_home", "Downstairs") %} media_player.downstairs_public
           {% elif is_state("input_select.google_home", "Everywhere") %} media_player.all_speakers

components/packages/google_assistant.yaml

@@ -31,12 +31,12 @@ google_assistant:
       expose: true
       room: Garage
 
-    lock.patio_door:
-      name: Patio Door
-      expose: true
-      room: Dining Room
-      aliases:
-        - Sliding Glass Door
+    # lock.patio_door:
+    #   name: Patio Door
+    #   expose: true
+    #   room: Dining Room
+    #   aliases:
+    #     - Sliding Glass Door
 
     camera.frigate_cam03:
       name: Desk Camera
@@ -95,42 +95,42 @@ google_assistant:
     input_boolean.announce_almost_bedtime:
       name: Announce Almost Bedtime
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.announce_goodnight_emmett:
       name: Announce Goodnight Emmett
       expose: true
-      room: Nursery
+      room: Boys Room
 
     input_boolean.announce_goodnight_bridget:
       name: Announce Goodnight Bridget
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.announce_goodnight_ebin:
       name: Announce Goodnight Ebin
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.announce_goodnight_emmett_bridget:
       name: Announce Goodnight Emmett Bridget
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.announce_goodnight_emmett_ebin:
       name: Announce Goodnight Emmett Ebin
       expose: true
-      room: Nursery
+      room: Boys Room
 
     input_boolean.announce_goodnight_bridget_ebin:
       name: Announce Goodnight Bridget Ebin
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.announce_goodnight_emmett_bridget_ebin:
       name: Announce Goodnight Emmett Bridget Ebin
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.kids_bedtime:
       name: Kids Bedtime
@@ -139,7 +139,7 @@ google_assistant:
         - Emmetts bedtime
         - Bridgets bedtime
         - Ebins bedtime
-      room: Nursery
+      room: Girls Room
 
     input_boolean.clint_in_bed:
       name: Clint In Bed
@@ -164,17 +164,17 @@ google_assistant:
     input_boolean.emmett_in_bed:
       name: Emmett In Bed
       expose: true
-      room: Nursery
+      room: Boys Room
 
     input_boolean.bridget_in_bed:
       name: Bridget In Bed
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.ebin_in_bed:
       name: Ebin In Bed
       expose: true
-      room: Nursery
+      room: Girls Room
 
     input_boolean.front_room_occupied:
       name: Front Room Lights

components/packages/patio_door_lock.yaml

@@ -1,20 +1,13 @@
-lock:
-  - platform: template
-    unique_id: templatelock.patio_door
-    name: Patio Door
-    #value_template: "{{ is_state('switch.shelly_sliding_glass_door', 'on') }}"
-    value_template: "{{ is_state('light.deck', 'on') }}"
-    lock:
-      # action: switch.turn_on
-      # target:
-      #   entity_id: switch.shelly_sliding_glass_door
-      action: light.turn_on
-      target:
-        entity_id: light.deck
-    unlock:
-      # action: switch.turn_off
-      # target:
-      #   entity_id: switch.shelly_sliding_glass_door
-      action: light.turn_off
-      target:
-        entity_id: light.deck
+# lock:
+#   - platform: template
+#     unique_id: templatelock.patio_door
+#     name: Patio Door
+#     value_template: "{{ is_state('switch.shelly_sliding_glass_door', 'on') }}"
+#     lock:
+#       action: switch.turn_on
+#       target:
+#         entity_id: switch.shelly_sliding_glass_door
+#     unlock:
+#       action: switch.turn_off
+#       target:
+#         entity_id: switch.shelly_sliding_glass_door