From 7c66f96cc632bb2b1ac1b66d7b384fe1d59507ea Mon Sep 17 00:00:00 2001
From: CCOSTAN <carlo@ipm.com>
Date: Tue, 18 Oct 2016 01:09:31 +0000
Subject: [PATCH] If we have guests, let there be light!

---
 automation/good_night.yaml        | 15 +++++------
 automation/ifttt_logger.yaml      | 42 +++++++++++++++++++++++++++++++
 automation/late_night_helper.yaml | 12 +++++----
 automation/rachio.yaml            | 13 ----------
 automation/skybell.yaml           | 25 ------------------
 automation/tv_time.yaml           |  3 +--
 automation/tv_time_off.yaml       |  3 +--
 7 files changed, 59 insertions(+), 54 deletions(-)
 create mode 100755 automation/ifttt_logger.yaml
 delete mode 100755 automation/rachio.yaml
 delete mode 100755 automation/skybell.yaml

diff --git a/automation/good_night.yaml b/automation/good_night.yaml
index 3b0ad427..11b57ff7 100755
--- a/automation/good_night.yaml
+++ b/automation/good_night.yaml
@@ -15,13 +15,14 @@
       state: not_home 
 
   condition:
-    - condition: state
-      entity_id: group.family
-      state: not_home 
-    - condition:
-      platform: state
-      entity_id: input_boolean.guest_mode
-      state: 'off'
+    condition: and
+    conditions:
+      - condition: state
+        entity_id: group.family
+        state: not_home 
+      - condition: state
+        entity_id: input_boolean.guest_mode
+        state: 'off'
 
   action:
     - service: light.turn_off
diff --git a/automation/ifttt_logger.yaml b/automation/ifttt_logger.yaml
new file mode 100755
index 00000000..99760a7e
--- /dev/null
+++ b/automation/ifttt_logger.yaml
@@ -0,0 +1,42 @@
+###################################
+##  LOG IFTTT Stuff - Rachio
+###################################
+- alias: 'Log Sprinkler Activity'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: rachio_water_stops
+  
+  action:
+    service: logbook.log
+    data:
+      name: "Rachio Sprinkler:"
+      message: "The Lawn was watered just now."
+
+###################################
+##  LOG IFTTT Stuff - SkyBell
+###################################
+
+- alias: 'Log SkyBell Pressed Activity'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: skybell_pressed
+  
+  action:
+    service: logbook.log
+    data:
+      name: "SkyBell HD Doorbell:"
+      message: "Someone Pressed the Doorbell."
+
+- alias: 'Log SkyBell Motion detection'
+  hide_entity: True
+  trigger:
+    - platform: event
+      event_type: skybell_motion
+  
+  action:
+    service: logbook.log
+    data:
+      name: "SkyBell HD Doorbell:"
+      message: "Someone is by the door."
\ No newline at end of file
diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index 6f97d51f..c326313a 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -12,11 +12,13 @@
       state: home 
 
   condition:
-    - condition: state
-      entity_id: sun.sun
-      state: 'below_horizon'
-    - condition: time
-      before: '23:45'
+    condition: and
+    conditions:
+      - condition: state
+        entity_id: sun.sun
+        state: 'below_horizon'
+      - condition: time
+        before: '23:45'
 
   action:
     service: light.turn_on
diff --git a/automation/rachio.yaml b/automation/rachio.yaml
deleted file mode 100755
index 5cc4fd85..00000000
--- a/automation/rachio.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-# Here is a collection of automations for logging IFTTT supported devices in LogBook.
-
-- alias: 'Log Sprinkler Activity'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: rachio_water_stops
-  
-  action:
-    service: logbook.log
-    data:
-      name: "Rachio Sprinkler:"
-      message: "The Lawn was watered just now."
diff --git a/automation/skybell.yaml b/automation/skybell.yaml
deleted file mode 100755
index c3e20e81..00000000
--- a/automation/skybell.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-# Here is a collection of automations for logging IFTTT supported devices in LogBook.
-
-- alias: 'Log SkyBell Pressed Activity'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: skybell_pressed
-  
-  action:
-    service: logbook.log
-    data:
-      name: "SkyBell HD Doorbell:"
-      message: "Someone Pressed the Doorbell."
-
-- alias: 'Log SkyBell Motion detection'
-  hide_entity: True
-  trigger:
-    - platform: event
-      event_type: skybell_motion
-  
-  action:
-    service: logbook.log
-    data:
-      name: "SkyBell HD Doorbell:"
-      message: "Someone is by the door."
\ No newline at end of file
diff --git a/automation/tv_time.yaml b/automation/tv_time.yaml
index 6ade27d5..6d96903b 100755
--- a/automation/tv_time.yaml
+++ b/automation/tv_time.yaml
@@ -21,8 +21,7 @@
       - condition: state
         entity_id: sun.sun
         state: 'below_horizon'
-      - condition:
-        platform: state
+      - condition: state
         entity_id: input_boolean.guest_mode
         state: 'off'
         
diff --git a/automation/tv_time_off.yaml b/automation/tv_time_off.yaml
index 8da49de0..be53a6db 100755
--- a/automation/tv_time_off.yaml
+++ b/automation/tv_time_off.yaml
@@ -10,8 +10,7 @@
       - condition: state
         entity_id: sun.sun
         state: 'below_horizon'
-      - condition:
-        platform: state
+      - condition: state
         entity_id: input_boolean.guest_mode
         state: 'off'