From a7b1359e2a91e4dc3e42a4b1cab4fe0e113706d6 Mon Sep 17 00:00:00 2001
From: ccostan <carlo@ipm.com>
Date: Fri, 24 Jun 2022 09:43:42 -0400
Subject: [PATCH] Had to remove garage door checks until hardware is fixe.
 #1138

---
 config/automation/Speech/announcements.yaml   |  8 +++++++
 config/automation/Speech/home_stats.yaml      |  6 ++---
 .../Timed_Triggers/sunset_turn_on.yaml        |  4 ++--
 config/automation/away.yaml                   |  5 ----
 config/automation/guard_dog.yaml              |  8 +++----
 .../automation/late_night_outside_helper.yaml |  4 ++--
 config/templates/speech/briefing.yaml         | 24 +++++++++----------
 7 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/config/automation/Speech/announcements.yaml b/config/automation/Speech/announcements.yaml
index a15c73ef..49a37ece 100755
--- a/config/automation/Speech/announcements.yaml
+++ b/config/automation/Speech/announcements.yaml
@@ -74,7 +74,15 @@
           "It looks like "~person ~ is_are + " finally home! I will get the house ready for you. "
           ] | random }}
           {%- endmacro -%}
+
+          {%- macro Alexa_Guard() -%}
+          {% if not is_state('alarm_control_panel.alexa_guard', 'disarmed') -%}
+              I will now disarm the Guard functions.
+          {% endif -%}
+          {%- endmacro -%}
+
           {{greeting_sentence(person, is_are)}}
+          {{Alexa_Guard()}}
         call_responsibilities: 1
         call_no_announcement: 1
         call_garage_check: 1
diff --git a/config/automation/Speech/home_stats.yaml b/config/automation/Speech/home_stats.yaml
index 8c8b8195..7f0e948d 100755
--- a/config/automation/Speech/home_stats.yaml
+++ b/config/automation/Speech/home_stats.yaml
@@ -19,9 +19,9 @@
 
   action:
 
-    - wait_template: >-
-       {{ is_state('group.garage_doors', 'closed') }}
-      timeout: 00:05:30
+    # - wait_template: >-
+    #    {{ is_state('group.garage_doors', 'closed') }}
+    #   timeout: 00:05:30
 
     - service: script.speech_engine
       data:
diff --git a/config/automation/Timed_Triggers/sunset_turn_on.yaml b/config/automation/Timed_Triggers/sunset_turn_on.yaml
index 23f2b739..0a080e42 100755
--- a/config/automation/Timed_Triggers/sunset_turn_on.yaml
+++ b/config/automation/Timed_Triggers/sunset_turn_on.yaml
@@ -86,8 +86,8 @@
     - service: light.turn_on
       entity_id:
        - light.living_room_accents
-    - wait_template: >-
-       {{ is_state('group.garage_doors', 'closed') }}
+    # - wait_template: >-
+    #    {{ is_state('group.garage_doors', 'closed') }}
     - wait_template: >-
        {{ is_state('group.entry_points', 'off') }}
     - service: script.speech_engine
diff --git a/config/automation/away.yaml b/config/automation/away.yaml
index 225c6eb8..4c2b43de 100755
--- a/config/automation/away.yaml
+++ b/config/automation/away.yaml
@@ -12,11 +12,6 @@
     - platform: state
       entity_id: group.family
       to: 'not_home'
-    # - platform: event
-    #   #Sent from IFTTT Webhooks : {"action":"IFTTT_Away:}
-    #   event_type: ifttt_webhook_received
-    #   event_data:
-    #     action: IFTTT_Away
 
   condition:
     - condition: state
diff --git a/config/automation/guard_dog.yaml b/config/automation/guard_dog.yaml
index b64caf46..685a40e1 100755
--- a/config/automation/guard_dog.yaml
+++ b/config/automation/guard_dog.yaml
@@ -14,10 +14,10 @@
       to: 'on'
       from: 'off'
 
-  condition:
-    - condition: state
-      entity_id: group.garage_doors
-      state: 'closed'
+  # condition:
+  #   - condition: state
+  #     entity_id: group.garage_doors
+  #     state: 'closed'
 
   action:
     - service: script.dog_bark
diff --git a/config/automation/late_night_outside_helper.yaml b/config/automation/late_night_outside_helper.yaml
index 5f570650..54a7d59d 100755
--- a/config/automation/late_night_outside_helper.yaml
+++ b/config/automation/late_night_outside_helper.yaml
@@ -48,9 +48,9 @@
         - switch.front_door_outlet
         - switch.foyer_outlet
     - wait_template: "{{ is_state('group.entry_points', 'off') }}"
-    - wait_template: "{{ is_state('group.garage_doors', 'closed') }}"
+#    - wait_template: "{{ is_state('group.garage_doors', 'closed') #}}"
     - service: script.monthly_color_scene
-    
+
     - choose:
         - conditions: >
             {{ states.group.entry_points.state == 'on' or
diff --git a/config/templates/speech/briefing.yaml b/config/templates/speech/briefing.yaml
index 0b4bfc93..3466f8bf 100755
--- a/config/templates/speech/briefing.yaml
+++ b/config/templates/speech/briefing.yaml
@@ -100,18 +100,18 @@
   {%- endmacro -%}
 
   {%- macro garage_check() -%}
-  {% if states.group.garage_doors.state !='closed' -%}
-      The
-      {%- for state in states.cover -%}
-      {%- endfor %}
-      {% for group in states.cover|groupby('state') -%}
-      {%- for entity in group.list  if entity.state == 'open' and entity.attributes.device_class == 'garage'  -%}
-          {{ ' and' if loop.last and not loop.first }}
-          {{ entity.attributes.friendly_name }}
-      {%- endfor -%}
-      {%- endfor %}
-      need to be closed.
-  {%- endif -%}
+  # {% if states.group.garage_doors.state !='closed' -%}
+  #     The
+  #     {%- for state in states.cover -%}
+  #     {%- endfor %}
+  #     {% for group in states.cover|groupby('state') -%}
+  #     {%- for entity in group.list  if entity.state == 'open' and entity.attributes.device_class == 'garage'  -%}
+  #         {{ ' and' if loop.last and not loop.first }}
+  #         {{ entity.attributes.friendly_name }}
+  #     {%- endfor -%}
+  #     {%- endfor %}
+  #     need to be closed.
+  # {%- endif -%}
   {%- endmacro -%}
 
   {%- macro medicine() -%}