From 1b49b1bdf63fbf650211cb865ce7893b12ec19e3 Mon Sep 17 00:00:00 2001
From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sat, 13 Apr 2019 19:39:58 +0200
Subject: [PATCH] Added lights

---
 components/google.yaml | 39 +++++++++++++++++++++++++--------------
 configuration.yaml     |  2 +-
 cover/sala.yaml        |  1 -
 light/corridoio.yaml   | 13 +++++++++++++
 light/cucina.yaml      | 13 +++++++++++++
 light/sala.yaml        |  4 ++--
 ui-lovelace.yaml       | 30 ++++++++++++++++++++++++++++++
 7 files changed, 84 insertions(+), 18 deletions(-)
 create mode 100644 light/corridoio.yaml
 create mode 100644 light/cucina.yaml

diff --git a/components/google.yaml b/components/google.yaml
index 69976cd6..6c275a9d 100644
--- a/components/google.yaml
+++ b/components/google.yaml
@@ -12,21 +12,17 @@ exposed_domains:
   - media_player
   - script
 entity_config:
-  climate.bagno_termostato_bagno:
-    room: Bagno
+# Luci
+  light.luce_corridoio:
+    room: Corridoio
     expose: true
-  climate.camera_termostato_camera:
-    room: Camera
-    expose: true
-  climate.cucina_termostato_cucina:
+  light.luce_cucina:
     room: Cucina
     expose: true
-  climate.sala_termostato_sala:
+  light.luce_divano:
     room: Sala
-    expose: true
-  climate.studio_termostato_studio:
-    room: Studio
-    expose: true
+    expose: true    
+# Tapparelle
   cover.tapparella_globale:
     room: Generale
     expose: true
@@ -42,12 +38,27 @@ entity_config:
   cover.tapparella_camera:
     room: Camera
     expose: true
+# Termostato
+  climate.bagno_termostato_bagno:
+    room: Bagno
+    expose: true
+  climate.camera_termostato_camera:
+    room: Camera
+    expose: true
+  climate.cucina_termostato_cucina:
+    room: Cucina
+    expose: true
+  climate.sala_termostato_sala:
+    room: Sala
+    expose: true
+  climate.studio_termostato_studio:
+    room: Studio
+    expose: true
+# Script & Routine
   input_boolean.home_mode_away:
     room: Generale
     expose: true
-#  media_player.bdf6500_bdf6500:
-#    room: Camera
-#    expose: true
+# Media Player
   media_player.tv_sala:
     room: Sala
     expose: true
diff --git a/configuration.yaml b/configuration.yaml
index 2c33ebef..677599b3 100644
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -90,7 +90,7 @@ sensor: !include_dir_merge_list sensor/
 binary_sensor: !include_dir_merge_list binary_sensor/
 
 # Lights
-#light: !include_dir_merge_list light/ 
+light: !include_dir_merge_list light/ 
 
 # Covers
 cover: !include_dir_merge_list cover/
diff --git a/cover/sala.yaml b/cover/sala.yaml
index 4bd39edf..5e7ef165 100644
--- a/cover/sala.yaml
+++ b/cover/sala.yaml
@@ -15,4 +15,3 @@
   retain: false
   optimistic: false
   qos: 1
-
diff --git a/light/corridoio.yaml b/light/corridoio.yaml
new file mode 100644
index 00000000..925c16b2
--- /dev/null
+++ b/light/corridoio.yaml
@@ -0,0 +1,13 @@
+######################################################################
+# Living Room Light (Color)
+######################################################################
+
+- platform: mqtt
+  name: Luce Corridoio
+  command_topic: "shellies/shelly1-24D1EE/relay/0/command"
+  state_topic: "shellies/shelly1-24D1EE/relay/0"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
+  optimistic: false
diff --git a/light/cucina.yaml b/light/cucina.yaml
new file mode 100644
index 00000000..bf9c75ef
--- /dev/null
+++ b/light/cucina.yaml
@@ -0,0 +1,13 @@
+######################################################################
+# Kitchen Room Light
+######################################################################
+
+- platform: mqtt
+  name: Luce Cucina
+  command_topic: "shellies/shelly1-93B27D/relay/0/command"
+  state_topic: "shellies/shelly1-93B27D/relay/0"
+  payload_on: "on"
+  payload_off: "off"
+  retain: false
+  qos: 1
+  optimistic: false
diff --git a/light/sala.yaml b/light/sala.yaml
index 876c617e..e24740fc 100644
--- a/light/sala.yaml
+++ b/light/sala.yaml
@@ -5,8 +5,8 @@
 - platform: mqtt
   name: Luce Divano
   schema: template
-  command_topic: "shellies/shellybulb-<deviceid>/color/0/set"
-  state_topic: "shellies/shellybulb-<deviceid>/color/0/status"
+  command_topic: "shellies/shellybulb-BC8610/color/0/set"
+  state_topic: "shellies/shellybulb-BC8610/color/0/status"
   command_on_template: >
     {
       "turn": "on",
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 4359bd01..41a297da 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -27,6 +27,7 @@ views:
       show_state: false
       image: /local/rooms/cucina.jpg
       entities:
+      - light.luce_cucina
       - cover.tapparella_cucina
       - climate.cucina_termostato_cucina
       - media_player.google_home
@@ -36,11 +37,23 @@ views:
       show_state: true
       image: /local/rooms/sala.jpg
       entities: 
+      - light.luce_divano
       - cover.tapparella_sala
       - climate.sala_termostato_sala
       - media_player.tv_sala
       #- media_player.roku_yd00dm481414
 
+    - type: picture-glance
+      title: Corridoio
+      show_state: true
+      state_image:
+        "on": /local/rooms/corridoio_on.jpg
+        "off": /local/rooms/corridoio_off.jpg
+      entity: light.luce_corridoio
+      image: 
+      entities: 
+      - light.luce_corridoio
+
     - type: picture-glance
       title: Bagno
       show_state: true
@@ -78,6 +91,23 @@ views:
       entities:
       - script.speech_status
 
+######################################################################
+# Lights
+######################################################################
+  - title: Luci
+    id: light
+    icon: mdi:lightbulb
+    cards:
+    - type: light
+      entity: light.luce_cucina
+      name: Luce Cucina
+    - type: light
+      entity: light.luce_corridoio
+      name: Luce Corridoio
+    - type: light
+      entity: light.luce_divano
+      name: Luce Divano
+
 ######################################################################
 # Covers
 ######################################################################
-- 
2.47.3