From 45d69b9e1e9b4e805a2ccfa59d977cad64eba8b5 Mon Sep 17 00:00:00 2001
From: CCOSTAN <carlo@ipm.com>
Date: Tue, 14 Feb 2017 00:26:22 +0000
Subject: [PATCH] Break out the Garage and people announcements.

---
 automation/Speech/announcements.yaml | 12 ++----------
 automation/Speech/garage.yaml        | 26 ++++++++++++++++++++++++++
 automation/Speech/home_today.yaml    |  2 +-
 3 files changed, 29 insertions(+), 11 deletions(-)
 create mode 100755 automation/Speech/garage.yaml

diff --git a/automation/Speech/announcements.yaml b/automation/Speech/announcements.yaml
index c8c29ecc..2111b24e 100755
--- a/automation/Speech/announcements.yaml
+++ b/automation/Speech/announcements.yaml
@@ -2,7 +2,7 @@
 ##  Announce when people come or go.
 ## Announce over all Chromecast Audios 
 ######################################################################
-- alias: 'State Announcements'
+- alias: 'People Greeting'
   
   trigger:
     - platform: state
@@ -16,15 +16,7 @@
       to: 'home'
       for: '00:02:00'
       
-    - platform: state
-      entity_id:
-        - cover.garadget_large
-        - cover.garadget_small
-      from: 'closed'
-      to: 'open'
-      for: '00:02:00'
-      
   action:
     - service: script.Voice_notify
       data_template:
-        value1: "The {{ trigger.entity_id.split('.')[1]|replace('_', ' ')|replace('garadget large', '  large garage ')|replace('garadget small', ' small garage ') }} is {{ (trigger.to_state.state)|replace('_', ' ') }}."
\ No newline at end of file
+        value1: "{{ trigger.entity_id.split('.')[1]|replace('_', ' ')}} is {{ (trigger.to_state.state)|replace('_', ' ') }}."
\ No newline at end of file
diff --git a/automation/Speech/garage.yaml b/automation/Speech/garage.yaml
new file mode 100755
index 00000000..c7d99900
--- /dev/null
+++ b/automation/Speech/garage.yaml
@@ -0,0 +1,26 @@
+######################################################################
+##  Garage Status Announcements
+######################################################################
+- alias: 'Garage Status'
+  
+  trigger:
+    - platform: state
+      entity_id:
+        - cover.garadget_large
+        - cover.garadget_small
+      from: 'closed'
+      to: 'open'
+      for: '00:02:00'
+      
+    - platform: state
+      entity_id:
+        - cover.garadget_large
+        - cover.garadget_small
+      from: 'open'
+      to: 'closed'
+      for: '00:02:00'
+      
+  action:
+    - service: script.Voice_notify
+      data_template:
+        value1: "The {{ trigger.entity_id.split('.')[1]|replace('_', ' ')|replace('garadget large', 'large garage ')|replace('garadget small', 'small garage ') }} is now {{ (trigger.to_state.state)|replace('_', ' ') }}."
diff --git a/automation/Speech/home_today.yaml b/automation/Speech/home_today.yaml
index e2f7d6a6..f4989139 100755
--- a/automation/Speech/home_today.yaml
+++ b/automation/Speech/home_today.yaml
@@ -15,7 +15,7 @@
     - service: script.Voice_notify
       data_template:
         value1: >
-          "Welcome Home {{ trigger.entity_id.split('.')[1]|replace('_', ' ') }}. Here is what's going on around the house right now:
+          "Welcome Home Costanzo Family. Here is what's going on around the house right now:
           {%if now().strftime("%a") == 'Wed' or now().strftime("%a") == 'Sun'%}
             Today is {{now().strftime("%A")}} and {{now().strftime("%A")}} is garbage day.  Please be sure to tell the kids to take out the trash.
           {%endif%}