Added lights

diff --git a/components/google.yaml b/components/google.yaml
index 69976cd6d78f49ae85182ecfaaf5ef3a51f70b79..6c275a9db4754203dda8eb7b2def0e3babf14da1 100644 (file)
--- 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 2c33ebefe27a61c9d8e596ac94baac3324c1b15a..677599b33ac0e9d7a2715fe9f050045f8dea4c29 100644 (file)
--- 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 4bd39edfa7c08d59239ed4dbcb087124d7621b4d..5e7ef165cb8889f1cf8e046c8607ea1198a99669 100644 (file)
--- 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 (file)
index 0000000..925c16b
--- /dev/null
+++ b/light/corridoio.yaml
@@ -0,0 +1,13 @@
+######################################################################\r
+# Living Room Light (Color)\r
+######################################################################\r
+\r
+- platform: mqtt\r
+  name: Luce Corridoio\r
+  command_topic: "shellies/shelly1-24D1EE/relay/0/command"\r
+  state_topic: "shellies/shelly1-24D1EE/relay/0"\r
+  payload_on: "on"\r
+  payload_off: "off"\r
+  retain: false\r
+  qos: 1\r
+  optimistic: false\r

diff --git a/light/cucina.yaml b/light/cucina.yaml
new file mode 100644 (file)
index 0000000..bf9c75e
--- /dev/null
+++ b/light/cucina.yaml
@@ -0,0 +1,13 @@
+######################################################################\r
+# Kitchen Room Light\r
+######################################################################\r
+\r
+- platform: mqtt\r
+  name: Luce Cucina\r
+  command_topic: "shellies/shelly1-93B27D/relay/0/command"\r
+  state_topic: "shellies/shelly1-93B27D/relay/0"\r
+  payload_on: "on"\r
+  payload_off: "off"\r
+  retain: false\r
+  qos: 1\r
+  optimistic: false\r

diff --git a/light/sala.yaml b/light/sala.yaml
index 876c617ebf13d11281c31267b5b1959a18e449b1..e24740fc71cc7dc3454894b7c5fe6c80aa4b9400 100644 (file)
--- 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 4359bd0121f1ff91cbdf79c3392c6e0cb1bdcf66..41a297da1a3439ec7a2c34847a729d3c32fb2146 100644 (file)
--- 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
 ######################################################################