Moved shelly from mqtt to native integration (with the exception of shelly bulb)

diff --git a/.storage/lovelace b/.storage/lovelace
index de5c3c5472aa34c7b742cb329dce19043c54963c..fcea7d535e173ab7564fbb0fd2ae78a0a470deb2 100644 (file)
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -41,7 +41,7 @@
                             "entity": "binary_sensor.central_heating"
                         },
                         {
-                            "entity": "sensor.potenza_istantanea"
+                            "entity": "sensor.shelly_em_channel_1_power"
                         },
                         {
                             "entity": "sensor.front_balcony_temperature"
@@ -267,30 +267,100 @@
                             "type": "vertical-stack"
                         },
                         {
-                            "detail": 2,
-                            "entity": "sensor.potenza_istantanea",
-                            "graph": "line",
-                            "type": "sensor",
-                            "unit": "W"
+                            "type": "custom:mini-graph-card",
+                            "entities": [
+                                "sensor.potenza_istantanea"
+                            ],
+                            "hours_to_show": 24,
+                            "points_per_hour": 120,
+                            "line_width": 3,
+                            "color_thresholds": [
+                                {
+                                    "value": 0,
+                                    "color": "#00ff00"
+                                },
+                                {
+                                    "value": 1500,
+                                    "color": "#c0392b"
+                                },
+                                {
+                                    "value": 2500,
+                                    "color": "#c0392b"
+                                }
+                            ],
+                            "decimals": 0,
+                            "hour24": true
                         },
                         {
+                            "type": "horizontal-stack",
                             "cards": [
                                 {
-                                    "detail": 1,
-                                    "entity": "sensor.front_balcony_temperature",
-                                    "graph": "line",
-                                    "name": "Temperatura Balcone",
-                                    "type": "sensor"
+                                    "type": "custom:mini-graph-card",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.front_balcony_temperature",
+                                            "name": "Balcone"
+                                        }
+                                    ],
+                                    "name": "Balcone",
+                                    "hours_to_show": 24,
+                                    "points_per_hour": 1,
+                                    "show": {
+                                        "name": true,
+                                        "state": true
+                                    },
+                                    "line_width": 5,
+                                    "color_thresholds": [
+                                        {
+                                            "value": 16,
+                                            "color": "#4a90e2"
+                                        },
+                                        {
+                                            "value": 19,
+                                            "color": "#ffbd00"
+                                        },
+                                        {
+                                            "value": 23,
+                                            "color": "#ee7c3a"
+                                        }
+                                    ],
+                                    "hour24": true,
+                                    "decimals": 0
                                 },
                                 {
-                                    "detail": 1,
-                                    "entity": "sensor.rear_balcony_temperature",
-                                    "graph": "line",
-                                    "name": "Temperatura Veranda",
-                                    "type": "sensor"
+                                    "type": "custom:mini-graph-card",
+                                    "entities": [
+                                        {
+                                            "entity": "sensor.rear_balcony_temperature",
+                                            "name": "Veranda"
+                                        }
+                                    ],
+                                    "name": "Veranda",
+                                    "hours_to_show": 24,
+                                    "points_per_hour": 1,
+                                    "show": {
+                                        "name": true,
+                                        "state": true
+                                    },
+                                    "line_width": 5,
+                                    "color_thresholds": [
+                                        {
+                                            "value": 16,
+                                            "color": "#4a90e2"
+                                        },
+                                        {
+                                            "value": 19,
+                                            "color": "#ffbd00"
+                                        },
+                                        {
+                                            "value": 23,
+                                            "color": "#ee7c3a"
+                                        }
+                                    ],
+                                    "hour24": true,
+                                    "decimals": 0
                                 }
-                            ],
-                            "type": "vertical-stack"
+                            ]
                         }
                     ]
                 },
@@ -1219,22 +1289,31 @@
                     ]
                 },
                 {
+                    "icon": "mdi:flash",
+                    "id": "power",
+                    "title": "Monitoraggio Energetico",
                     "badges": [
-                        "sensor.potenza_istantanea",
-                        "sensor.potenza_reattiva",
-                        "sensor.tensione"
+                        {
+                            "entity": "sensor.shelly_em_channel_1_power"
+                        },
+                        {
+                            "entity": "sensor.shelly_em_channel_1_energy"
+                        },
+                        {
+                            "entity": "sensor.shelly_em_channel_1_voltage"
+                        }
                     ],
                     "cards": [
                         {
                             "detail": 2,
-                            "entity": "sensor.potenza_istantanea",
+                            "entity": "sensor.shelly_em_channel_1_power",
                             "graph": "line",
                             "name": "Consumo Energetico",
                             "type": "sensor",
                             "unit": "W"
                         },
                         {
-                            "entity": "sensor.potenza_istantanea",
+                            "entity": "sensor.shelly_em_channel_1_power",
                             "max": 4000,
                             "min": 0,
                             "name": "Potenza Istantanea",
@@ -1258,10 +1337,7 @@
                             "title": "Consumi",
                             "type": "entities"
                         }
-                    ],
-                    "icon": "mdi:flash",
-                    "id": "power",
-                    "title": "Monitoraggio Energetico"
+                    ]
                 },
                 {
                     "badges": [

diff --git a/.storage/lovelace_resources b/.storage/lovelace_resources
index 2f027644905c2cd71d2c50033689cf021eaf9b2b..4e6aeae3307581f9208614d64a3477daac97bdc6 100644 (file)
--- a/.storage/lovelace_resources
+++ b/.storage/lovelace_resources
@@ -26,7 +26,7 @@
             {
                 "id": "6c8988516c824aa99cbd556a0b4ff39c",
                 "type": "module",
-                "url": "/hacsfiles/lovelace-layout-card/layout-card.js"
+                "url": "/hacsfiles/lovelace-layout-card/layout-card.js?hacstag=156434866230"
             },
             {
                 "id": "b28e5c5a648145f0828a10f89b1b7770",
@@ -39,7 +39,7 @@
                 "id": "74408ca439a142a1838d883c03a0142c"
             },
             {
-                "url": "/hacsfiles/lovelace-swipe-navigation/swipe-navigation.js",
+                "url": "/hacsfiles/lovelace-swipe-navigation/swipe-navigation.js?hacstag=183995552136",
                 "type": "module",
                 "id": "737d0af49e4a49c881d60ef2c724203a"
             },
@@ -47,6 +47,11 @@
                 "url": "/hacsfiles/lovelace-card-mod/card-mod.js",
                 "type": "module",
                 "id": "1235e3ac5c7348f19284d47961cc2109"
+            },
+            {
+                "url": "/hacsfiles/mini-graph-card/mini-graph-card-bundle.js",
+                "type": "module",
+                "id": "e4685ccd929f4e71a561d0d397f8ae80"
             }
         ]
     }

diff --git a/automations/energy.yaml b/automations/energy.yaml
index a96bb25f242821dba1f9c600a8410b6ef7d94296..2d2ad38a5b64771f5dea37c4ffc375718db9f177 100644 (file)
--- a/automations/energy.yaml
+++ b/automations/energy.yaml
@@ -6,13 +6,13 @@
 
   trigger:
     - platform: numeric_state
-      entity_id: sensor.potenza_istantanea
+      entity_id: sensor.shelly_em_channel_1_power
       above: 2950
 
   action:
     service: script.notify_all
     data_template:
       title: "Home Assistant - Allarme Consumo Energetico"
-      message: "Consumo energetico elevato ({{ states.sensor.potenza_istantanea.state }})."
+      message: "Consumo energetico elevato ({{ states.ssensor.shelly_em_channel_1_power.state }})."
       enable_persistent: 0
       volume_level: 0.4

diff --git a/cover/camera.yaml b/cover/camera.yaml
deleted file mode 100644 (file)
index df7720e..0000000
--- a/cover/camera.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-######################################################################
-# Bedroom Cover
-######################################################################
-
-- platform: mqtt
-  name: Tapparella Camera
-  command_topic: "shellies/shellyswitch-559C49/roller/0/command"
-  position_topic: "shellies/shellyswitch-559C49/roller/0/pos"
-  set_position_topic: "shellies/shellyswitch-559C49/roller/0/command/pos"
-  payload_open: "open"
-  payload_close: "close"
-  payload_stop: "stop"
-  position_open: 100
-  position_closed: 0
-  retain: false
-  optimistic: false
-  qos: 0

diff --git a/cover/cucina.yaml b/cover/cucina.yaml
deleted file mode 100644 (file)
index c929712..0000000
--- a/cover/cucina.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-######################################################################
-# Kitchen Cover
-######################################################################
-
-- platform: mqtt
-  name: Tapparella Cucina
-  command_topic: "shellies/shellyswitch-55980F/roller/0/command"
-  position_topic: "shellies/shellyswitch-55980F/roller/0/pos"
-  set_position_topic: "shellies/shellyswitch-55980F/roller/0/command/pos"
-  payload_open: "open"
-  payload_close: "close"
-  payload_stop: "stop"
-  position_open: 100
-  position_closed: 0
-  retain: false
-  optimistic: false
-  qos: 0

diff --git a/cover/sala.yaml b/cover/sala.yaml
deleted file mode 100644 (file)
index ddb988d..0000000
--- a/cover/sala.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-######################################################################
-# Living Room Cover
-######################################################################
-
-- platform: mqtt
-  name: Tapparella Sala
-  command_topic: "shellies/shellyswitch25-6919BD/roller/0/command"
-  position_topic: "shellies/shellyswitch25-6919BD/roller/0/pos"
-  set_position_topic: "shellies/shellyswitch25-6919BD/roller/0/command/pos"
-  payload_open: "open"
-  payload_close: "close"
-  payload_stop: "stop"
-  position_open: 100
-  position_closed: 0
-  retain: false
-  optimistic: false
-  qos: 0

diff --git a/cover/studio.yaml b/cover/studio.yaml
deleted file mode 100644 (file)
index a82a924..0000000
--- a/cover/studio.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-######################################################################
-# Office Cover
-######################################################################
-
-- platform: mqtt
-  name: Tapparella Studio
-  command_topic: "shellies/shellyswitch-13572B/roller/0/command"
-  position_topic: "shellies/shellyswitch-13572B/roller/0/pos"
-  set_position_topic: "shellies/shellyswitch-13572B/roller/0/command/pos"
-  payload_open: "open"
-  payload_close: "close"
-  payload_stop: "stop"
-  position_open: 100
-  position_closed: 0
-  retain: false
-  optimistic: false
-  qos: 0

diff --git a/light/bagno.yaml b/light/bagno.yaml
index 0801297d30506c9c41ef82623d91cf6c314e4433..728669f80761dde9fa8507001e63afb1e65a2d1b 100644 (file)
--- a/light/bagno.yaml
+++ b/light/bagno.yaml
@@ -1,31 +1,3 @@
-######################################################################
-# Bathroom Light
-######################################################################
-
-- platform: mqtt
-  name: Luce Bagno
-  command_topic: "shellies/shellyswitch25-7457D8/relay/0/command"
-  state_topic: "shellies/shellyswitch25-7457D8/relay/0"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 0
-  optimistic: false
-
-######################################################################
-# Bathroom Mirror Light
-######################################################################
-
-- platform: mqtt
-  name: Luce Specchio
-  command_topic: "shellies/shellyswitch25-7457D8/relay/1/command"
-  state_topic: "shellies/shellyswitch25-7457D8/relay/1"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 0
-  optimistic: false
-
 ######################################################################
 # Bathroom Global
 ######################################################################

diff --git a/light/balcone.yaml b/light/balcone.yaml
deleted file mode 100644 (file)
index a503f31..0000000
--- a/light/balcone.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Balcony Light
-######################################################################
-
-- platform: mqtt
-  name: Luce Balcone
-  command_topic: "shellies/shelly1-C423C8/relay/0/command"
-  state_topic: "shellies/shelly1-C423C8/relay/0"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 0
-  optimistic: false

diff --git a/light/camera.yaml b/light/camera.yaml
deleted file mode 100644 (file)
index b030c66..0000000
--- a/light/camera.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-######################################################################
-# Bedroom Light
-######################################################################
-
-- platform: mqtt
-  schema: template
-  name: Luce Camera
-  state_topic: "shellies/shellydimmer-D46CF2/light/0/status"
-  state_template: >
-    {% if value_json.ison %}
-      on
-    {% else %}
-      off
-    {% endif %}
-  command_topic: "shellies/shellydimmer-D46CF2/light/0/set"
-  command_on_template: >
-    {"turn": "on"
-      {% if brightness is defined %}
-        , "brightness": {{ brightness | float | multiply(0.3922) | round(0) }}
-      {% endif %}
-    }
-  command_off_template: '{ "turn" : "off" }'
-  brightness_template: "{{ value_json.brightness | float | multiply(2.55) | round(0) }}"
-  retain: false
-  qos: 0
-  optimistic: false

diff --git a/light/corridoio.yaml b/light/corridoio.yaml
deleted file mode 100644 (file)
index 4445644..0000000
--- a/light/corridoio.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Corridor Light
-######################################################################
-
-- 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: 0
-  optimistic: false

diff --git a/light/cucina.yaml b/light/cucina.yaml
deleted file mode 100644 (file)
index 7938a24..0000000
--- a/light/cucina.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Kitchen 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: 0
-  optimistic: false

diff --git a/light/sala.yaml b/light/sala.yaml
index e3470409e322998471b42d404b60527d16fffb7c..3b834b56ed195005db83b28cf70d0d6551161edf 100644 (file)
--- a/light/sala.yaml
+++ b/light/sala.yaml
@@ -1,30 +1,3 @@
-######################################################################
-# Living Room Light
-######################################################################
-
-- platform: mqtt
-  schema: template
-  name: Luce Sala
-  state_topic: "shellies/shellydimmer-D3EA58/light/0/status"
-  state_template: >
-    {% if value_json.ison %}
-      on
-    {% else %}
-      off
-    {% endif %}
-  command_topic: "shellies/shellydimmer-D3EA58/light/0/set"
-  command_on_template: >
-    {"turn": "on"
-      {% if brightness is defined %}
-        , "brightness": {{ brightness | float | multiply(0.3922) | round(0) }}
-      {% endif %}
-    }
-  command_off_template: '{ "turn" : "off" }'
-  brightness_template: "{{ value_json.brightness | float | multiply(2.55) | round(0) }}"
-  retain: false
-  qos: 0
-  optimistic: false
-
 ######################################################################
 # Living Room Couch Light (Color)
 ######################################################################

diff --git a/light/studio.yaml b/light/studio.yaml
deleted file mode 100644 (file)
index 01b309e..0000000
--- a/light/studio.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-######################################################################
-# Office Light
-######################################################################
-
-- platform: mqtt
-  name: Luce Studio
-  command_topic: "shellies/shelly1-59E18C/relay/0/command"
-  state_topic: "shellies/shelly1-59E18C/relay/0"
-  payload_on: "on"
-  payload_off: "off"
-  retain: false
-  qos: 0
-  optimistic: false

diff --git a/log/history.yaml b/log/history.yaml
index 8480c422f831ed49d42e9dac4d654c7a6c457202..b9b73162b2235bcaa11d07a2ba3edcb5ddcdcbee 100644 (file)
--- a/log/history.yaml
+++ b/log/history.yaml
@@ -28,9 +28,6 @@ exclude:
     - sensor.cert_expiry_server_giorgioravera_it
     - sensor.cert_expiry_timestamp_server_giorgioravera_it
     # Energy Sensors
-    - sensor.potenza_reattiva
-    - sensor.tensione
-    - sensor.consumo_energetico
     - sensor.consumo_energetico_giornaliero
     - sensor.consumo_energetico_mensile
     # Zigbee2mqtt

diff --git a/log/logbook.yaml b/log/logbook.yaml
index 78acd324476961cf334d6cc5f3d6af878f733693..c3f8a94144b3f5bafd4d68c7778d8282a66d6479 100644 (file)
--- a/log/logbook.yaml
+++ b/log/logbook.yaml
@@ -28,9 +28,6 @@ exclude:
     - sensor.cert_expiry_server_giorgioravera_it
     - sensor.cert_expiry_timestamp_server_giorgioravera_it
     # Energy Sensors
-    - sensor.potenza_reattiva
-    - sensor.tensione
-    - sensor.consumo_energetico
     - sensor.consumo_energetico_giornaliero
     - sensor.consumo_energetico_mensile
     # Zigbee2mqtt

diff --git a/log/recorder.yaml b/log/recorder.yaml
index 8c20a79e5e958a6084ba5d6dcb600f92d0f0a60f..46273039e1cdd13e7f67bc4a0a8734a2feed28f2 100644 (file)
--- a/log/recorder.yaml
+++ b/log/recorder.yaml
@@ -30,9 +30,6 @@ exclude:
     - sensor.cert_expiry_server_giorgioravera_it
     - sensor.cert_expiry_timestamp_server_giorgioravera_it
     # Energy Sensors
-    - sensor.potenza_reattiva
-    - sensor.tensione
-    - sensor.consumo_energetico
     - sensor.consumo_energetico_giornaliero
     - sensor.consumo_energetico_mensile
     # Zigbee2mqtt

diff --git a/packages/shelly/shelly_customizations.yaml b/packages/shelly/shelly_customizations.yaml
index fff7746984774caf20f293d382cfe314fd98deb3..674b34f8b81134d2baaf5b31bd094915f0dd278a 100644 (file)
--- a/packages/shelly/shelly_customizations.yaml
+++ b/packages/shelly/shelly_customizations.yaml
@@ -6,6 +6,235 @@ homeassistant:
   customize:
     script.shelly_upgrade:
       icon: mdi:cellphone-arrow-down
-
     script.shelly_reboot:
       icon: mdi:restart
+
+    # Shelly 1 - Tapparella Cucina (shellyswitch_55980f)
+    sensor.tapparella_cucina_energy:
+      friendly_name: Tapparella Cucina - Energia
+    sensor.tapparella_cucina_power:
+      friendly_name: Tapparella Cucina - Potenza
+    binary_sensor.tapparella_cucina_channel_1_input:
+      friendly_name: Tapparella Cucina - Pulsante 1
+    binary_sensor.tapparella_cucina_channel_2_input:
+      friendly_name: Tapparella Cucina - Pulsante 2
+    binary_sensor.tapparella_cucina_cloud:
+      friendly_name: Tapparella Cucina - Connessione Cloud
+    binary_sensor.tapparella_cucina_firmware_update:
+      friendly_name: Tapparella Cucina - Aggiornamento Firmware
+    sensor.tapparella_cucina_rssi:
+      friendly_name: Tapparella Cucina - Potenza Segnale
+    sensor.tapparella_cucina_uptime:
+      friendly_name: Tapparella Cucina - Uptime
+
+    # Shelly 2 - Tapparella Sala (shellyswitch25_6919bd)
+    sensor.tapparella_sala_energy:
+      friendly_name: Tapparella Sala - Energia
+    sensor.tapparella_sala_power:
+      friendly_name: Tapparella Sala - Potenza
+    binary_sensor.tapparella_sala_channel_1_input:
+      friendly_name: Tapparella Sala - Pulsante 1
+    binary_sensor.tapparella_sala_channel_2_input:
+      friendly_name: Tapparella Sala - Pulsante 2
+    binary_sensor.tapparella_sala_cloud:
+      friendly_name: Tapparella Sala - Connessione Cloud
+    sensor.tapparella_sala_device_temperature:
+      friendly_name: Tapparella Sala - Temperatura Device
+    binary_sensor.tapparella_sala_overheating:
+      friendly_name: Tapparella Sala - Surriscaldamento Device
+    binary_sensor.tapparella_sala_firmware_update:
+      friendly_name: Tapparella Sala - Aggiornamento Firmware
+    sensor.tapparella_sala_rssi:
+      friendly_name: Tapparella Sala - Potenza Segnale
+    sensor.tapparella_sala_uptime:
+      friendly_name: Tapparella Sala - Uptime
+
+    # Shelly 3 - Tapparella Studio (shellyswitch_13572b)
+    sensor.tapparella_studio_energy:
+      friendly_name: Tapparella Studio - Energia
+    sensor.tapparella_studio_power:
+      friendly_name: Tapparella Studio - Potenza
+    binary_sensor.tapparella_studio_channel_1_input:
+      friendly_name: Tapparella Studio - Pulsante 1
+    binary_sensor.tapparella_studio_channel_2_input:
+      friendly_name: Tapparella Studio - Pulsante 2
+    binary_sensor.tapparella_studio_cloud:
+      friendly_name: Tapparella Studio - Connessione Cloud
+    binary_sensor.tapparella_studio_firmware_update:
+      friendly_name: Tapparella Studio - Aggiornamento Firmware
+    sensor.tapparella_studio_rssi:
+      friendly_name: Tapparella Studio - Potenza Segnale
+    sensor.tapparella_studio_uptime:
+      friendly_name: Tapparella Studio - Uptime
+
+    # Shelly 4 - Tapparella Camera (shellyswitch_559c49)
+    sensor.tapparella_camera_energy:
+      friendly_name: Tapparella Camera - Energia
+    sensor.tapparella_camera_power:
+      friendly_name: Tapparella Camera - Potenza
+    binary_sensor.tapparella_camera_channel_1_input:
+      friendly_name: Tapparella Camera - Pulsante 1
+    binary_sensor.tapparella_camera_channel_2_input:
+      friendly_name: Tapparella Camera - Pulsante 2
+    binary_sensor.tapparella_camera_cloud:
+      friendly_name: Tapparella Camera - Connessione Cloud
+    binary_sensor.tapparella_camera_firmware_update:
+      friendly_name: Tapparella Camera - Aggiornamento Firmware
+    sensor.tapparella_camera_rssi:
+      friendly_name: Tapparella Camera - Potenza Segnale
+    sensor.tapparella_camera_uptime:
+      friendly_name: Tapparella Camera - Uptime
+
+    # Shelly 5 - Luce Corridoio (shelly1_24d1ee)
+    binary_sensor.luce_corridoio_cloud:
+      friendly_name: Luce Corridoio - Connessione Cloud
+    binary_sensor.luce_corridoio_firmware_update:
+      friendly_name: Luce Corridoio - Aggiornamento Firmware
+    sensor.luce_corridoio_rssi:
+      friendly_name: Luce Corridoio - Potenza Segnale
+    sensor.luce_corridoio_uptime:
+      friendly_name: Luce Corridoio - Uptime
+
+    # Shelly 6 - Luce Cucina (shelly1_93B27D)
+    binary_sensor.luce_cucina_cloud:
+      friendly_name: Luce Cucina - Connessione Cloud
+    binary_sensor.luce_cucina_firmware_update:
+      friendly_name: Luce Cucina - Aggiornamento Firmware
+    sensor.luce_cucina_rssi:
+      friendly_name: Luce Cucina - Potenza Segnale
+    sensor.luce_cucina_uptime:
+      friendly_name: Luce Cucina - Uptime
+
+    # Shelly 7 - Luce Sala (shellydimmer_d3ea58)
+    binary_sensor.luce_sala_channel_1_input:
+      friendly_name: Luce Sala - Pulsante 1
+    binary_sensor.luce_sala_channel_2_input:
+      friendly_name: Luce Sala - Pulsante 2
+    sensor.luce_sala_energy:
+      friendly_name: Luci Sala - Energia
+    sensor.luce_sala_power:
+      friendly_name: Luci Sala - Potenza
+    binary_sensor.luce_sala_overpowering:
+      friendly_name: Luci Sala - Sovraccarico Energetico
+    binary_sensor.luce_sala_cloud:
+      friendly_name: Luce Sala - Connessione Cloud
+    sensor.luce_sala_device_temperature:
+      friendly_name: Luci Sala - Temperatura Device
+    binary_sensor.luce_sala_overheating:
+      friendly_name: Luci Sala - Surriscaldamento Device
+    binary_sensor.luce_sala_firmware_update:
+      friendly_name: Luce Sala - Aggiornamento Firmware
+    sensor.luce_sala_rssi:
+      friendly_name: Luce Sala - Potenza Segnale
+    sensor.luce_sala_uptime:
+      friendly_name: Luce Sala - Uptime
+
+    # Shelly 8 - Luci Bagno (shellyswitch25_7457d8)
+    sensor.luci_bagno_channel_1_energy:
+      friendly_name: Luci Bagno - Energia Canale 1
+    binary_sensor.luci_bagno_channel_1_overpowering:
+      friendly_name: Luci Bagno - Sovraccarico Energetico Canale 1
+    sensor.luci_bagno_channel_1_power:
+      friendly_name: Luci Bagno - Potenza Canale 1
+    sensor.luci_bagno_channel_2_energy:
+      friendly_name: Luci Bagno - Energia Canale 2
+    binary_sensor.luci_bagno_channel_2_overpowering:
+      friendly_name: Luci Bagno - Sovraccarico Energetico Canale 2
+    sensor.luci_bagno_channel_2_power:
+      friendly_name: Luci Bagno - Potenza Canale 2
+    binary_sensor.luci_bagno_cloud:
+      friendly_name: Luci Bagno - Connessione Cloud
+    sensor.luci_bagno_device_temperature:
+      friendly_name: Luci Bagno - Temperatura Device
+    binary_sensor.luci_bagno_overheating:
+      friendly_name: Luci Bagno - Surriscaldamento Device
+    binary_sensor.luci_bagno_firmware_update:
+      friendly_name: Luci Bagno - Aggiornamento Firmware
+    sensor.luci_bagno_rssi:
+      friendly_name: Luci Bagno - Potenza Segnale
+    sensor.luci_bagno_uptime:
+      friendly_name: Luci Bagno - Uptime
+
+    # Shelly 9 - Luce Studio (shelly1_59e18c)
+    binary_sensor.luce_studio_cloud:
+      friendly_name: Luce Studio - Connessione Cloud
+    binary_sensor.luce_studio_firmware_update:
+      friendly_name: Luce Studio - Aggiornamento Firmware
+    sensor.luce_studio_rssi:
+      friendly_name: Luce Studio - Potenza Segnale
+    sensor.luce_studio_uptime:
+      friendly_name: Luce Studio - Uptime
+
+    # Shelly 10 - Luce Camera (shellydimmer_d46cf2)
+    binary_sensor.luce_camera_channel_1_input:
+      friendly_name: Luce Camera - Pulsante 1
+    binary_sensor.luce_camera_channel_2_input:
+      friendly_name: Luce Camera - Pulsante 2
+    sensor.luce_camera_energy:
+      friendly_name: Luci Camera - Energia
+    sensor.luce_camera_power:
+      friendly_name: Luci Camera - Potenza
+    binary_sensor.luce_camera_overpowering:
+      friendly_name: Luci Camera - Sovraccarico Energetico
+    binary_sensor.luce_camera_cloud:
+      friendly_name: Luce Camera - Connessione Cloud
+    sensor.luce_camera_device_temperature:
+      friendly_name: Luci Camera - Temperatura Device
+    binary_sensor.luce_camera_overheating:
+      friendly_name: Luci Camera - Surriscaldamento Device
+    binary_sensor.luce_camera_firmware_update:
+      friendly_name: Luce Camera - Aggiornamento Firmware
+    sensor.luce_camera_rssi:
+      friendly_name: Luce Camera - Potenza Segnale
+    sensor.luce_camera_uptime:
+      friendly_name: Luce Camera - Uptime
+
+    # Shelly 11 - Luce Balcone (shelly1_c423c8)
+    binary_sensor.luce_balcone_cloud:
+      friendly_name: Luce Balcone - Connessione Cloud
+    binary_sensor.luce_balcone_firmware_update:
+      friendly_name: Luce Balcone - Aggiornamento Firmware
+    sensor.luce_balcone_rssi:
+      friendly_name: Luce Balcone - Potenza Segnale
+    sensor.luce_balcone_uptime:
+      friendly_name: Luce Balcone - Uptime
+
+    # Shelly EM (shellyem_b9e1a0)
+    switch.shelly_em:
+      friendly_name: Shelly EM - Pulsante
+    sensor.shelly_em_channel_1_power:
+      friendly_name: Potenza Istantanea
+    sensor.shelly_em_channel_1_energy:
+      friendly_name: Energia
+    sensor.shelly_em_channel_1_energy_returned:
+      friendly_name: Energia Restituita
+    sensor.shelly_em_channel_1_voltage:
+      friendly_name: Tensione
+    sensor.shelly_em_channel_2_power:
+      friendly_name: Potenza Istantanea Canale 2
+    sensor.shelly_em_channel_2_energy:
+      friendly_name: Energia Canale 2
+    sensor.shelly_em_channel_2_energy_returned:
+      friendly_name: Energia Restituita Canale 2
+    sensor.shelly_em_channel_2_voltage:
+      friendly_name: Tensione Canale 2
+    binary_sensor.shelly_em_overpowering:
+      friendly_name: Shelly EM - Sovraccarico Energetico
+    binary_sensor.shelly_em_cloud:
+      friendly_name: Shelly EM - Connessione Cloud
+    binary_sensor.shelly_em_firmware_update:
+      friendly_name: Shelly EM - Aggiornamento Firmware
+    sensor.shelly_em_rssi:
+      friendly_name: Shelly EM - Potenza Segnale
+    sensor.shelly_em_uptime:
+      friendly_name: Shelly EM - Uptime
+
+    # Shelly Bulb (shellybulb_bc8610)
+    binary_sensor.luce_divano_cloud:
+      friendly_name: Luce Divano - Connessione Cloud
+    binary_sensor.luce_divano_firmware_update:
+      friendly_name: Luce Divano - Aggiornamento Firmware
+    sensor.luce_divano_rssi:
+      friendly_name: Luce Divano - Potenza Segnale
+    sensor.luce_divano_uptime:
+      friendly_name: Luce Divano - Uptime

diff --git a/packages/shelly/shelly_log.yaml b/packages/shelly/shelly_log.yaml
index 652726e49dab11009730e6b99df5b628d9e81c66..66f345bcc45ae7ea512f9e408fc3f0330d36bf00 100644 (file)
--- a/packages/shelly/shelly_log.yaml
+++ b/packages/shelly/shelly_log.yaml
@@ -19,6 +19,121 @@ history:
       - sensor.shellybulb\r
       - sensor.shellyem\r
       - sensor.shellyplugs\r
+      # Shelly 1 - Tapparella Cucina (shellyswitch_55980f)\r
+      - sensor.tapparella_cucina_energy\r
+      - sensor.tapparella_cucina_power\r
+      - binary_sensor.tapparella_cucina_channel_1_input\r
+      - binary_sensor.tapparella_cucina_channel_2_input\r
+      - binary_sensor.tapparella_cucina_cloud\r
+      - binary_sensor.tapparella_cucina_firmware_update\r
+      - sensor.tapparella_cucina_rssi\r
+      - sensor.tapparella_cucina_uptime\r
+      # Shelly 2 - Tapparella Sala (shellyswitch25_6919bd)\r
+      - sensor.tapparella_sala_energy\r
+      - sensor.tapparella_sala_power\r
+      - binary_sensor.tapparella_sala_channel_1_input\r
+      - binary_sensor.tapparella_sala_channel_2_input\r
+      - binary_sensor.tapparella_sala_cloud\r
+      - sensor.tapparella_sala_device_temperature\r
+      - binary_sensor.tapparella_sala_overheating\r
+      - binary_sensor.tapparella_sala_firmware_update\r
+      - sensor.tapparella_sala_rssi\r
+      - sensor.tapparella_sala_uptime\r
+      # Shelly 3 - Tapparella Studio (shellyswitch_13572b)\r
+      - sensor.tapparella_studio_energy\r
+      - sensor.tapparella_studio_power\r
+      - binary_sensor.tapparella_studio_channel_1_input\r
+      - binary_sensor.tapparella_studio_channel_2_input\r
+      - binary_sensor.tapparella_studio_cloud\r
+      - binary_sensor.tapparella_studio_firmware_update\r
+      - sensor.tapparella_studio_rssi\r
+      - sensor.tapparella_studio_uptime\r
+      # Shelly 4 - Tapparella Camera (shellyswitch_559c49)\r
+      - sensor.tapparella_camera_energy\r
+      - sensor.tapparella_camera_power\r
+      - binary_sensor.tapparella_camera_channel_1_input\r
+      - binary_sensor.tapparella_camera_channel_2_input\r
+      - binary_sensor.tapparella_camera_cloud\r
+      - binary_sensor.tapparella_camera_firmware_update\r
+      - sensor.tapparella_camera_rssi\r
+      - sensor.tapparella_camera_uptime\r
+      # Shelly 5 - Luce Corridoio (shelly1_24d1ee)\r
+      - binary_sensor.luce_corridoio_cloud\r
+      - binary_sensor.luce_corridoio_firmware_update\r
+      - sensor.luce_corridoio_rssi\r
+      - sensor.luce_corridoio_uptime\r
+      # Shelly 6 - Luce Cucina (shelly1_93B27D)\r
+      - binary_sensor.luce_cucina_cloud\r
+      - binary_sensor.luce_cucina_firmware_update\r
+      - sensor.luce_cucina_rssi\r
+      - sensor.luce_cucina_uptime\r
+      # Shelly 7 - Luce Sala (shellydimmer_d3ea58)\r
+      - binary_sensor.luce_sala_channel_1_input\r
+      - binary_sensor.luce_sala_channel_2_input\r
+      - sensor.luce_sala_energy\r
+      - sensor.luce_sala_power\r
+      - binary_sensor.luce_sala_overpowering\r
+      - binary_sensor.luce_sala_cloud\r
+      - sensor.luce_sala_device_temperature\r
+      - binary_sensor.luce_sala_overheating\r
+      - binary_sensor.luce_sala_firmware_update\r
+      - sensor.luce_sala_rssi\r
+      - sensor.luce_sala_uptime\r
+      # Shelly 8 - Luci Bagno (shellyswitch25_7457d8)\r
+      - sensor.luci_bagno_channel_1_energy\r
+      - binary_sensor.luci_bagno_channel_1_overpowering\r
+      - sensor.luci_bagno_channel_1_power\r
+      - sensor.luci_bagno_channel_2_energy\r
+      - binary_sensor.luci_bagno_channel_2_overpowering\r
+      - sensor.luci_bagno_channel_2_power\r
+      - binary_sensor.luci_bagno_cloud\r
+      - sensor.luci_bagno_device_temperature\r
+      - binary_sensor.luci_bagno_overheating\r
+      - binary_sensor.luci_bagno_firmware_update\r
+      - sensor.luci_bagno_rssi\r
+      - sensor.luci_bagno_uptime\r
+      # Shelly 9 - Luce Studio (shelly1_59e18c)\r
+      - binary_sensor.luce_studio_cloud\r
+      - binary_sensor.luce_studio_firmware_update\r
+      - sensor.luce_studio_rssi\r
+      - sensor.luce_studio_uptime\r
+      # Shelly 10 - Luce Camera (shellydimmer_d46cf2)\r
+      - binary_sensor.luce_camera_channel_1_input\r
+      - binary_sensor.luce_camera_channel_2_input\r
+      - sensor.luce_camera_energy\r
+      - sensor.luce_camera_power\r
+      - binary_sensor.luce_camera_overpowering\r
+      - binary_sensor.luce_camera_cloud\r
+      - sensor.luce_camera_device_temperature\r
+      - binary_sensor.luce_camera_overheating\r
+      - binary_sensor.luce_camera_firmware_update\r
+      - sensor.luce_camera_rssi\r
+      - sensor.luce_camera_uptime\r
+      # Shelly 11 - Luce Balcone (shelly1_c423c8)\r
+      - binary_sensor.luce_balcone_cloud\r
+      - binary_sensor.luce_balcone_firmware_update\r
+      - sensor.luce_balcone_rssi\r
+      - sensor.luce_balcone_uptime\r
+      # Shelly EM (shellyem_b9e1a0)\r
+      - switch.shelly_em\r
+      - sensor.shelly_em_channel_1_power\r
+      - sensor.shelly_em_channel_1_energy\r
+      - sensor.shelly_em_channel_1_energy_returned\r
+      - sensor.shelly_em_channel_1_voltage\r
+      - sensor.shelly_em_channel_2_power\r
+      - sensor.shelly_em_channel_2_energy\r
+      - sensor.shelly_em_channel_2_energy_returned\r
+      - sensor.shelly_em_channel_2_voltage\r
+      - binary_sensor.shelly_em_overpowering\r
+      - binary_sensor.shelly_em_cloud\r
+      - binary_sensor.shelly_em_firmware_update\r
+      - sensor.shelly_em_rssi\r
+      - sensor.shelly_em_uptime\r
+      # Shelly Bulb (shellybulb_bc8610)\r
+      - binary_sensor.luce_divano_cloud\r
+      - binary_sensor.luce_divano_firmware_update\r
+      - sensor.luce_divano_rssi\r
+      - sensor.luce_divano_uptime\r
 \r
 ######################################################################\r
 # Shelly Package - Logbook\r
@@ -41,6 +156,121 @@ logbook:
       - sensor.shellybulb\r
       - sensor.shellyem\r
       - sensor.shellyplugs\r
+      # Shelly 1 - Tapparella Cucina (shellyswitch_55980f)\r
+      - sensor.tapparella_cucina_energy\r
+      - sensor.tapparella_cucina_power\r
+      - binary_sensor.tapparella_cucina_channel_1_input\r
+      - binary_sensor.tapparella_cucina_channel_2_input\r
+      - binary_sensor.tapparella_cucina_cloud\r
+      - binary_sensor.tapparella_cucina_firmware_update\r
+      - sensor.tapparella_cucina_rssi\r
+      - sensor.tapparella_cucina_uptime\r
+      # Shelly 2 - Tapparella Sala (shellyswitch25_6919bd)\r
+      - sensor.tapparella_sala_energy\r
+      - sensor.tapparella_sala_power\r
+      - binary_sensor.tapparella_sala_channel_1_input\r
+      - binary_sensor.tapparella_sala_channel_2_input\r
+      - binary_sensor.tapparella_sala_cloud\r
+      - sensor.tapparella_sala_device_temperature\r
+      - binary_sensor.tapparella_sala_overheating\r
+      - binary_sensor.tapparella_sala_firmware_update\r
+      - sensor.tapparella_sala_rssi\r
+      - sensor.tapparella_sala_uptime\r
+      # Shelly 3 - Tapparella Studio (shellyswitch_13572b)\r
+      - sensor.tapparella_studio_energy\r
+      - sensor.tapparella_studio_power\r
+      - binary_sensor.tapparella_studio_channel_1_input\r
+      - binary_sensor.tapparella_studio_channel_2_input\r
+      - binary_sensor.tapparella_studio_cloud\r
+      - binary_sensor.tapparella_studio_firmware_update\r
+      - sensor.tapparella_studio_rssi\r
+      - sensor.tapparella_studio_uptime\r
+      # Shelly 4 - Tapparella Camera (shellyswitch_559c49)\r
+      - sensor.tapparella_camera_energy\r
+      - sensor.tapparella_camera_power\r
+      - binary_sensor.tapparella_camera_channel_1_input\r
+      - binary_sensor.tapparella_camera_channel_2_input\r
+      - binary_sensor.tapparella_camera_cloud\r
+      - binary_sensor.tapparella_camera_firmware_update\r
+      - sensor.tapparella_camera_rssi\r
+      - sensor.tapparella_camera_uptime\r
+      # Shelly 5 - Luce Corridoio (shelly1_24d1ee)\r
+      - binary_sensor.luce_corridoio_cloud\r
+      - binary_sensor.luce_corridoio_firmware_update\r
+      - sensor.luce_corridoio_rssi\r
+      - sensor.luce_corridoio_uptime\r
+      # Shelly 6 - Luce Cucina (shelly1_93B27D)\r
+      - binary_sensor.luce_cucina_cloud\r
+      - binary_sensor.luce_cucina_firmware_update\r
+      - sensor.luce_cucina_rssi\r
+      - sensor.luce_cucina_uptime\r
+      # Shelly 7 - Luce Sala (shellydimmer_d3ea58)\r
+      - binary_sensor.luce_sala_channel_1_input\r
+      - binary_sensor.luce_sala_channel_2_input\r
+      - sensor.luce_sala_energy\r
+      - sensor.luce_sala_power\r
+      - binary_sensor.luce_sala_overpowering\r
+      - binary_sensor.luce_sala_cloud\r
+      - sensor.luce_sala_device_temperature\r
+      - binary_sensor.luce_sala_overheating\r
+      - binary_sensor.luce_sala_firmware_update\r
+      - sensor.luce_sala_rssi\r
+      - sensor.luce_sala_uptime\r
+      # Shelly 8 - Luci Bagno (shellyswitch25_7457d8)\r
+      - sensor.luci_bagno_channel_1_energy\r
+      - binary_sensor.luci_bagno_channel_1_overpowering\r
+      - sensor.luci_bagno_channel_1_power\r
+      - sensor.luci_bagno_channel_2_energy\r
+      - binary_sensor.luci_bagno_channel_2_overpowering\r
+      - sensor.luci_bagno_channel_2_power\r
+      - binary_sensor.luci_bagno_cloud\r
+      - sensor.luci_bagno_device_temperature\r
+      - binary_sensor.luci_bagno_overheating\r
+      - binary_sensor.luci_bagno_firmware_update\r
+      - sensor.luci_bagno_rssi\r
+      - sensor.luci_bagno_uptime\r
+      # Shelly 9 - Luce Studio (shelly1_59e18c)\r
+      - binary_sensor.luce_studio_cloud\r
+      - binary_sensor.luce_studio_firmware_update\r
+      - sensor.luce_studio_rssi\r
+      - sensor.luce_studio_uptime\r
+      # Shelly 10 - Luce Camera (shellydimmer_d46cf2)\r
+      - binary_sensor.luce_camera_channel_1_input\r
+      - binary_sensor.luce_camera_channel_2_input\r
+      - sensor.luce_camera_energy\r
+      - sensor.luce_camera_power\r
+      - binary_sensor.luce_camera_overpowering\r
+      - binary_sensor.luce_camera_cloud\r
+      - sensor.luce_camera_device_temperature\r
+      - binary_sensor.luce_camera_overheating\r
+      - binary_sensor.luce_camera_firmware_update\r
+      - sensor.luce_camera_rssi\r
+      - sensor.luce_camera_uptime\r
+      # Shelly 11 - Luce Balcone (shelly1_c423c8)\r
+      - binary_sensor.luce_balcone_cloud\r
+      - binary_sensor.luce_balcone_firmware_update\r
+      - sensor.luce_balcone_rssi\r
+      - sensor.luce_balcone_uptime\r
+      # Shelly EM (shellyem_b9e1a0)\r
+      - switch.shelly_em\r
+      - sensor.shelly_em_channel_1_power\r
+      - sensor.shelly_em_channel_1_energy\r
+      - sensor.shelly_em_channel_1_energy_returned\r
+      - sensor.shelly_em_channel_1_voltage\r
+      - sensor.shelly_em_channel_2_power\r
+      - sensor.shelly_em_channel_2_energy\r
+      - sensor.shelly_em_channel_2_energy_returned\r
+      - sensor.shelly_em_channel_2_voltage\r
+      - binary_sensor.shelly_em_overpowering\r
+      - binary_sensor.shelly_em_cloud\r
+      - binary_sensor.shelly_em_firmware_update\r
+      - sensor.shelly_em_rssi\r
+      - sensor.shelly_em_uptime\r
+      # Shelly Bulb (shellybulb_bc8610)\r
+      - binary_sensor.luce_divano_cloud\r
+      - binary_sensor.luce_divano_firmware_update\r
+      - sensor.luce_divano_rssi\r
+      - sensor.luce_divano_uptime\r
 \r
 ######################################################################\r
 # Shelly Package - Recorder\r
@@ -63,3 +293,118 @@ recorder:
       - sensor.shellybulb\r
       - sensor.shellyem\r
       - sensor.shellyplugs\r
+      # Shelly 1 - Tapparella Cucina (shellyswitch_55980f)\r
+      - sensor.tapparella_cucina_energy\r
+      - sensor.tapparella_cucina_power\r
+      - binary_sensor.tapparella_cucina_channel_1_input\r
+      - binary_sensor.tapparella_cucina_channel_2_input\r
+      - binary_sensor.tapparella_cucina_cloud\r
+      - binary_sensor.tapparella_cucina_firmware_update\r
+      - sensor.tapparella_cucina_rssi\r
+      - sensor.tapparella_cucina_uptime\r
+      # Shelly 2 - Tapparella Sala (shellyswitch25_6919bd)\r
+      - sensor.tapparella_sala_energy\r
+      - sensor.tapparella_sala_power\r
+      - binary_sensor.tapparella_sala_channel_1_input\r
+      - binary_sensor.tapparella_sala_channel_2_input\r
+      - binary_sensor.tapparella_sala_cloud\r
+      - sensor.tapparella_sala_device_temperature\r
+      - binary_sensor.tapparella_sala_overheating\r
+      - binary_sensor.tapparella_sala_firmware_update\r
+      - sensor.tapparella_sala_rssi\r
+      - sensor.tapparella_sala_uptime\r
+      # Shelly 3 - Tapparella Studio (shellyswitch_13572b)\r
+      - sensor.tapparella_studio_energy\r
+      - sensor.tapparella_studio_power\r
+      - binary_sensor.tapparella_studio_channel_1_input\r
+      - binary_sensor.tapparella_studio_channel_2_input\r
+      - binary_sensor.tapparella_studio_cloud\r
+      - binary_sensor.tapparella_studio_firmware_update\r
+      - sensor.tapparella_studio_rssi\r
+      - sensor.tapparella_studio_uptime\r
+      # Shelly 4 - Tapparella Camera (shellyswitch_559c49)\r
+      - sensor.tapparella_camera_energy\r
+      - sensor.tapparella_camera_power\r
+      - binary_sensor.tapparella_camera_channel_1_input\r
+      - binary_sensor.tapparella_camera_channel_2_input\r
+      - binary_sensor.tapparella_camera_cloud\r
+      - binary_sensor.tapparella_camera_firmware_update\r
+      - sensor.tapparella_camera_rssi\r
+      - sensor.tapparella_camera_uptime\r
+      # Shelly 5 - Luce Corridoio (shelly1_24d1ee)\r
+      - binary_sensor.luce_corridoio_cloud\r
+      - binary_sensor.luce_corridoio_firmware_update\r
+      - sensor.luce_corridoio_rssi\r
+      - sensor.luce_corridoio_uptime\r
+      # Shelly 6 - Luce Cucina (shelly1_93B27D)\r
+      - binary_sensor.luce_cucina_cloud\r
+      - binary_sensor.luce_cucina_firmware_update\r
+      - sensor.luce_cucina_rssi\r
+      - sensor.luce_cucina_uptime\r
+      # Shelly 7 - Luce Sala (shellydimmer_d3ea58)\r
+      - binary_sensor.luce_sala_channel_1_input\r
+      - binary_sensor.luce_sala_channel_2_input\r
+      - sensor.luce_sala_energy\r
+      - sensor.luce_sala_power\r
+      - binary_sensor.luce_sala_overpowering\r
+      - binary_sensor.luce_sala_cloud\r
+      - sensor.luce_sala_device_temperature\r
+      - binary_sensor.luce_sala_overheating\r
+      - binary_sensor.luce_sala_firmware_update\r
+      - sensor.luce_sala_rssi\r
+      - sensor.luce_sala_uptime\r
+      # Shelly 8 - Luci Bagno (shellyswitch25_7457d8)\r
+      - sensor.luci_bagno_channel_1_energy\r
+      - binary_sensor.luci_bagno_channel_1_overpowering\r
+      - sensor.luci_bagno_channel_1_power\r
+      - sensor.luci_bagno_channel_2_energy\r
+      - binary_sensor.luci_bagno_channel_2_overpowering\r
+      - sensor.luci_bagno_channel_2_power\r
+      - binary_sensor.luci_bagno_cloud\r
+      - sensor.luci_bagno_device_temperature\r
+      - binary_sensor.luci_bagno_overheating\r
+      - binary_sensor.luci_bagno_firmware_update\r
+      - sensor.luci_bagno_rssi\r
+      - sensor.luci_bagno_uptime\r
+      # Shelly 9 - Luce Studio (shelly1_59e18c)\r
+      - binary_sensor.luce_studio_cloud\r
+      - binary_sensor.luce_studio_firmware_update\r
+      - sensor.luce_studio_rssi\r
+      - sensor.luce_studio_uptime\r
+      # Shelly 10 - Luce Camera (shellydimmer_d46cf2)\r
+      - binary_sensor.luce_camera_channel_1_input\r
+      - binary_sensor.luce_camera_channel_2_input\r
+      - sensor.luce_camera_energy\r
+      - sensor.luce_camera_power\r
+      - binary_sensor.luce_camera_overpowering\r
+      - binary_sensor.luce_camera_cloud\r
+      - sensor.luce_camera_device_temperature\r
+      - binary_sensor.luce_camera_overheating\r
+      - binary_sensor.luce_camera_firmware_update\r
+      - sensor.luce_camera_rssi\r
+      - sensor.luce_camera_uptime\r
+      # Shelly 11 - Luce Balcone (shelly1_c423c8)\r
+      - binary_sensor.luce_balcone_cloud\r
+      - binary_sensor.luce_balcone_firmware_update\r
+      - sensor.luce_balcone_rssi\r
+      - sensor.luce_balcone_uptime\r
+      # Shelly EM (shellyem_b9e1a0)\r
+      - switch.shelly_em\r
+      - sensor.shelly_em_channel_1_power\r
+      - sensor.shelly_em_channel_1_energy\r
+      - sensor.shelly_em_channel_1_energy_returned\r
+      - sensor.shelly_em_channel_1_voltage\r
+      - sensor.shelly_em_channel_2_power\r
+      - sensor.shelly_em_channel_2_energy\r
+      - sensor.shelly_em_channel_2_energy_returned\r
+      - sensor.shelly_em_channel_2_voltage\r
+      - binary_sensor.shelly_em_overpowering\r
+      - binary_sensor.shelly_em_cloud\r
+      - binary_sensor.shelly_em_firmware_update\r
+      - sensor.shelly_em_rssi\r
+      - sensor.shelly_em_uptime\r
+      # Shelly Bulb (shellybulb_bc8610)\r
+      - binary_sensor.luce_divano_cloud\r
+      - binary_sensor.luce_divano_firmware_update\r
+      - sensor.luce_divano_rssi\r
+      - sensor.luce_divano_uptime\r

diff --git a/sensor/energy.yaml b/sensor/energy.yaml
deleted file mode 100644 (file)
index 79e42e7..0000000
--- a/sensor/energy.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-######################################################################
-# Shelly EM
-######################################################################
-
-- platform: mqtt
-  name: "Potenza Istantanea"
-  state_topic: "shellies/shellyem-B9E1A0/emeter/0/power"
-  unit_of_measurement: 'W'
-  qos: 0
-  device_class: power
-
-- platform: mqtt
-  name: "Potenza Reattiva"
-  state_topic: "shellies/shellyem-B9E1A0/emeter/0/reactive_power"
-  unit_of_measurement: 'W'
-  qos: 0
-  device_class: power
-
-- platform: mqtt
-  name: "Tensione"
-  state_topic: "shellies/shellyem-B9E1A0/emeter/0/voltage"
-  unit_of_measurement: 'V'
-  qos: 0
-  device_class: power
-
-#- platform: mqtt
-#  name: "Energia Assorbita"
-#  state_topic: "shellies/shellyem-B9E1A0/emeter/0/energy"
-#  unit_of_measurement: 'Watt/min'
-#  qos: 0
-#  device_class: power
-
-- platform: mqtt
-  name: "Consumo Energetico"
-  state_topic: "shellies/shellyem-B9E1A0/emeter/0/total"
-  unit_of_measurement: 'kWh'
-  value_template: "{{ (( value|float )/(1000)) | round(2) }}"
-  qos: 0
-  device_class: power
-
-#- platform: mqtt
-#  name: "Energia Restituita"
-#  state_topic: "shellies/shellyem-B9E1A0/emeter/0/returned_energy"
-#  unit_of_measurement: 'Watt/min'
-#  qos: 0
-#  device_class: power

diff --git a/templates/speech_message.yaml b/templates/speech_message.yaml
index c562d801827d7eeb3dac8a0169d5163c09853595..61cdc301758688ffc80d04ae2938efc99f30988d 100644 (file)
--- a/templates/speech_message.yaml
+++ b/templates/speech_message.yaml
@@ -114,7 +114,7 @@
 \r
   {# Consumption Status #}\r
   {%- macro status_consumption() -%}\r
-  "Il consumo istantaneo è pari a {{ states.sensor.potenza_istantanea.state }} watt"\r
+  "Il consumo istantaneo è pari a {{ states.sensor.shelly_em_channel_1_power.state }} watt"\r
   {%- endmacro -%}\r
 \r
   {# Location Status #}\r

diff --git a/utility_meter/energy.yaml b/utility_meter/energy.yaml
index 893672e54e080a38234d445079dbb83947b3cb8e..5967fe721f4f0f6ddfed92d917aca8eb1cf1f26e 100644 (file)
--- a/utility_meter/energy.yaml
+++ b/utility_meter/energy.yaml
@@ -3,9 +3,9 @@
 ######################################################################
 
 consumo_energetico_giornaliero:
-  source: sensor.consumo_energetico
+  source: sensor.shelly_em_channel_1_energy
   cycle: daily
 
 consumo_energetico_mensile:
-  source: sensor.consumo_energetico
+  source: sensor.shelly_em_channel_1_energy
   cycle: monthly