Upgraded Shelly integration & replaced Luci Bagno

diff --git a/.storage/lovelace.lovelace_dispositivi b/.storage/lovelace.lovelace_dispositivi
index 6cb585a194ad94a071bfd6cef328cc2b2440181e..2d3911609dbc0819b21c32663ff64a6c7fb32daf 100644 (file)
--- a/.storage/lovelace.lovelace_dispositivi
+++ b/.storage/lovelace.lovelace_dispositivi
@@ -1,5 +1,6 @@
 {
     "version": 1,
+    "minor_version": 1,
     "key": "lovelace.lovelace_dispositivi",
     "data": {
         "config": {
@@ -306,11 +307,11 @@
                             "show_label": false,
                             "show_icon": false,
                             "show_entity_picture": true,
-                            "entity_picture": "/local/images/devices/shelly_logo_black.png",
+                            "entity_picture": "/local/images/devices/shelly/shelly.jpg",
                             "styles": {
                                 "card": [
                                     {
-                                        "background-color": "transparent"
+                                        "background-color": "white"
                                     },
                                     {
                                         "box-shadow": "0px 0px 0px 0px."
@@ -318,7 +319,7 @@
                                 ],
                                 "entity_picture": [
                                     {
-                                        "width": "15%"
+                                        "width": "100%"
                                     }
                                 ]
                             },
@@ -329,73 +330,134 @@
                         {
                             "type": "entities",
                             "entities": [
-                                "script.shelly_upgrade",
-                                "script.shelly_reboot"
+                                {
+                                    "entity": "binary_sensor.tapparella_cucina_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.tapparella_sala_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.tapparella_studio_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.tapparella_camera_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_corridoio_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_cucina_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_sala_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luci_bagno_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_studio_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_camera_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_balcone_firmware_update"
+                                },
+                                {
+                                    "entity": "binary_sensor.shelly_em_firmware_update"
+                                }
                             ],
-                            "title": "Operazioni sui dispositivi",
-                            "view_layout": {
-                                "grid-area": "main1"
-                            }
+                            "title": "Disponibilit\u00e0 Aggiornamenti"
                         },
                         {
                             "type": "entities",
                             "entities": [
                                 {
-                                    "entity": "binary_sensor.tapparella_sala_overheating"
+                                    "entity": "script.shelly_upgrade"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_sala_overheating"
+                                    "entity": "button.tapparella_cucina_ota_update"
                                 },
                                 {
-                                    "entity": "binary_sensor.luci_bagno_overheating"
+                                    "entity": "button.tapparella_sala_ota_update"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_camera_overheating"
+                                    "entity": "button.tapparella_studio_ota_update"
+                                },
+                                {
+                                    "entity": "button.tapparella_camera_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_corridoio_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_cucina_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_sala_ota_update"
+                                },
+                                {
+                                    "entity": "button.luci_bagno_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_studio_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_camera_ota_update"
+                                },
+                                {
+                                    "entity": "button.luce_balcone_ota_update"
+                                },
+                                {
+                                    "entity": "button.shelly_em_ota_update"
                                 }
                             ],
-                            "title": "Surriscaldamento"
+                            "title": "Aggiorna Dispositivi"
                         },
                         {
                             "type": "entities",
                             "entities": [
                                 {
-                                    "entity": "binary_sensor.tapparella_cucina_firmware_update"
+                                    "entity": "script.shelly_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.tapparella_sala_firmware_update"
+                                    "entity": "button.tapparella_cucina_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.tapparella_studio_firmware_update"
+                                    "entity": "button.tapparella_sala_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.tapparella_camera_firmware_update"
+                                    "entity": "button.tapparella_studio_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_corridoio_firmware_update"
+                                    "entity": "button.tapparella_camera_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_cucina_firmware_update"
+                                    "entity": "button.luce_corridoio_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_sala_firmware_update"
+                                    "entity": "button.luce_cucina_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luci_bagno_firmware_update"
+                                    "entity": "button.luce_sala_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_studio_firmware_update"
+                                    "entity": "button.luci_bagno_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_camera_firmware_update"
+                                    "entity": "button.luce_studio_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.luce_balcone_firmware_update"
+                                    "entity": "button.luce_camera_reboot"
                                 },
                                 {
-                                    "entity": "binary_sensor.shelly_em_firmware_update"
+                                    "entity": "button.luce_balcone_reboot"
+                                },
+                                {
+                                    "entity": "button.shelly_em_reboot"
                                 }
                             ],
-                            "title": "Disponibilit\u00e0 Aggiornamenti"
+                            "title": "Riavvio Dispositivi"
                         },
                         {
                             "type": "entities",
@@ -417,6 +479,24 @@
                                 }
                             ],
                             "title": "Sovraccarico"
+                        },
+                        {
+                            "type": "entities",
+                            "entities": [
+                                {
+                                    "entity": "binary_sensor.tapparella_sala_overheating"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_sala_overheating"
+                                },
+                                {
+                                    "entity": "binary_sensor.luci_bagno_overheating"
+                                },
+                                {
+                                    "entity": "binary_sensor.luce_camera_overheating"
+                                }
+                            ],
+                            "title": "Surriscaldamento"
                         }
                     ]
                 }

diff --git a/packages/shelly/shelly_customizations.yaml b/packages/shelly/shelly_customizations.yaml
index 30d17938a84a01a8706f3b6cb9a5e628e1a297f5..5e4af21a078bf4db61f5353e79f7d0819105e977 100644 (file)
--- a/packages/shelly/shelly_customizations.yaml
+++ b/packages/shelly/shelly_customizations.yaml
@@ -26,6 +26,12 @@ homeassistant:
       friendly_name: Tapparella Cucina - Potenza Segnale
     sensor.tapparella_cucina_uptime:
       friendly_name: Tapparella Cucina - Uptime
+    button.tapparella_cucina_ota_update:
+      friendly_name: Tapparella Cucina - Aggiorna con Firwmare Ufficiale
+    button.tapparella_cucina_ota_update_beta:
+      friendly_name: Tapparella Cucina - Aggiorna con Firmware Beta
+    button.tapparella_cucina_reboot:
+      friendly_name: Tapparella Cucina - Riavvia Dispositivo
 
     # Shelly 2 - Tapparella Sala (shellyswitch25_6919bd)
     sensor.tapparella_sala_energy:
@@ -48,6 +54,12 @@ homeassistant:
       friendly_name: Tapparella Sala - Potenza Segnale
     sensor.tapparella_sala_uptime:
       friendly_name: Tapparella Sala - Uptime
+    button.tapparella_sala_ota_update:
+      friendly_name: Tapparella Sala - Aggiorna con Firwmare Ufficiale
+    button.tapparella_sala_ota_update_beta:
+      friendly_name: Tapparella Sala - Aggiorna con Firmware Beta
+    button.tapparella_sala_reboot:
+      friendly_name: Tapparella Sala - Riavvia Dispositivo
 
     # Shelly 3 - Tapparella Studio (shellyswitch_13572b)
     sensor.tapparella_studio_energy:
@@ -66,6 +78,12 @@ homeassistant:
       friendly_name: Tapparella Studio - Potenza Segnale
     sensor.tapparella_studio_uptime:
       friendly_name: Tapparella Studio - Uptime
+    button.tapparella_studio_ota_update:
+      friendly_name: Tapparella Studio - Aggiorna con Firwmare Ufficiale
+    button.tapparella_studio_ota_update_beta:
+      friendly_name: Tapparella Studio - Aggiorna con Firmware Beta
+    button.tapparella_studio_reboot:
+      friendly_name: Tapparella Studio - Riavvia Dispositivo
 
     # Shelly 4 - Tapparella Camera (shellyswitch_559c49)
     sensor.tapparella_camera_energy:
@@ -84,6 +102,12 @@ homeassistant:
       friendly_name: Tapparella Camera - Potenza Segnale
     sensor.tapparella_camera_uptime:
       friendly_name: Tapparella Camera - Uptime
+    button.tapparella_camera_ota_update:
+      friendly_name: Tapparella Camera - Aggiorna con Firwmare Ufficiale
+    button.tapparella_camera_ota_update_beta:
+      friendly_name: Tapparella Camera - Aggiorna con Firmware Beta
+    button.tapparella_camera_reboot:
+      friendly_name: Tapparella Camera - Riavvia Dispositivo
 
     # Shelly 5 - Luce Corridoio (shelly1_24d1ee)
     binary_sensor.luce_corridoio_cloud:
@@ -94,6 +118,12 @@ homeassistant:
       friendly_name: Luce Corridoio - Potenza Segnale
     sensor.luce_corridoio_uptime:
       friendly_name: Luce Corridoio - Uptime
+    button.luce_corridoio_ota_update:
+      friendly_name: Luce Corridoio - Aggiorna con Firwmare Ufficiale
+    button.luce_corridoio_ota_update_beta:
+      friendly_name: Luce Corridoio - Aggiorna con Firmware Beta
+    button.luce_corridoio_reboot:
+      friendly_name: Luce Corridoio - Riavvia Dispositivo
 
     # Shelly 6 - Luce Cucina (shelly1_93B27D)
     binary_sensor.luce_cucina_cloud:
@@ -104,6 +134,12 @@ homeassistant:
       friendly_name: Luce Cucina - Potenza Segnale
     sensor.luce_cucina_uptime:
       friendly_name: Luce Cucina - Uptime
+    button.luce_cucina_ota_update:
+      friendly_name: Luce Cucina - Aggiorna con Firwmare Ufficiale
+    button.luce_cucina_ota_update_beta:
+      friendly_name: Luce Cucina - Aggiorna con Firmware Beta
+    button.luce_cucina_reboot:
+      friendly_name: Luce Cucina - Riavvia Dispositivo
 
     # Shelly 7 - Luce Sala (shellydimmer_d3ea58)
     binary_sensor.luce_sala_channel_1_input:
@@ -128,8 +164,14 @@ homeassistant:
       friendly_name: Luce Sala - Potenza Segnale
     sensor.luce_sala_uptime:
       friendly_name: Luce Sala - Uptime
+    button.luce_sala_ota_update:
+      friendly_name: Luce Sala - Aggiorna con Firwmare Ufficiale
+    button.luce_sala_ota_update_beta:
+      friendly_name: Luce Sala - Aggiorna con Firmware Beta
+    button.luce_sala_reboot:
+      friendly_name: Luce Sala - Riavvia Dispositivo
 
-    # Shelly 8 - Luci Bagno (shellyswitch25_7457d8)
+    # Shelly 8 - Luci Bagno (shellyswitch25_C45BBE6C38D0)
     sensor.luce_bagno_energy:
       friendly_name: Luci Bagno - Energia Luce Bagno
     binary_sensor.luce_bagno_overpowering:
@@ -154,6 +196,12 @@ homeassistant:
       friendly_name: Luci Bagno - Potenza Segnale
     sensor.luci_bagno_uptime:
       friendly_name: Luci Bagno - Uptime
+    button.luci_bagno_ota_update:
+      friendly_name: Luci Bagno - Aggiorna con Firwmare Ufficiale
+    button.luci_bagno_ota_update_beta:
+      friendly_name: Luci Bagno - Aggiorna con Firmware Beta
+    button.luci_bagno_reboot:
+      friendly_name: Luci Bagno - Riavvia Dispositivo
 
     # Shelly 9 - Luce Studio (shelly1_59e18c)
     binary_sensor.luce_studio_cloud:
@@ -164,6 +212,12 @@ homeassistant:
       friendly_name: Luce Studio - Potenza Segnale
     sensor.luce_studio_uptime:
       friendly_name: Luce Studio - Uptime
+    button.luce_studio_ota_update:
+      friendly_name: Luce Studio - Aggiorna con Firwmare Ufficiale
+    button.luce_studio_ota_update_beta:
+      friendly_name: Luce Studio - Aggiorna con Firmware Beta
+    button.luce_studio_reboot:
+      friendly_name: Luce Studio - Riavvia Dispositivo
 
     # Shelly 10 - Luce Camera (shellydimmer_d46cf2)
     binary_sensor.luce_camera_channel_1_input:
@@ -188,6 +242,12 @@ homeassistant:
       friendly_name: Luce Camera - Potenza Segnale
     sensor.luce_camera_uptime:
       friendly_name: Luce Camera - Uptime
+    button.luce_camera_ota_update:
+      friendly_name: Luce Camera - Aggiorna con Firwmare Ufficiale
+    button.luce_camera_ota_update_beta:
+      friendly_name: Luce Camera - Aggiorna con Firmware Beta
+    button.luce_camera_reboot:
+      friendly_name: Luce Camera - Riavvia Dispositivo
 
     # Shelly 11 - Luce Balcone (shelly1_c423c8)
     binary_sensor.luce_balcone_cloud:
@@ -198,6 +258,12 @@ homeassistant:
       friendly_name: Luce Balcone - Potenza Segnale
     sensor.luce_balcone_uptime:
       friendly_name: Luce Balcone - Uptime
+    button.luce_balcone_ota_update:
+      friendly_name: Luce Balcone - Aggiorna con Firwmare Ufficiale
+    button.luce_balcone_ota_update_beta:
+      friendly_name: Luce Balcone - Aggiorna con Firmware Beta
+    button.luce_balcone_reboot:
+      friendly_name: Luce Balcone - Riavvia Dispositivo
 
     # Shelly Bulb (shellybulb_bc8610)
     binary_sensor.luce_divano_cloud:
@@ -208,6 +274,12 @@ homeassistant:
       friendly_name: Luce Divano - Potenza Segnale
     sensor.luce_divano_uptime:
       friendly_name: Luce Divano - Uptime
+    button.luce_divano_ota_update:
+      friendly_name: Luce Divano - Aggiorna con Firwmare Ufficiale
+    button.luce_divano_ota_update_beta:
+      friendly_name: Luce Divano - Aggiorna con Firmware Beta
+    button.luce_divano_reboot:
+      friendly_name: Luce Divano - Riavvia Dispositivo
 
     # Shelly EM (shellyem_b9e1a0)
     switch.shelly_em:
@@ -240,3 +312,9 @@ homeassistant:
       friendly_name: Shelly EM - Potenza Segnale
     sensor.shelly_em_uptime:
       friendly_name: Shelly EM - Uptime
+    button.shelly_em_ota_update:
+      friendly_name: Shelly EM - Aggiorna con Firwmare Ufficiale
+    button.shelly_em_ota_update_beta:
+      friendly_name: Shelly EM - Aggiorna con Firmware Beta
+    button.shelly_em_reboot:
+      friendly_name: Shelly EM - Riavvia Dispositivo

diff --git a/packages/shelly/shelly_operations.yaml b/packages/shelly/shelly_operations.yaml
index 0652cda5ce35b4916d8a8e5c2065f210144af1fe..c1b0db8c8a584228fc7e2dbab3db4535981ed2cc 100644 (file)
--- a/packages/shelly/shelly_operations.yaml
+++ b/packages/shelly/shelly_operations.yaml
@@ -7,7 +7,7 @@ script:
   # Shelly: Upgrade
   ######################################################################
   shelly_upgrade:
-    alias: "Shelly: Aggiornamento Firmware"
+    alias: "Shelly: Aggiornamento Firmware Collettivo"
     sequence:
       # Shelly 2 Tapparella Cucina
       - service: mqtt.publish
@@ -21,7 +21,7 @@ script:
   # Shelly: Reboot
   ######################################################################
   shelly_reboot:
-    alias: "Shelly: Riavvia Dispositivi"
+    alias: "Shelly: Riavvio Dispositivi Collettivo"
     sequence:
       - service: shell_command.shelly_reboot
 

diff --git a/shell_scripts/shelly_upgrade.sh b/shell_scripts/shelly_upgrade.sh
index 1de2f651d289a56f94d51235a15f8175cff77f6a..393f2c302027c4e88841f521b1454a8317803a9c 100755 (executable)
--- a/shell_scripts/shelly_upgrade.sh
+++ b/shell_scripts/shelly_upgrade.sh
@@ -16,7 +16,7 @@ SHELLY_ID=(
        shelly1-24D1EE
        shelly1-93B27D
        shellydimmer-D3EA58
-       shellyswitch25-7457D8
+       shellyswitch25-C45BBE6C38D0
        shelly1-59E18C
        shellydimmer-D46CF2
        shelly1-C423C8

diff --git a/www/images/devices/shelly/shelly.jpg b/www/images/devices/shelly/shelly.jpg
new file mode 100644 (file)
index 0000000..614efbb
Binary files /dev/null and b/www/images/devices/shelly/shelly.jpg differ

diff --git a/www/images/devices/shelly/shelly.xcf b/www/images/devices/shelly/shelly.xcf
new file mode 100644 (file)
index 0000000..02ac14b
Binary files /dev/null and b/www/images/devices/shelly/shelly.xcf differ

diff --git a/www/images/devices/shelly/shelly1.jpg b/www/images/devices/shelly/shelly1.jpg
new file mode 100644 (file)
index 0000000..22b546e
Binary files /dev/null and b/www/images/devices/shelly/shelly1.jpg differ

diff --git a/www/images/devices/shelly/shelly25.jpg b/www/images/devices/shelly/shelly25.jpg
new file mode 100644 (file)
index 0000000..9ad06d1
Binary files /dev/null and b/www/images/devices/shelly/shelly25.jpg differ

diff --git a/www/images/devices/shelly/shelly_bulb.jpg b/www/images/devices/shelly/shelly_bulb.jpg
new file mode 100644 (file)
index 0000000..0d850ff
Binary files /dev/null and b/www/images/devices/shelly/shelly_bulb.jpg differ

diff --git a/www/images/devices/shelly/shelly_dimmer.jpg b/www/images/devices/shelly/shelly_dimmer.jpg
new file mode 100644 (file)
index 0000000..6b4674d
Binary files /dev/null and b/www/images/devices/shelly/shelly_dimmer.jpg differ

diff --git a/www/images/devices/shelly/shelly_em.jpg b/www/images/devices/shelly/shelly_em.jpg
new file mode 100644 (file)
index 0000000..c75e6eb
Binary files /dev/null and b/www/images/devices/shelly/shelly_em.jpg differ

diff --git a/www/images/devices/shelly/shelly_logo_black.png b/www/images/devices/shelly/shelly_logo_black.png
new file mode 100644 (file)
index 0000000..ef78121
Binary files /dev/null and b/www/images/devices/shelly/shelly_logo_black.png differ

diff --git a/www/images/devices/shelly/shelly_logo_white.png b/www/images/devices/shelly/shelly_logo_white.png
new file mode 100644 (file)
index 0000000..a4d2fb9
Binary files /dev/null and b/www/images/devices/shelly/shelly_logo_white.png differ

diff --git a/www/images/devices/shelly/shelly_plug_s.jpg b/www/images/devices/shelly/shelly_plug_s.jpg
new file mode 100644 (file)
index 0000000..213ee8e
Binary files /dev/null and b/www/images/devices/shelly/shelly_plug_s.jpg differ

diff --git a/www/images/devices/shelly_logo_black.png b/www/images/devices/shelly_logo_black.png
deleted file mode 100644 (file)
index ef78121..0000000
Binary files a/www/images/devices/shelly_logo_black.png and /dev/null differ

diff --git a/www/images/devices/shelly_logo_white.png b/www/images/devices/shelly_logo_white.png
deleted file mode 100644 (file)
index a4d2fb9..0000000
Binary files a/www/images/devices/shelly_logo_white.png and /dev/null differ