From cfcbdd04609ddf26a0d02039cf7b57a251218ac1 Mon Sep 17 00:00:00 2001
From: Carlo Costanzo <CCOSTAN@users.noreply.github.com>
Date: Mon, 2 Jun 2025 16:47:03 -0400
Subject: [PATCH] Fix a lot of the switches after messing with Tuya
 integrations

---
 config/automation/Timed_Triggers/0830.yaml |  4 ++--
 config/group/switches.yaml                 |  2 +-
 config/packages/nfc_tags.yaml              |  2 +-
 config/templates/speech/briefing.yaml      | 26 +++++++++++-----------
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/automation/Timed_Triggers/0830.yaml b/config/automation/Timed_Triggers/0830.yaml
index 7d020ffb..3a992860 100755
--- a/config/automation/Timed_Triggers/0830.yaml
+++ b/config/automation/Timed_Triggers/0830.yaml
@@ -30,14 +30,14 @@
         - light.fridge
         - light.k4
         - group.kitchen_accents
-        - switch.office_lamp_switch_socket
+        - switch.office_lamp_switch
         
     - wait_template: >-
        {{ states.sun.sun.state == 'above_horizon' }}
     - service: homeassistant.turn_on
       entity_id: 
         - switch.alarm_panel_1_motion_detection
-        - switch.office_lamp_switch_socket
+        - switch.office_lamp_switch
     - service: number.set_value
       target:
         entity_id: number.alarm_panel_1_screen_brightness
diff --git a/config/group/switches.yaml b/config/group/switches.yaml
index 4ab62dbf..c76f966e 100755
--- a/config/group/switches.yaml
+++ b/config/group/switches.yaml
@@ -19,7 +19,7 @@ Interior Switches:
     - switch.den_outlet
     - switch.living_room_outlet
     - switch.living_room_tv_outlet
-    - switch.office_lamp_switch_socket
+    - switch.office_lamp_switch
     - switch.front_office_lamp
 
 Kitchen Accents:
diff --git a/config/packages/nfc_tags.yaml b/config/packages/nfc_tags.yaml
index dc0dc42e..22951a3d 100755
--- a/config/packages/nfc_tags.yaml
+++ b/config/packages/nfc_tags.yaml
@@ -15,4 +15,4 @@ automation:
 
     action:
       - service: switch.toggle
-        entity_id: switch.office_lamp_switch_socket
+        entity_id: switch.office_lamp_switch
diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml
index cc7763d8..8ad617fb 100755
--- a/config/templates/speech/briefing.yaml
+++ b/config/templates/speech/briefing.yaml
@@ -63,7 +63,7 @@
 
       {%- if states('sensor.nws_alerts')|int > 0 -%}
         {%- set alert_description = state_attr('sensor.nws_alerts', 'Alerts') %}
-        [Summarize the included weather alert and give overall details on any storms releavant to the residents of the home. Use the Situation Overview Section to best understand what is going on - Be sure to highlight any impacts to Seminole County or Tallahassee] 
+        [Summarize the included weather alert and give overall details on any storms relevant to the residents of the home. Use the Situation Overview Section to best understand what is going on - Be sure to highlight any impacts to Seminole County or Tallahassee] 
         {{ alert_description }}
         [END of Weather Alert]
       {%- endif %}
@@ -246,36 +246,36 @@
       {% else -%}
         Away
       {% endif -%}
-      {%- if states('person.carlo') != 'home' %}
-        (Direction of travel: {{ state_attr('sensor.carlo_place', 'direction_of_travel') }})            
-      {% endif -%}
+      # {%- if states('person.carlo') != 'home' %}
+      #   (Direction of travel: {{ state_attr('sensor.carlo_place', 'direction_of_travel') }})            
+      # {% endif -%}
     - Stacey: {{ states('person.stacey') }} at 
       {%- if states('sensor.stacey_place') != 'unknown' %}
         {{ states('sensor.stacey_place') }}
       {% else -%}
         Away
       {% endif -%}
-      {%- if states('person.stacey') != 'home' %}
-        (Direction of travel: {{ state_attr('sensor.stacey_place', 'direction_of_travel') }})            
-      {% endif -%}
+      # {%- if states('person.stacey') != 'home' %}
+      #   (Direction of travel: {{ state_attr('sensor.stacey_place', 'direction_of_travel') }})            
+      # {% endif -%}
     - Justin: {{ states('person.justin') }} at 
       {%- if states('sensor.justin_place') != 'unknown' %}
         {{ states('sensor.justin_place') }}
       {% else -%}
         Away
       {% endif -%}
-      {%- if states('person.justin') != 'home' %}
-        (Direction of travel: {{ state_attr('sensor.justin_place', 'direction_of_travel') }})            
-      {% endif -%}
+      # {%- if states('person.justin') != 'home' %}
+      #   (Direction of travel: {{ state_attr('sensor.justin_place', 'direction_of_travel') }})            
+      # {% endif -%}
     - Paige: {{ states('person.paige') }} at 
       {%- if states('sensor.paige_place') != 'unknown' %}
         {{ states('sensor.paige_place') }}
       {% else -%}
         Away
       {% endif -%}
-      {%- if states('person.paige') != 'home' %}
-        (Direction of travel: {{ state_attr('sensor.paige_place', 'direction_of_travel') }})            
-      {% endif -%}
+      # {%- if states('person.paige') != 'home' %}
+      #   (Direction of travel: {{ state_attr('sensor.paige_place', 'direction_of_travel') }})            
+      # {% endif -%}
       {% if range(1, 100) | random <= 25 %}
       and our cat Molly: Always home.
       {% endif %}