From 2ee9258df9f5886d3db366b9752167fa01541ac6 Mon Sep 17 00:00:00 2001
From: CCOSTAN <carlo@ipm.com>
Date: Wed, 9 Nov 2016 06:48:10 +0000
Subject: [PATCH] New Names, New Views, New Sensors and New Devices.

---
 automation/sunrise_turnon.yaml |  4 +-
 group/lights.yaml              | 55 ++++++++++++++--------------
 group/views.yaml               |  1 +
 sensor/devices.yaml            | 67 ++++++++++++++++++++++++++++++++++
 4 files changed, 99 insertions(+), 28 deletions(-)

diff --git a/automation/sunrise_turnon.yaml b/automation/sunrise_turnon.yaml
index 8ffae9f3..f1983003 100755
--- a/automation/sunrise_turnon.yaml
+++ b/automation/sunrise_turnon.yaml
@@ -1,5 +1,5 @@
 ###################################
-##  Holiday Lights on/off with IFTTT/Alexa support
+##  Sunrise and Sunset stuff
 ###################################
 
 - alias: 'Sunset Stuff on'  
@@ -12,6 +12,8 @@
   action:
     - service: switch.turn_on
       entity_id: switch.foyer_outlet 
+    - service: light.turn_on
+      entity_id: light.pool_bathroom
     - service: light.turn_on
       data:
         entity_id: light.outdoor_foyer
diff --git a/group/lights.yaml b/group/lights.yaml
index 38587565..3f0fb7dd 100755
--- a/group/lights.yaml
+++ b/group/lights.yaml
@@ -4,22 +4,22 @@ Bedroom lights:
 
 Kitchen lights:
   entities:
-    - light.kitchen_1
-    - light.kitchen_2
-    - light.kitchen_3
-    - light.kitchen_4
-    - light.kitchen_5
-    - light.kitchen_6
-    - light.kitchen_sink
-    - light.kitchen_fridge
+    - light.K1
+    - light.K2
+    - light.K3
+    - light.K4
+    - light.K5
+    - light.K6
+    - light.Kitchen_sink
+    - light.Kitchen_fridge
     
 Living Room lights:
   entities:
-    - light.living_room_back_left
-    - light.living_room_back_right
-    - light.living_room_front_left
-    - light.living_room_front_right
-    - light.living_room_slider
+    - light.M1_back_left
+    - light.M1_back_right
+    - light.M1_front_left
+    - light.M1_front_right
+    - light.M1_slider
 
 Living Room Accents:
   entities:
@@ -29,8 +29,8 @@ Living Room Accents:
 
 Dinette lights:
   entities:
-    - light.dinette_1
-    - light.dinette_2
+    - light.D1
+    - light.D2
 
 Den lights:    
   entities:
@@ -38,8 +38,8 @@ Den lights:
 
 Foyer lights:
   entities:
-    - light.foyer_door
-    - light.foyer
+    - light.F1
+    - light.F2
  
 Office lights:
   entities:
@@ -51,24 +51,25 @@ Upstairs lights:
 
 Dining_Room lights:
   entities:
-    - light.sconce_1
-    - light.sconce_2
-    - light.sconce_3
-    - light.sconce_4
+    - light.S1
+    - light.S2
+    - light.S3
+    - light.S4
 
 Outdoor Pool Lights:
   entities:
-    - light.pool_front_left
-    - light.pool_front_right
-    - light.pool_back_left
-    - light.pool_back_left
+    - light.P1_front_left
+    - light.P1_front_right
+    - light.P1_back_left
+    - light.P1_back_left
     
 Outdoor Lights:
   entities:
     - light.outdoor_foyer
-    - light.pool_bathroom
+    - light.Outdoor_bathroom
     
 Garage lights:
   entities:
     - light.garage_attic
-    - switch.garage_outlet
\ No newline at end of file
+    - switch.garage_outlet
+    
diff --git a/group/views.yaml b/group/views.yaml
index 7613fdcf..d229a56b 100755
--- a/group/views.yaml
+++ b/group/views.yaml
@@ -21,6 +21,7 @@ default_view:
     - group.office_lights
     - group.garage_lights
     - group.outdoor_pool_lights
+    - group.outdoor_lights
 
 Lights:
   view: yes
diff --git a/sensor/devices.yaml b/sensor/devices.yaml
index e5bb800f..809de03b 100755
--- a/sensor/devices.yaml
+++ b/sensor/devices.yaml
@@ -16,6 +16,25 @@
             {% else %}
                 Offline
             {%- endif %}	
+
+      actiontechap:
+        friendly_name: 'ActionTech AP'
+        value_template: >-
+            {%- if is_state("device_tracker.actiontechap", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+
+      cisco_ap:
+        friendly_name: 'Cisco Main AP'
+        value_template: >-
+            {%- if is_state("device_tracker.cisco_ap", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+             
       hue_hub:
         friendly_name: 'Hue Hub'
         value_template: >-
@@ -32,6 +51,16 @@
             {% else %}
                 Offline
             {%- endif %}	
+
+      amazon_dot:
+        friendly_name: 'Amazon Dot'
+        value_template: >-
+            {%- if is_state("device_tracker.amazon_dot", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+            
       circle:
         friendly_name: 'Disney Circle'
         value_template: >-
@@ -40,6 +69,25 @@
             {% else %}
                 Offline
             {%- endif %}   
+
+      nest_downstairs:
+        friendly_name: 'Downstairs Nest'
+        value_template: >-
+            {%- if is_state("device_tracker.nest_downstairs", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+
+      nest_upstairs:
+        friendly_name: 'Upstairs Nest'
+        value_template: >-
+            {%- if is_state("device_tracker.nest_upstairs", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+  
       rachio:
         friendly_name: 'Rachio Sprinklers'
         value_template: >-
@@ -64,3 +112,22 @@
             {% else %}
                 Offline
             {%- endif %}             
+
+      chromecast_audio_1:
+        friendly_name: 'ChromeCast Audio 1'
+        value_template: >-
+            {%- if is_state("device_tracker.chromecast_audio_1", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+
+      chromecast_audio_2:
+        friendly_name: 'ChromeCast Audio 2'
+        value_template: >-
+            {%- if is_state("device_tracker.chromecast_audio_2", "home") %}
+                Online
+            {% else %}
+                Offline
+            {%- endif %}
+  
\ No newline at end of file