From: Giorgio Ravera <giorgio.ravera@gmail.com>
Date: Sun, 21 Apr 2019 10:02:49 +0000 (+0200)
Subject: Final integration of Shelly1 (bedroom and office)
X-Git-Url: http://git.giorgioravera.it/?a=commitdiff_plain;h=e9671780b034eb55c0bae4f0ae9f2c404d1105ef;p=homeassistant.git

Final integration of Shelly1 (bedroom and office)
---

diff --git a/components/google.yaml b/components/google.yaml
index b7ca9ac5..501c754c 100644
--- a/components/google.yaml
+++ b/components/google.yaml
@@ -28,6 +28,12 @@ entity_config:
   light.luce_specchio:
     room: Bagno
     expose: true
+  light.luce_studio:
+    room: Studio
+    expose: true
+  light.luce_camera:
+    room: Camera
+    expose: true
 # Tapparelle
   cover.tapparella_cucina:
     room: Cucina
diff --git a/script/shelly.yaml b/script/shelly.yaml
index a70b2c50..9f5dafb0 100644
--- a/script/shelly.yaml
+++ b/script/shelly.yaml
@@ -48,6 +48,18 @@ shelly_upgrade:
         topic: 'shellies/shellyswitch25-7457D8/command'
         payload: 'update_fw'
 
+    # Shelly 1 Luce Studio
+    - service: mqtt.publish
+      data:
+        topic: 'shellies/shelly1-59E18C/command'
+        payload: 'update_fw'
+
+    # Shelly 1 Luce Camera
+    - service: mqtt.publish
+      data:
+        topic: 'shellies/shelly1-24D1A8/command'
+        payload: 'update_fw'
+
     # Shelly Bulb Luce Divano
     - service: mqtt.publish
       data:
diff --git a/shell_scripts/shelly_upgrade.sh b/shell_scripts/shelly_upgrade.sh
old mode 100755
new mode 100644
index 977c0513..ec4011a0
--- a/shell_scripts/shelly_upgrade.sh
+++ b/shell_scripts/shelly_upgrade.sh
@@ -11,6 +11,8 @@ SHELLY_ID=(
 	shelly1-24D1EE
 	shelly1-93B27D
 	shellyswitch25-7457D8
+  shelly1-59E18C
+  shelly1-24D1A8
 	shellybulb-BC8610
 )
 
diff --git a/ui-lovelace.yaml b/ui-lovelace.yaml
index 750b0e5b..dba40469 100644
--- a/ui-lovelace.yaml
+++ b/ui-lovelace.yaml
@@ -23,8 +23,11 @@ views:
     cards:
     - type: picture-glance
       title: Cucina
-      show_state: false
-      image: /local/rooms/cucina.jpg
+      show_state: true
+      state_image:
+        "on": /local/rooms/cucina_on.jpg
+        "off": /local/rooms/cucina_off.jpg
+      entity: light.luce_cucina
       entities:
       - light.luce_cucina
       - cover.tapparella_cucina
@@ -56,7 +59,10 @@ views:
     - type: picture-glance
       title: Bagno
       show_state: true
-      image: /local/rooms/bagno.jpg
+      state_image:
+        "on": /local/rooms/bagno_on.jpg
+        "off": /local/rooms/bagno_off.jpg
+      entity: light.luce_bagno
       entities: 
       - light.luce_bagno
       - light.luce_specchio
@@ -65,8 +71,12 @@ views:
     - type: picture-glance
       title: Studio
       show_state: true
-      image: /local/rooms/studio.jpg
+      state_image:
+        "on": /local/rooms/studio_on.jpg
+        "off": /local/rooms/studio_off.jpg
+      entity: light.luce_studio
       entities: 
+      - light.luce_studio
       - cover.tapparella_studio
       - climate.studio_termostato_studio
 
@@ -75,6 +85,7 @@ views:
       show_state: true
       image: /local/rooms/camera.jpg
       entities: 
+      - light.luce_camera
       - cover.tapparella_camera
       - climate.camera_termostato_camera
 
@@ -104,6 +115,8 @@ views:
       - light.luce_divano
       - light.luce_bagno
       - light.luce_specchio
+      - light.luce_studio
+      - light.luce_camera
     cards:
     - type: entities
       title: Comandi luci
@@ -116,6 +129,8 @@ views:
         - light.luce_divano_bianca
         - light.luce_bagno
         - light.luce_specchio
+        - light.luce_studio
+        - light.luce_camera
     
     - type: light
       name: Luci Globale
@@ -253,6 +268,21 @@ views:
           - type: entity-button
             entity: input_text.tv_change_channel
 
+      - type: vertical-stack
+        title: TV Sala
+        cards:
+        - type: horizontal-stack
+          cards:
+          - type: entity-button
+            name: Affare
+            icon: mdi:numeric-1
+            entity: script.laura_voice
+            tap_action:
+              action: call-service
+              service: script.turn_on
+              service_data:
+                entity_id: script.laura_voice
+
 ######################################################################
 # People
 ######################################################################
@@ -487,15 +517,51 @@ views:
         entities:
         - input_boolean.speech_notifications
         - input_boolean.text_notifications
-      - type: entities
-        title: Controlli
-        show_header_toggle: false
-        entities: 
-        - script.homeassistant_restart
-        - script.homeassistant_clearlog
-        - script.homeassistant_upgrade
-      - type: entities
-        title: Operazione sui Dispositivi
-        show_header_toggle: false
-        entities: 
-        - script.shelly_upgrade
+
+      - type: vertical-stack
+        cards:
+        - type: horizontal-stack
+          cards:
+          - type: entities
+            title: Controlli
+            show_header_toggle: false
+            entities:
+            - script.homeassistant_restart
+            - script.homeassistant_clearlog
+            - script.homeassistant_upgrade
+#          - type: entity-button
+#            entity: script.homeassistant_restart
+#            tap_action:
+#              action: call-service
+#              service: script.turn_on
+#              service_data:
+#                entity_id: script.homeassistant_restart
+#          - type: entity-button
+#            entity: script.homeassistant_clearlog
+#            tap_action:
+#              action: call-service
+#              service: script.turn_on
+#              service_data:
+#                entity_id: script.homeassistant_clearlog
+#          - type: entity-button
+#            entity: script.homeassistant_upgrade
+#            tap_action:
+#              action: call-service
+#              service: script.turn_on
+#              service_data:
+#                entity_id: script.homeassistant_upgrade
+
+        - type: horizontal-stack
+          cards:          
+          - type: entities
+            title: Operazione sui Dispositivi
+            show_header_toggle: false
+            entities:
+            - script.shelly_upgrade
+#          - type: entity-button
+#            entity: script.shelly_upgrade
+#            tap_action:
+#              action: call-service
+#              service: script.turn_on
+#              service_data:
+#                entity_id: script.shelly_upgrade