From e71ad8072aa2ca5eaf0ee7b963f7ccbd025eabef Mon Sep 17 00:00:00 2001
From: CCOSTAN <carlo@ipm.com>
Date: Wed, 15 Feb 2017 17:03:48 +0000
Subject: [PATCH] Update to 38.3 and some more experimenting with Jinja Macros.

---
 .HA_VERSION                            |  2 +-
 automation/Speech/announcements.yaml   |  2 +-
 automation/sunrise_turnon_and_off.yaml |  7 ++++---
 automation/voice.macros                | 23 -----------------------
 group/weather.yaml                     |  1 +
 5 files changed, 7 insertions(+), 28 deletions(-)
 delete mode 100755 automation/voice.macros

diff --git a/.HA_VERSION b/.HA_VERSION
index fc250eb0..6c772873 100755
--- a/.HA_VERSION
+++ b/.HA_VERSION
@@ -1 +1 @@
-0.38.2
\ No newline at end of file
+0.38.3
\ No newline at end of file
diff --git a/automation/Speech/announcements.yaml b/automation/Speech/announcements.yaml
index 681d1521..08557118 100755
--- a/automation/Speech/announcements.yaml
+++ b/automation/Speech/announcements.yaml
@@ -27,7 +27,7 @@
           "Welcome home " ~ person,
           "Guess who is home? "  ~ person +" is!",
           "Attention: " ~ person + " is now in the house.",
-          person ~ " in da house!",
+          person ~ " in da hiz house!",
           "Welcome Home " ~ person + ".  We've missed you. or at least Molly did.",
           "Our home is now complete, Rest your head and relax your feet! Welcome Back " ~ person,
           "Life is like a song, you’re back where you belong. Welcome home" ~ person,
diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index 66cf5fed..c6067786 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -45,9 +45,10 @@
   action:
     - service: light.turn_off
       entity_id: 
-        - group.all_lights    
-        - light.outdoor_front
-        - group.outdoor_lights
+        - group.exterior_lights        
+        - group.outdoor_front_lights
+        - group.outdoor_pool_lights
+        - group.all_lights
     - service: script.interior_off
 
     
diff --git a/automation/voice.macros b/automation/voice.macros
deleted file mode 100755
index ceb352aa..00000000
--- a/automation/voice.macros
+++ /dev/null
@@ -1,23 +0,0 @@
-          {% macro greeting_sentence(person) %}
-          {{ [
-          "Welcome home " ~ person,
-          "Guess who is home? "  ~ person +" is!",
-          "Attention: " ~ person + " is now in the house.",
-          person ~ " in da house!",
-          "Welcome Home " ~ person + ".  We've missed you. or at least Molly did.",
-          "Our home is now complete, Rest your head and relax your feet! Welcome Back " ~ person,
-          "Life is like a song, you’re back where you belong. Welcome home" ~ person,
-          "Hey there " ~ person,
-          person ~ "! You're home!"
-          ] | random }}    
-          {% endmacro %}
-          
-          
-          {% macro dark_outside() %}
-          {{ [
-          "It is pretty dark outside.  I will turn on the outside lights now.",
-          "It's a little past Sunset. Time to turn on the outside lights. I'm on it.",
-          "I'll switch on the outside lights.  It's getting dark outside.",
-          "Time to turn on the front lights. I'll take care of it."
-          ] | random }}
-          {% endmacro %}
\ No newline at end of file
diff --git a/group/weather.yaml b/group/weather.yaml
index bb88f747..0d1e60a5 100755
--- a/group/weather.yaml
+++ b/group/weather.yaml
@@ -10,3 +10,4 @@ Weather:
     - sensor.dark_sky_precip_intensity
     - sensor.dark_sky_humidity
     - sensor.dark_sky_temperature
+    - sensor.moon