Update netatmo valves

diff --git a/.storage/lovelace b/.storage/lovelace
index c187f57c6fd0c137550c347e047f8dacb1950774..d2795ab5e62d1297d6e0794f3c83541a8ed550a0 100644 (file)
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -63,7 +63,7 @@
                                     "entity": "cover.tapparella_cucina"
                                 },
                                 {
-                                    "entity": "climate.netatmo_cucina"
+                                    "entity": "climate.cucina"
                                 },
                                 {
                                     "entity": "media_player.google_home"
@@ -90,7 +90,7 @@
                                     "entity": "cover.tapparella_sala"
                                 },
                                 {
-                                    "entity": "climate.netatmo_sala"
+                                    "entity": "climate.sala"
                                 },
                                 {
                                     "entity": "media_player.sony_bravia_tv"
@@ -129,7 +129,7 @@
                                     "entity": "light.luce_specchio"
                                 },
                                 {
-                                    "entity": "climate.netatmo_bagno"
+                                    "entity": "climate.bagno"
                                 }
                             ],
                             "entity": "light.luci_bagno",
@@ -150,7 +150,7 @@
                                     "entity": "cover.tapparella_studio"
                                 },
                                 {
-                                    "entity": "climate.netatmo_studio"
+                                    "entity": "climate.studio"
                                 }
                             ],
                             "entity": "light.luce_studio",
@@ -171,7 +171,7 @@
                                     "entity": "cover.tapparella_camera"
                                 },
                                 {
-                                    "entity": "climate.netatmo_camera_da_letto"
+                                    "entity": "climate.camera"
                                 },
                                 {
                                     "entity": "media_player.tv_camera"
@@ -550,19 +550,19 @@
                     "path": "climate",
                     "badges": [
                         {
-                            "entity": "sensor.valve_cucina_temperature"
+                            "entity": "sensor.valvola_cucina_temperature"
                         },
                         {
-                            "entity": "sensor.valve_sala_temperature"
+                            "entity": "sensor.valvola_sala_temperature"
                         },
                         {
-                            "entity": "sensor.valve_bagno_temperature"
+                            "entity": "sensor.valvola_bagno_temperature"
                         },
                         {
-                            "entity": "sensor.valve_studio_temperature"
+                            "entity": "sensor.valvola_studio_temperature"
                         },
                         {
-                            "entity": "sensor.valve_camera_da_letto_temperature"
+                            "entity": "sensor.valvola_camera_temperature"
                         },
                         {
                             "entity": "sensor.temperatura_balcone_temperature"
@@ -582,23 +582,23 @@
                     ],
                     "cards": [
                         {
-                            "entity": "climate.netatmo_cucina",
+                            "entity": "climate.cucina",
                             "type": "thermostat"
                         },
                         {
-                            "entity": "climate.netatmo_sala",
+                            "entity": "climate.sala",
                             "type": "thermostat"
                         },
                         {
-                            "entity": "climate.netatmo_bagno",
+                            "entity": "climate.bagno",
                             "type": "thermostat"
                         },
                         {
-                            "entity": "climate.netatmo_studio",
+                            "entity": "climate.studio",
                             "type": "thermostat"
                         },
                         {
-                            "entity": "climate.netatmo_camera_da_letto",
+                            "entity": "climate.camera",
                             "type": "thermostat"
                         },
                         {
@@ -617,7 +617,7 @@
                                     "entity": "input_boolean.boost_valvola_bagno"
                                 },
                                 {
-                                    "entity": "input_boolean.boost_valvola_camera_da_letto"
+                                    "entity": "input_boolean.boost_valvola_camera"
                                 }
                             ],
                             "show_header_toggle": false,
@@ -639,7 +639,7 @@
                                     "entity": "input_boolean.valvola_bagno"
                                 },
                                 {
-                                    "entity": "input_boolean.valvola_camera_da_letto"
+                                    "entity": "input_boolean.valvola_camera"
                                 }
                             ],
                             "title": "Accensione / Spegnimento",
@@ -650,23 +650,23 @@
                             "title": "Stato Valvole Netatmo",
                             "entities": [
                                 {
-                                    "entity": "sensor.valve_cucina_state",
+                                    "entity": "sensor.valvola_cucina_state",
                                     "name": "Cucina"
                                 },
                                 {
-                                    "entity": "sensor.valve_sala_state",
+                                    "entity": "sensor.valvola_sala_state",
                                     "name": "Sala"
                                 },
                                 {
-                                    "entity": "sensor.valve_studio_state",
+                                    "entity": "sensor.valvola_studio_state",
                                     "name": "Studio"
                                 },
                                 {
-                                    "entity": "sensor.valve_bagno_state",
+                                    "entity": "sensor.valvola_bagno_state",
                                     "name": "Bagno"
                                 },
                                 {
-                                    "entity": "sensor.valve_camera_da_letto_state",
+                                    "entity": "sensor.valvola_camera_state",
                                     "name": "Camera"
                                 }
                             ]
@@ -675,27 +675,27 @@
                             "type": "custom:bar-card",
                             "entities": [
                                 {
-                                    "entity": "sensor.valve_cucina_battery",
+                                    "entity": "sensor.valvola_cucina_battery_percent",
                                     "name": "Cucina",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_sala_battery",
+                                    "entity": "sensor.valvola_sala_battery_percent",
                                     "name": "Sala",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_studio_battery",
+                                    "entity": "sensor.valvola_studio_battery_percent",
                                     "name": "Studio",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_bagno_battery",
+                                    "entity": "sensor.valvola_bagno_battery_percent",
                                     "name": "Bagno",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_camera_da_letto_battery",
+                                    "entity": "sensor.valvola_camera_battery_percent",
                                     "name": "Camera",
                                     "width": "85%"
                                 }
@@ -714,7 +714,7 @@
                             "type": "history-graph",
                             "entities": [
                                 {
-                                    "entity": "climate.netatmo_cucina"
+                                    "entity": "climate.cucina"
                                 }
                             ],
                             "hours_to_show": 24,
@@ -725,7 +725,7 @@
                             "type": "history-graph",
                             "entities": [
                                 {
-                                    "entity": "climate.netatmo_sala"
+                                    "entity": "climate.sala"
                                 }
                             ],
                             "hours_to_show": 24,
@@ -736,7 +736,7 @@
                             "type": "history-graph",
                             "entities": [
                                 {
-                                    "entity": "climate.netatmo_studio"
+                                    "entity": "climate.studio"
                                 }
                             ],
                             "hours_to_show": 24,
@@ -747,7 +747,7 @@
                             "type": "history-graph",
                             "entities": [
                                 {
-                                    "entity": "climate.netatmo_bagno"
+                                    "entity": "climate.bagno"
                                 }
                             ],
                             "hours_to_show": 24,
@@ -758,7 +758,7 @@
                             "type": "history-graph",
                             "entities": [
                                 {
-                                    "entity": "climate.netatmo_camera_da_letto"
+                                    "entity": "climate.camera"
                                 }
                             ],
                             "hours_to_show": 24,
@@ -1548,7 +1548,7 @@
                                             "type": "custom:mini-graph-card",
                                             "entities": [
                                                 {
-                                                    "entity": "sensor.valve_cucina_temperature",
+                                                    "entity": "sensor.valvola_cucina_temperature",
                                                     "name": "Cucina"
                                                 }
                                             ],
@@ -1581,7 +1581,7 @@
                                             "type": "custom:mini-graph-card",
                                             "entities": [
                                                 {
-                                                    "entity": "sensor.valve_sala_temperature",
+                                                    "entity": "sensor.valvola_sala_temperature",
                                                     "name": "Sala"
                                                 }
                                             ],
@@ -1619,7 +1619,7 @@
                                             "type": "custom:mini-graph-card",
                                             "entities": [
                                                 {
-                                                    "entity": "sensor.valve_bagno_temperature",
+                                                    "entity": "sensor.valvola_bagno_temperature",
                                                     "name": "Bagno"
                                                 }
                                             ],
@@ -1652,7 +1652,7 @@
                                             "type": "custom:mini-graph-card",
                                             "entities": [
                                                 {
-                                                    "entity": "sensor.valve_studio_temperature",
+                                                    "entity": "sensor.valvola_studio_temperature",
                                                     "name": "Studio"
                                                 }
                                             ],
@@ -1690,7 +1690,7 @@
                                             "type": "custom:mini-graph-card",
                                             "entities": [
                                                 {
-                                                    "entity": "sensor.valve_camera_da_letto_temperature",
+                                                    "entity": "sensor.valvola_camera_temperature",
                                                     "name": "Camera"
                                                 }
                                             ],

diff --git a/.storage/lovelace.lovelace_dispositivi b/.storage/lovelace.lovelace_dispositivi
index 5d1111a8508286cfa002e900d63a87b7a86edd3f..3c61c9243783dcb7b1bcfd6573eeed764f6047a7 100644 (file)
--- a/.storage/lovelace.lovelace_dispositivi
+++ b/.storage/lovelace.lovelace_dispositivi
@@ -302,27 +302,27 @@
                             "type": "custom:bar-card",
                             "entities": [
                                 {
-                                    "entity": "sensor.valve_cucina_battery",
+                                    "entity": "sensor.valvola_cucina_battery_percent",
                                     "name": "Cucina",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_sala_battery",
+                                    "entity": "sensor.valvola_sala_battery_percent",
                                     "name": "Sala",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_studio_battery",
+                                    "entity": "sensor.valvola_studio_battery_percent",
                                     "name": "Studio",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_bagno_battery",
+                                    "entity": "sensor.valvola_bagno_battery_percent",
                                     "name": "Bagno",
                                     "width": "85%"
                                 },
                                 {
-                                    "entity": "sensor.valve_camera_da_letto_battery",
+                                    "entity": "sensor.valvola_camera_battery_percent",
                                     "name": "Camera",
                                     "width": "85%"
                                 }
@@ -342,23 +342,23 @@
                             "title": "Stato Valvole Netatmo",
                             "entities": [
                                 {
-                                    "entity": "sensor.valve_cucina_state",
+                                    "entity": "sensor.valvola_cucina_state",
                                     "name": "Cucina"
                                 },
                                 {
-                                    "entity": "sensor.valve_sala_state",
+                                    "entity": "sensor.valvola_sala_state",
                                     "name": "Sala"
                                 },
                                 {
-                                    "entity": "sensor.valve_studio_state",
+                                    "entity": "sensor.valvola_studio_state",
                                     "name": "Studio"
                                 },
                                 {
-                                    "entity": "sensor.valve_bagno_state",
+                                    "entity": "sensor.valvola_bagno_state",
                                     "name": "Bagno"
                                 },
                                 {
-                                    "entity": "sensor.valve_camera_da_letto_state",
+                                    "entity": "sensor.valvola_camera_state",
                                     "name": "Camera"
                                 }
                             ]

diff --git a/packages/netatmo/netatmo_away.yaml b/packages/netatmo/netatmo_away.yaml
index 7f4083a5b596eb1917610be6391bfa43baef6ca0..5bb1a3f3f48b5164d7f4bc8b0d5a988f98c3e60e 100644 (file)
--- a/packages/netatmo/netatmo_away.yaml
+++ b/packages/netatmo/netatmo_away.yaml
@@ -10,12 +10,12 @@ script:
     sequence:
       - service: climate.set_preset_mode
         data:
-          entity_id: 
-            - climate.netatmo_cucina
-            - climate.netatmo_sala
-            - climate.netatmo_studio
-            - climate.netatmo_bagno
-            - climate.netatmo_camera_da_letto
+          entity_id:
+            - climate.cucina
+            - climate.sala
+            - climate.studio
+            - climate.bagno
+            - climate.camera
           preset_mode: away
 
   ######################################################################
@@ -25,12 +25,12 @@ script:
     sequence:
       - service: climate.set_hvac_mode
         data:
-          entity_id: 
-            - climate.netatmo_cucina
-            - climate.netatmo_sala
-            - climate.netatmo_studio
-            - climate.netatmo_bagno
-            - climate.netatmo_camera_da_letto
+          entity_id:
+            - climate.cucina
+            - climate.sala
+            - climate.studio
+            - climate.bagno
+            - climate.camera
           hvac_mode: auto
 
 ######################################################################

diff --git a/packages/netatmo/netatmo_boost.yaml b/packages/netatmo/netatmo_boost.yaml
index 3df179c4a8cba494cf179e8136e9382d704e78d9..f670051d696c0d60f3a5aba8cda954fc0f502e24 100644 (file)
--- a/packages/netatmo/netatmo_boost.yaml
+++ b/packages/netatmo/netatmo_boost.yaml
@@ -19,7 +19,7 @@ input_boolean:
     name: Boost Valvola Bagno
     initial: off
     icon: mdi:thermometer-plus
-  boost_valvola_camera_da_letto:
+  boost_valvola_camera:
     name: Boost Valvola Camera
     initial: off
     icon: mdi:thermometer-plus
@@ -32,7 +32,7 @@ script:
   ######################################################################
   # Activating Valve Boost
   ######################################################################
-  climate_valve_boost:
+  climate_valvola_boost:
     alias: "Termosifoni: Boost"
     sequence:
       - service: climate.set_preset_mode
@@ -62,21 +62,21 @@ automation:
                  input_boolean.boost_valvola_sala,
                  input_boolean.boost_valvola_studio,
                  input_boolean.boost_valvola_bagno,
-                 input_boolean.boost_valvola_camera_da_letto
-      to: 'on'      
+                 input_boolean.boost_valvola_camera
+      to: 'on'
 
     variables:
       entity_id: >-
         {% if trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
-          climate.netatmo_cucina
+          climate.cucina
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_sala' %}
-          climate.netatmo_sala
+          climate.sala
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_studio' %}
-          climate.netatmo_studio
+          climate.studio
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno' %}
-          climate.netatmo_bagno
-        {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera_da_letto' %}
-          climate.netatmo_camera_da_letto
+          climate.bagno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera' %}
+          climate.camera
         {% endif %}
 
     action:
@@ -105,21 +105,21 @@ automation:
                  input_boolean.boost_valvola_sala,
                  input_boolean.boost_valvola_studio,
                  input_boolean.boost_valvola_bagno,
-                 input_boolean.boost_valvola_camera_da_letto
-      to: 'off'      
+                 input_boolean.boost_valvola_camera
+      to: 'off'
 
     variables:
       entity_id: >-
         {% if trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
-          climate.netatmo_cucina
+          climate.cucina
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_sala' %}
-          climate.netatmo_sala
+          climate.sala
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_studio' %}
-          climate.netatmo_studio
+          climate.studio
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno' %}
-          climate.netatmo_bagno
-        {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera_da_letto' %}
-          climate.netatmo_camera_da_letto
+          climate.bagno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera' %}
+          climate.camera
         {% endif %}
 
     action:

diff --git a/packages/netatmo/netatmo_customizations.yaml b/packages/netatmo/netatmo_customizations.yaml
index 0f8d38882836e9950b84950b2fef591854fb07d8..ebb7bd76f81029b957b7ec175a2b2647f8803746 100644 (file)
--- a/packages/netatmo/netatmo_customizations.yaml
+++ b/packages/netatmo/netatmo_customizations.yaml
@@ -4,15 +4,25 @@
 
 homeassistant:
   customize:
-    climate.netatmo_cucina:
+    climate.cucina:
       friendly_name: Valvola Cucina
-    climate.netatmo_sala:
+    climate.sala:
       friendly_name: Valvola Sala
-    climate.netatmo_bagno:
+    climate.bagno:
       friendly_name: Valvola Bagno
-    climate.netatmo_studio:
+    climate.studio:
       friendly_name: Valvola Studio
-    climate.netatmo_camera_da_letto:
+    climate.camera:
       friendly_name: Valvola Camera
     select.netatmo_casa_ravera_testa:
       friendly_name: Programmazione Valvole
+    sensor.valvola_cucina_battery_percent:
+      friendly_name: Batteria Valvola Cucina
+    sensor.valvola_sala_battery_percent:
+      friendly_name: Batteria Valvola Sala
+    sensor.valvola_bagno_battery_percent:
+      friendly_name: Batteria Valvola Bagno
+    sensor.valvola_studio_battery_percent:
+      friendly_name: Batteria Valvola Studio
+    sensor.valvola_camera_battery_percent:
+      friendly_name: Batteria Valvola Camera
\ No newline at end of file

diff --git a/packages/netatmo/netatmo_google_assistant.yaml b/packages/netatmo/netatmo_google_assistant.yaml
index a3e294877b880296af79eaf12549999df25aa759..f24e84cd1aa5f3336cf76db99459618debe971a2 100644 (file)
--- a/packages/netatmo/netatmo_google_assistant.yaml
+++ b/packages/netatmo/netatmo_google_assistant.yaml
@@ -4,18 +4,18 @@
 
 google_assistant:
   entity_config:
-    climate.netatmo_cucina:
+    climate.cucina:
       expose: true
       room: Cucina
-    climate.netatmo_sala:
+    climate.sala:
       expose: true
       room: Sala
-    climate.netatmo_studio:
+    climate.studio:
       expose: true
       room: Studio
-    climate.netatmo_bagno:
+    climate.bagno:
       expose: true
       room: Bagno
-    climate.netatmo_camera_da_letto:
+    climate.camera:
       expose: true
       room: Camera

diff --git a/packages/netatmo/netatmo_groups.yaml b/packages/netatmo/netatmo_groups.yaml
index db66f52ff1e7ab2761652092f762477441a32edd..4b3fd82cd51cc125a208de1e96e797cce62b0a6f 100644 (file)
--- a/packages/netatmo/netatmo_groups.yaml
+++ b/packages/netatmo/netatmo_groups.yaml
@@ -7,8 +7,8 @@ group:
     name: Termostato
     icon: mdi:thermometer
     entities:
-      - climate.netatmo_cucina
-      - climate.netatmo_sala
-      - climate.netatmo_studio
-      - climate.netatmo_bagno
-      - climate.netatmo_camera_da_letto
+      - climate.cucina
+      - climate.sala
+      - climate.studio
+      - climate.bagno
+      - climate.camera

diff --git a/packages/netatmo/netatmo_log.yaml b/packages/netatmo/netatmo_log.yaml
index 71fb5dee8bc27ea54c3edf7cfc05edd9c2e50f82..c42f17f8d4dd8635a796d152265c08a0759e8dd6 100644 (file)
--- a/packages/netatmo/netatmo_log.yaml
+++ b/packages/netatmo/netatmo_log.yaml
@@ -5,16 +5,16 @@
 history:\r
   exclude:\r
     entities:\r
-    - sensor.valve_cucina_battery\r
-    - sensor.valve_sala_battery\r
-    - sensor.valve_studio_battery\r
-    - sensor.valve_bagno_battery\r
-    - sensor.valve_camera_da_letto_battery\r
-    - sensor.valve_cucina_state\r
-    - sensor.valve_sala_state\r
-    - sensor.valve_studio_state\r
-    - sensor.valve_bagno_state\r
-    - sensor.valve_camera_da_letto_state\r
+    - sensor.valvola_cucina_battery_percent\r
+    - sensor.valvola_sala_battery_percent\r
+    - sensor.valvola_studio_battery_percent\r
+    - sensor.valvola_bagno_battery_percent\r
+    - sensor.valvola_camera_battery_percent\r
+    - sensor.valvola_cucina_state\r
+    - sensor.valvola_sala_state\r
+    - sensor.valvola_studio_state\r
+    - sensor.valvola_bagno_state\r
+    - sensor.valvola_camera_state\r
     - select.netatmo_casa_ravera_testa\r
 \r
 ######################################################################\r
@@ -24,16 +24,16 @@ history:
 logbook:\r
   exclude:\r
     entities:\r
-    - sensor.valve_cucina_battery\r
-    - sensor.valve_sala_battery\r
-    - sensor.valve_studio_battery\r
-    - sensor.valve_bagno_battery\r
-    - sensor.valve_camera_da_letto_battery\r
-    - sensor.valve_cucina_state\r
-    - sensor.valve_sala_state\r
-    - sensor.valve_studio_state\r
-    - sensor.valve_bagno_state\r
-    - sensor.valve_camera_da_letto_state\r
+    - sensor.valvola_cucina_battery_percent\r
+    - sensor.valvola_sala_battery_percent\r
+    - sensor.valvola_studio_battery_percent\r
+    - sensor.valvola_bagno_battery_percent\r
+    - sensor.valvola_camera_battery_percent\r
+    - sensor.valvola_cucina_state\r
+    - sensor.valvola_sala_state\r
+    - sensor.valvola_studio_state\r
+    - sensor.valvola_bagno_state\r
+    - sensor.valvola_camera_state\r
     - select.netatmo_casa_ravera_testa\r
 \r
 ######################################################################\r
@@ -43,14 +43,14 @@ logbook:
 recorder:\r
   exclude:\r
     entities:\r
-    - sensor.valve_cucina_battery\r
-    - sensor.valve_sala_battery\r
-    - sensor.valve_studio_battery\r
-    - sensor.valve_bagno_battery\r
-    - sensor.valve_camera_da_letto_battery\r
-    - sensor.valve_cucina_state\r
-    - sensor.valve_sala_state\r
-    - sensor.valve_studio_state\r
-    - sensor.valve_bagno_state\r
-    - sensor.valve_camera_da_letto_state\r
+    - sensor.valvola_cucina_battery_percent\r
+    - sensor.valvola_sala_battery_percent\r
+    - sensor.valvola_studio_battery_percent\r
+    - sensor.valvola_bagno_battery_percent\r
+    - sensor.valvola_camera_battery_percent\r
+    - sensor.valvola_cucina_state\r
+    - sensor.valvola_sala_state\r
+    - sensor.valvola_studio_state\r
+    - sensor.valvola_bagno_state\r
+    - sensor.valvola_camera_state\r
     - select.netatmo_casa_ravera_testa\r

diff --git a/packages/netatmo/netatmo_on_off.yaml b/packages/netatmo/netatmo_on_off.yaml
index 0856f9d38be1c0ca15e5fc2eefe9121d04917778..1069942142c1045a20872a775c9a5d51ad45a7d1 100644 (file)
--- a/packages/netatmo/netatmo_on_off.yaml
+++ b/packages/netatmo/netatmo_on_off.yaml
@@ -19,7 +19,7 @@ input_boolean:
     name: Valvola Bagno
     initial: on
     icon: mdi:thermometer
-  valvola_camera_da_letto:
+  valvola_camera:
     name: Valvola Camera
     initial: on
     icon: mdi:thermometer
@@ -40,7 +40,7 @@ automation:
                  input_boolean.valvola_sala,
                  input_boolean.valvola_studio,
                  input_boolean.valvola_bagno,
-                 input_boolean.valvola_camera_da_letto
+                 input_boolean.valvola_camera
       to: 'on'
 
     action:
@@ -48,15 +48,15 @@ automation:
         data_template:
           entity_id: >
             {% if trigger.entity_id == 'input_boolean.valvola_cucina' %}
-              climate.netatmo_cucina
+              climate.cucina
             {% elif trigger.entity_id == 'input_boolean.valvola_sala' %}
-              climate.netatmo_sala
+              climate.sala
             {% elif trigger.entity_id == 'input_boolean.valvola_studio' %}
-              climate.netatmo_studio
+              climate.studio
             {% elif trigger.entity_id == 'input_boolean.valvola_bagno' %}
-              climate.netatmo_bagno
-            {% elif trigger.entity_id == 'input_boolean.valvola_camera_da_letto' %}
-              climate.netatmo_camera_da_letto
+              climate.bagno
+            {% elif trigger.entity_id == 'input_boolean.valvola_camera' %}
+              climate.camera
             {% endif %}
 
   ######################################################################
@@ -70,7 +70,7 @@ automation:
                   input_boolean.valvola_sala,
                   input_boolean.valvola_studio,
                   input_boolean.valvola_bagno,
-                  input_boolean.valvola_camera_da_letto
+                  input_boolean.valvola_camera
       to: 'off'
 
     action:
@@ -78,13 +78,13 @@ automation:
         data_template:
           entity_id: >
             {% if trigger.entity_id == 'input_boolean.valvola_cucina' %}
-              climate.netatmo_cucina
+              climate.cucina
             {% elif trigger.entity_id == 'input_boolean.valvola_sala' %}
-              climate.netatmo_sala
+              climate.sala
             {% elif trigger.entity_id == 'input_boolean.valvola_studio' %}
-              climate.netatmo_studio
+              climate.studio
             {% elif trigger.entity_id == 'input_boolean.valvola_bagno' %}
-              climate.netatmo_bagno
-            {% elif trigger.entity_id == 'input_boolean.valvola_camera_da_letto' %}
-              climate.netatmo_camera_da_letto
+              climate.bagno
+            {% elif trigger.entity_id == 'input_boolean.valvola_camera' %}
+              climate.camera
             {% endif %}

diff --git a/packages/netatmo/netatmo_sensor.yaml b/packages/netatmo/netatmo_sensor.yaml
index 9b80e26886f33ef2b6129459429610541dae052f..deb2362da89888839790226ca008ab87d0343022 100644 (file)
--- a/packages/netatmo/netatmo_sensor.yaml
+++ b/packages/netatmo/netatmo_sensor.yaml
@@ -8,157 +8,54 @@ sensor:
   ######################################################################
   - platform: template
     sensors:
-      valve_cucina_temperature:
+      valvola_cucina_temperature:
         friendly_name: "Temperatura Cucina"
-        value_template: "{{ state_attr('climate.netatmo_cucina', 'current_temperature') }}"
+        value_template: "{{ state_attr('climate.cucina', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
   - platform: template
     sensors:
-      valve_sala_temperature:
+      valvola_sala_temperature:
         friendly_name: "Temperatura Sala"
-        value_template: "{{ state_attr('climate.netatmo_sala', 'current_temperature') }}"
+        value_template: "{{ state_attr('climate.sala', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
   - platform: template
     sensors:
-      valve_studio_temperature:
+      valvola_studio_temperature:
         friendly_name: "Temperatura Studio"
-        value_template: "{{ state_attr('climate.netatmo_studio', 'current_temperature') }}"
+        value_template: "{{ state_attr('climate.studio', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
   - platform: template
     sensors:
-      valve_bagno_temperature:
+      valvola_bagno_temperature:
         friendly_name: "Temperatura Bagno"
-        value_template: "{{ state_attr('climate.netatmo_bagno', 'current_temperature') }}"
+        value_template: "{{ state_attr('climate.bagno', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
   - platform: template
     sensors:
-      valve_camera_da_letto_temperature:
+      valvola_camera_temperature:
         friendly_name: "Temperatura Camera"
-        value_template: "{{ state_attr('climate.netatmo_camera_da_letto', 'current_temperature') }}"
+        value_template: "{{ state_attr('climate.camera', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
-  ######################################################################
-  # Sensor: Battery from Radiator Valve
-  ######################################################################
-  - platform: template
-    sensors:
-      valve_cucina_battery:
-        friendly_name: "Batteria Valvola Cucina"
-        value_template: >
-          {% set battery_level = state_attr('climate.netatmo_cucina', 'battery_level') %}
-          {% if battery_level == "full" %}
-            100
-          {% elif battery_level == "high" %}
-            80
-          {% elif battery_level == "medium" %}
-            50
-          {% elif battery_level == "low" %}
-            20
-          {% else %}
-            0
-          {% endif %}
-        unit_of_measurement: '%'
-        device_class: battery
-
-  - platform: template
-    sensors:
-      valve_sala_battery:
-        friendly_name: "Batteria Valvola Sala"
-        value_template: >
-          {% set battery_level = state_attr('climate.netatmo_sala', 'battery_level') %}
-          {% if battery_level == "full" %}
-            100
-          {% elif battery_level == "high" %}
-            80
-          {% elif battery_level == "medium" %}
-            50
-          {% elif battery_level == "low" %}
-            20
-          {% else %}
-            0
-          {% endif %}
-        unit_of_measurement: '%'
-        device_class: battery
-
-  - platform: template
-    sensors:
-      valve_studio_battery:
-        friendly_name: "Batteria Valvola Studio"
-        value_template: >
-          {% set battery_level = state_attr('climate.netatmo_studio', 'battery_level') %}
-          {% if battery_level == "full" %}
-            100
-          {% elif battery_level == "high" %}
-            80
-          {% elif battery_level == "medium" %}
-            50
-          {% elif battery_level == "low" %}
-            20
-          {% else %}
-            0
-          {% endif %}
-        unit_of_measurement: '%'
-        device_class: battery
-
-  - platform: template
-    sensors:
-      valve_bagno_battery:
-        friendly_name: "Batteria Valvola Bagno"
-        value_template: >
-          {% set battery_level = state_attr('climate.netatmo_bagno', 'battery_level') %}
-          {% if battery_level == "full" %}
-            100
-          {% elif battery_level == "high" %}
-            80
-          {% elif battery_level == "medium" %}
-            50
-          {% elif battery_level == "low" %}
-            20
-          {% else %}
-            0
-          {% endif %}
-        unit_of_measurement: '%'
-        device_class: battery
-
-  - platform: template
-    sensors:
-      valve_camera_da_letto_battery:
-        friendly_name: "Batteria Valvola Camera"
-        value_template: >
-          {% set battery_level = state_attr('climate.netatmo_camera_da_letto', 'battery_level') %}
-          {% if battery_level == "full" %}
-            100
-          {% elif battery_level == "high" %}
-            80
-          {% elif battery_level == "medium" %}
-            50
-          {% elif battery_level == "low" %}
-            20
-          {% else %}
-            0
-          {% endif %}
-        unit_of_measurement: '%'
-        device_class: battery
-
   ######################################################################
   # Sensor: State from Radiator Valve
   ######################################################################
   - platform: template
     sensors:
-      valve_cucina_state:
+      valvola_cucina_state:
         friendly_name: "Stato Valvola Cucina"
-        value_template: "{{ state_attr('climate.netatmo_cucina', 'hvac_action') }}"
+        value_template: "{{ state_attr('climate.cucina', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.netatmo_cucina', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.cucina', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator
@@ -166,11 +63,11 @@ sensor:
 
   - platform: template
     sensors:
-      valve_sala_state:
+      valvola_sala_state:
         friendly_name: "Stato Valvola Sala"
-        value_template: "{{ state_attr('climate.netatmo_sala', 'hvac_action') }}"
+        value_template: "{{ state_attr('climate.sala', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.netatmo_sala', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.sala', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator
@@ -178,11 +75,11 @@ sensor:
 
   - platform: template
     sensors:
-      valve_studio_state:
+      valvola_studio_state:
         friendly_name: "Stato Valvola Studio"
-        value_template: "{{ state_attr('climate.netatmo_studio', 'hvac_action') }}"
+        value_template: "{{ state_attr('climate.studio', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.netatmo_studio', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.studio', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator
@@ -190,11 +87,11 @@ sensor:
 
   - platform: template
     sensors:
-      valve_bagno_state:
+      valvola_bagno_state:
         friendly_name: "Stato Valvola Bagno"
-        value_template: "{{ state_attr('climate.netatmo_bagno', 'hvac_action') }}"
+        value_template: "{{ state_attr('climate.bagno', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.netatmo_bagno', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.bagno', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator
@@ -202,11 +99,11 @@ sensor:
 
   - platform: template
     sensors:
-      valve_camera_da_letto_state:
+      valvola_camera_state:
         friendly_name: "Stato Valvola Camera"
-        value_template: "{{ state_attr('climate.netatmo_camera_da_letto', 'hvac_action') }}"
+        value_template: "{{ state_attr('climate.camera', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.netatmo_camera_da_letto', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.camera', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator