Replaced shelly EM with Gen 4

diff --git a/.storage/lovelace.lovelace b/.storage/lovelace.lovelace
index c0fce78cbf7e4f7aade38e18cf1e56f9650fdf30..de559ee3ae084f5e0cc7b6c302ddcc769db28620 100644 (file)
--- a/.storage/lovelace.lovelace
+++ b/.storage/lovelace.lovelace
@@ -252,7 +252,7 @@
                     {
                       "type": "custom:mini-graph-card",
                       "entities": [
-                        "sensor.shelly_em_channel_1_potenza"
+                        "sensor.shelly_em_energy_meter_0_potenza"
                       ],
                       "hours_to_show": 24,
                       "points_per_hour": 120,
@@ -535,7 +535,7 @@
               "show_name": false,
               "show_state": true,
               "show_icon": true,
-              "entity": "sensor.shelly_em_channel_1_potenza"
+              "entity": "sensor.shelly_em_energy_meter_0_potenza"
             },
             {
               "type": "entity",
@@ -2204,7 +2204,7 @@
               "show_name": false,
               "show_state": true,
               "show_icon": true,
-              "entity": "sensor.shelly_em_channel_1_potenza",
+              "entity": "sensor.shelly_em_energy_meter_0_potenza",
               "color": ""
             },
             {
@@ -2212,7 +2212,7 @@
               "show_name": false,
               "show_state": true,
               "show_icon": true,
-              "entity": "sensor.shelly_em_channel_1_energia",
+              "entity": "sensor.shelly_em_energy_meter_0_energia",
               "color": ""
             },
             {
@@ -2220,16 +2220,16 @@
               "show_name": false,
               "show_state": true,
               "show_icon": true,
-              "entity": "sensor.shelly_em_channel_1_tensione",
+              "entity": "sensor.shelly_em_energy_meter_0_tensione",
               "color": ""
             }
           ],
           "cards": [
             {
-              "entity": "sensor.shelly_em_channel_1_potenza",
+              "entity": "sensor.shelly_em_energy_meter_0_potenza",
               "max": 6000,
               "min": 0,
-              "name": "Potenza Istantanea",
+              "name": "Potenza",
               "severity": {
                 "green": 0,
                 "yellow": 2000,
@@ -2279,7 +2279,7 @@
             {
               "type": "custom:plotly-graph",
               "entities": [
-                "sensor.shelly_em_channel_1_potenza"
+                "sensor.shelly_em_energy_meter_0_potenza"
               ],
               "hours_to_show": 24,
               "refresh_interval": 0,
@@ -3256,7 +3256,19 @@
                 },
                 {
                   "type": "picture",
-                  "image": "/local/images/rooms/bagno_off.jpg"
+                  "image": {
+                    "media_content_id": "/local/images/rooms/bagno_piccolo_off.jpg",
+                    "media_content_type": "",
+                    "metadata": {
+                      "navigateIds": [
+                        {},
+                        {
+                          "media_content_type": "",
+                          "media_content_id": "__MANUAL_ENTRY__"
+                        }
+                      ]
+                    }
+                  }
                 },
                 {
                   "type": "tile",

diff --git a/.storage/lovelace.lovelace_devices b/.storage/lovelace.lovelace_devices
index f812c1f596d663f927e9514a3596f39900db062e..06b6cd00a5be9f43456458ac731269baf9ae59f5 100644 (file)
--- a/.storage/lovelace.lovelace_devices
+++ b/.storage/lovelace.lovelace_devices
@@ -2718,20 +2718,20 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.shelly_em_channel_1_potenza",
+                                  "entity": "sensor.shelly_em_energy_meter_0_potenza",
                                   "name": "Potenza"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.shelly_em_channel_1_tensione",
+                                  "entity": "sensor.shelly_em_energy_meter_0_tensione",
                                   "name": "Tensione",
                                   "icon": "mdi:alpha-v-box"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.shelly_em_channel_1_fattore_di_potenza",
+                                  "entity": "sensor.shelly_em_energy_meter_0_fattore_di_potenza",
                                   "name": "FP",
                                   "icon": "mdi:angle-acute"
                                 },

diff --git a/README.md b/README.md
index ad34a820c093dd8bbcf84d7575445ef42645f41f..e733d0943f32f056a29a7c101b53a2c82faa0e6f 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ My server is an Intel NUC (NUC10i5FNH) with [Proxmox Virtual Environment](https:
 * Mitsubishi Air Conditioning (MSZ-LN25VG2V, MSZ-LN35VG2V)
 * Proxmox
 * QNAP NAS (TS-228A)
-* Shelly (Shelly1, Shelly2, Shelly2.5, ShellyEM, Shelly Dimmer)
+* Shelly (ShellyEM Gen4)
 * Sony Android TV (KD-55XF8596)
 * Xiaomi (MiJia door & window contact sensor, MiJia temperature & humidity sensor)
 

diff --git a/automations/energy.yaml b/automations/energy.yaml
index 88f4ee5e49008915bddeca58aa4e249a10251cd3..2a3a187c232cade1ed103da89753879162283a6e 100644 (file)
--- a/automations/energy.yaml
+++ b/automations/energy.yaml
@@ -7,13 +7,13 @@
 
   triggers:
     - trigger: numeric_state
-      entity_id: sensor.shelly_em_channel_1_potenza
+      entity_id: sensor.shelly_em_energy_meter_0_potenza
       above: 3300
 
   actions:
     - action: script.notify_all
       data_template:
         title: "Home Assistant - Consumo Energetico Elevato"
-        message: "Consumo energetico elevato ({{ states.sensor.shelly_em_channel_1_potenza.state }})."
+        message: "Consumo energetico elevato ({{ states.sensor.shelly_em_energy_meter_0_potenza.state }})."
         enable_persistent: false
         volume_level: 0.4

diff --git a/packages/shelly/shelly_customizations.yaml b/packages/shelly/shelly_customizations.yaml
index 41db6471076a3ea9acf731d91b26e199b7e7b82e..1a8a218cdede780894529debff3e3b0e5c188f44 100644 (file)
--- a/packages/shelly/shelly_customizations.yaml
+++ b/packages/shelly/shelly_customizations.yaml
@@ -5,45 +5,63 @@
 homeassistant:
   customize:
 
-    # Shelly EM (shellyem_b9f0d0)
+    # Shelly EM Gen4 (ACEBE6C8F2D8)
     switch.shelly_em:
       friendly_name: Pulsante
-    sensor.shelly_em_channel_1_potenza:
-      friendly_name: Potenza Istantanea
-    sensor.shelly_em_channel_1_energia:
-      friendly_name: Energia
-    sensor.shelly_em_channel_1_energia_cost:
-      friendly_name: Costo Energia
-    sensor.shelly_em_channel_1_energia_restituita:
-      friendly_name: Energia Restituita
-    sensor.shelly_em_channel_1_tensione:
-      friendly_name: Tensione
-    sensor.shelly_em_channel_1_fattore_di_potenza:
-      friendly_name: Fattore di Potenza Canale 1
-    sensor.shelly_em_channel_2_potenza:
-      friendly_name: Potenza Istantanea Canale 2
-    sensor.shelly_em_channel_2_energia:
-      friendly_name: Energia Canale 2
-    sensor.shelly_em_channel_2_energia_restituita:
-      friendly_name: Energia Restituita Canale 2
-    sensor.shelly_em_channel_2_tensione:
-      friendly_name: Tensione Canale 2
-    sensor.shelly_em_channel_2_fattore_di_potenza:
-      friendly_name: Fattore di Potenza Canale 2
-    binary_sensor.shelly_em_sovra_potenza:
-      friendly_name: Sovraccarico Energetico
-    binary_sensor.shelly_em_cloud:
-      friendly_name: Connessione Cloud
     update.shelly_em_firmware:
       friendly_name: Aggiornamento Firmware
     update.shelly_em_firmware_beta:
       friendly_name: Aggiornamento Firmware Beta
-    sensor.shelly_em_intensita_del_segnale:
-      friendly_name: Potenza Segnale
-    sensor.shelly_em_ultimo_riavvio:
-      friendly_name: Ultimo Riavvio
     button.shelly_em_riavvia:
       friendly_name: Riavvia Dispositivo
+    binary_sensor.shelly_em_cloud:
+      friendly_name: Connessione Cloud
+    sensor.shelly_em_intensita_del_segnale:
+      friendly_name: Potenza Segnale
+    binary_sensor.shelly_em_riavvio_richiesto:
+      friendly_name: Riavvio Richiesto
+    sensor.shelly_em_temperatura:
+      friendly_name: Temperatura
+    sensor.shelly_em_tempo_di_attivita:
+      friendly_name: Tempo di Attività
+    # Energy Meter A
+    sensor.shelly_em_energy_meter_0_potenza:
+      friendly_name: Potenza
+    sensor.shelly_em_energy_meter_0_energia:
+      friendly_name: Energia
+    sensor.shelly_em_energy_meter_0_energia_cost:
+      friendly_name: Costo Energia
+    sensor.shelly_em_energy_meter_0_fattore_di_potenza:
+      friendly_name: Fattore di Potenza
+    sensor.shelly_em_energy_meter_0_potenza_apparente:
+      friendly_name: Potenza Apparente
+    sensor.shelly_em_energy_meter_0_corrente:
+      friendly_name: Corrente
+    sensor.shelly_em_energy_meter_0_energia_restituita:
+      friendly_name: Energia Restituita
+    sensor.shelly_em_energy_meter_0_frequenza:
+      friendly_name: Frequenza
+    sensor.shelly_em_energy_meter_0_tensione:
+      friendly_name: Tensione
+    # Energy Meter B
+    sensor.shelly_em_energy_meter_1_potenza:
+      friendly_name: Potenza
+    sensor.shelly_em_energy_meter_1_energia:
+      friendly_name: Energia
+    sensor.shelly_em_energy_meter_1_energia_cost:
+      friendly_name: Costo Energia
+    sensor.shelly_em_energy_meter_1_fattore_di_potenza:
+      friendly_name: Fattore di Potenza
+    sensor.shelly_em_energy_meter_1_potenza_apparente:
+      friendly_name: Potenza Apparente
+    sensor.shelly_em_energy_meter_1_corrente:
+      friendly_name: Corrente
+    sensor.shelly_em_energy_meter_1_energia_restituita:
+      friendly_name: Energia Restituita
+    sensor.shelly_em_energy_meter_1_frequenza:
+      friendly_name: Frequenza
+    sensor.shelly_em_energy_meter_1_tensione:
+      friendly_name: Tensione
 
     # Shelly Bulb (shellybulb_bc8610)
     binary_sensor.luce_piantana_cloud:

diff --git a/packages/shelly/shelly_log.yaml b/packages/shelly/shelly_log.yaml
index 8cbfef262d33c97b2710288de29ff19d2bef28c7..99e418014eeb62d237296ec6bf0aa4fccefe57d1 100644 (file)
--- a/packages/shelly/shelly_log.yaml
+++ b/packages/shelly/shelly_log.yaml
@@ -5,24 +5,36 @@
 logbook:
   exclude:
     entities:
-      # Shelly EM (shellyem_b9f0d0)
+      # Shelly EM Gen4 (ACEBE6C8F2D8)
       - switch.shelly_em
-      #- sensor.shelly_em_channel_1_potenza
-      - sensor.shelly_em_channel_1_energia
-      - sensor.shelly_em_channel_1_energia_cost
-      - sensor.shelly_em_channel_1_energia_restituita
-      - sensor.shelly_em_channel_1_tensione
-      - sensor.shelly_em_channel_1_fattore_di_potenza
-      - sensor.shelly_em_channel_2_potenza
-      - sensor.shelly_em_channel_2_energia
-      - sensor.shelly_em_channel_2_energia_restituita
-      - sensor.shelly_em_channel_2_tensione
-      - sensor.shelly_em_channel_2_fattore_di_potenza
-      - binary_sensor.shelly_em_sovra_potenza
-      - binary_sensor.shelly_em_cloud
       - update.shelly_em_firmware
+      - update.shelly_em_firmware_beta
+      - button.shelly_em_riavvia
+      - binary_sensor.shelly_em_cloud
       - sensor.shelly_em_intensita_del_segnale
-      - sensor.shelly_em_ultimo_riavvio
+      - binary_sensor.shelly_em_riavvio_richiesto
+      - sensor.shelly_em_temperatura
+      - sensor.shelly_em_tempo_di_attivita
+      # Energy Meter A
+      #- sensor.shelly_em_energy_meter_0_potenza
+      - sensor.shelly_em_energy_meter_0_energia
+      - sensor.shelly_em_energy_meter_0_energia_cost
+      - sensor.shelly_em_energy_meter_0_fattore_di_potenza
+      - sensor.shelly_em_energy_meter_0_potenza_apparente
+      - sensor.shelly_em_energy_meter_0_corrente
+      - sensor.shelly_em_energy_meter_0_energia_restituita
+      - sensor.shelly_em_energy_meter_0_frequenza
+      - sensor.shelly_em_energy_meter_0_tensione
+      # Energy Meter B
+      - sensor.shelly_em_energy_meter_1_potenza
+      - sensor.shelly_em_energy_meter_1_energia
+      - sensor.shelly_em_energy_meter_1_energia_cost
+      - sensor.shelly_em_energy_meter_1_fattore_di_potenza
+      - sensor.shelly_em_energy_meter_1_potenza_apparente
+      - sensor.shelly_em_energy_meter_1_corrente
+      - sensor.shelly_em_energy_meter_1_energia_restituita
+      - sensor.shelly_em_energy_meter_1_frequenza
+      - sensor.shelly_em_energy_meter_1_tensione
       # Shelly Bulb (shellybulb_bc8610)
       - binary_sensor.luce_piantana_cloud
       - update.luce_piantana_firmware_update
@@ -36,24 +48,36 @@ logbook:
 recorder:
   exclude:
     entities:
-      # Shelly EM (shellyem_b9f0d0)
+      # Shelly EM Gen4 (ACEBE6C8F2D8)
       - switch.shelly_em
-      #- sensor.shelly_em_channel_1_potenza
-      #- sensor.shelly_em_channel_1_energia
-      #- sensor.shelly_em_channel_1_energia_cost
-      - sensor.shelly_em_channel_1_energia_restituita
-      - sensor.shelly_em_channel_1_tensione
-      - sensor.shelly_em_channel_2_fattore_di_potenza
-      - sensor.shelly_em_channel_2_potenza
-      - sensor.shelly_em_channel_2_energia
-      - sensor.shelly_em_channel_2_energia_restituita
-      - sensor.shelly_em_channel_2_tensione
-      - sensor.shelly_em_channel_1_fattore_di_potenza
-      - binary_sensor.shelly_em_sovra_potenza
-      - binary_sensor.shelly_em_cloud
       - update.shelly_em_firmware
+      - update.shelly_em_firmware_beta
+      - button.shelly_em_riavvia
+      - binary_sensor.shelly_em_cloud
       - sensor.shelly_em_intensita_del_segnale
-      - sensor.shelly_em_ultimo_riavvio
+      - binary_sensor.shelly_em_riavvio_richiesto
+      - sensor.shelly_em_temperatura
+      - sensor.shelly_em_tempo_di_attivita
+      # Energy Meter A
+      #- sensor.shelly_em_energy_meter_0_potenza
+      #- sensor.shelly_em_energy_meter_0_energia
+      #- sensor.shelly_em_energy_meter_0_energia_cost
+      - sensor.shelly_em_energy_meter_0_fattore_di_potenza
+      - sensor.shelly_em_energy_meter_0_potenza_apparente
+      - sensor.shelly_em_energy_meter_0_corrente
+      - sensor.shelly_em_energy_meter_0_energia_restituita
+      - sensor.shelly_em_energy_meter_0_frequenza
+      - sensor.shelly_em_energy_meter_0_tensione
+      # Energy Meter B
+      - sensor.shelly_em_energy_meter_1_potenza
+      - sensor.shelly_em_energy_meter_1_energia
+      - sensor.shelly_em_energy_meter_1_energia_cost
+      - sensor.shelly_em_energy_meter_1_fattore_di_potenza
+      - sensor.shelly_em_energy_meter_1_potenza_apparente
+      - sensor.shelly_em_energy_meter_1_corrente
+      - sensor.shelly_em_energy_meter_1_energia_restituita
+      - sensor.shelly_em_energy_meter_1_frequenza
+      - sensor.shelly_em_energy_meter_1_tensione
       # Shelly Bulb (shellybulb_bc8610)
       - binary_sensor.luce_piantana_cloud
       - update.luce_piantana_firmware_update

diff --git a/template_messages/speech.yaml b/template_messages/speech.yaml
index 5a254c9e1647bf4fa6cd53149ba229cf1ee0aec9..ec26f3c700a127b1748d5270fe370e8a9b299277 100644 (file)
--- a/template_messages/speech.yaml
+++ b/template_messages/speech.yaml
@@ -114,7 +114,7 @@
 
   {# Consumption Status #}
   {%- macro status_consumption() -%}
-  "Il consumo istantaneo è pari a {{ states.sensor.shelly_em_channel_1_potenza.state }} watt"
+  "Il consumo istantaneo è pari a {{ states.sensor.shelly_em_energy_meter_0_potenza.state }} watt"
   {%- endmacro -%}
 
   {# Location Status #}

diff --git a/utility_meter/energy.yaml b/utility_meter/energy.yaml
index e4050b9ef7d5619a78fa27b4ad7b428f37c7fc12..03f9b17b46083ce12ac2697e0603165463432573 100644 (file)
--- a/utility_meter/energy.yaml
+++ b/utility_meter/energy.yaml
@@ -3,9 +3,9 @@
 ######################################################################
 
 consumo_energetico_giornaliero:
-  source: sensor.shelly_em_channel_1_energia
+  source: sensor.shelly_em_energy_meter_0_energia
   cycle: daily
 
 consumo_energetico_mensile:
-  source: sensor.shelly_em_channel_1_energia
+  source: sensor.shelly_em_energy_meter_0_energia
   cycle: monthly