Added new netatmo valves

diff --git a/.storage/lovelace b/.storage/lovelace
index 0a5dcf6535059874643f9c797e4b75f2fa4a63e2..eb6dc06160ff393bcbc968224ad94062eb6ba9e3 100644 (file)
--- a/.storage/lovelace
+++ b/.storage/lovelace
@@ -162,7 +162,7 @@
                       "entity": "light.luce_specchio_old"
                     },
                     {
-                      "entity": "climate.bagno"
+                      "entity": "climate.bagno_piccolo"
                     }
                   ],
                   "entity": "group.lights_bathroom_old",
@@ -1046,7 +1046,7 @@
                       "entity": "cover.tapparella_bagno"
                     },
                     {
-                      "entity": "climate.bagno"
+                      "entity": "climate.bagno_grande"
                     }
                   ],
                   "entity": "group.lights_bathroom",
@@ -1802,6 +1802,9 @@
           "title": "Termostato",
           "path": "climate",
           "badges": [
+            {
+              "entity": "sensor.valvola_zona_giorno_temperature"
+            },
             {
               "entity": "sensor.valvola_cucina_temperature"
             },
@@ -1809,10 +1812,13 @@
               "entity": "sensor.valvola_sala_temperature"
             },
             {
-              "entity": "sensor.valvola_bagno_temperature"
+              "entity": "sensor.valvola_studio_temperature"
             },
             {
-              "entity": "sensor.valvola_studio_temperature"
+              "entity": "sensor.valvola_bagno_piccolo_temperature"
+            },
+            {
+              "entity": "sensor.valvola_bagno_grande_temperature"
             },
             {
               "entity": "sensor.valvola_camera_temperature"
@@ -1834,6 +1840,10 @@
             }
           ],
           "cards": [
+            {
+              "entity": "climate.zona_giorno",
+              "type": "thermostat"
+            },
             {
               "entity": "climate.cucina",
               "type": "thermostat"
@@ -1843,11 +1853,15 @@
               "type": "thermostat"
             },
             {
-              "entity": "climate.bagno",
+              "entity": "climate.studio",
               "type": "thermostat"
             },
             {
-              "entity": "climate.studio",
+              "entity": "climate.bagno_piccolo",
+              "type": "thermostat"
+            },
+            {
+              "entity": "climate.bagno_grande",
               "type": "thermostat"
             },
             {
@@ -1863,11 +1877,17 @@
                 {
                   "entity": "input_boolean.boost_valvola_sala"
                 },
+                {
+                  "entity": "input_boolean.boost_valvola_zona_giorno"
+                },
                 {
                   "entity": "input_boolean.boost_valvola_studio"
                 },
                 {
-                  "entity": "input_boolean.boost_valvola_bagno"
+                  "entity": "input_boolean.boost_valvola_bagno_piccolo"
+                },
+                {
+                  "entity": "input_boolean.boost_valvola_bagno_grande"
                 },
                 {
                   "entity": "input_boolean.boost_valvola_camera"
@@ -1879,6 +1899,9 @@
             {
               "type": "entities",
               "entities": [
+                {
+                  "entity": "input_boolean.valvola_zona_giorno"
+                },
                 {
                   "entity": "input_boolean.valvola_cucina"
                 },
@@ -1889,7 +1912,10 @@
                   "entity": "input_boolean.valvola_studio"
                 },
                 {
-                  "entity": "input_boolean.valvola_bagno"
+                  "entity": "input_boolean.valvola_bagno_piccolo"
+                },
+                {
+                  "entity": "input_boolean.valvola_bagno_grande"
                 },
                 {
                   "entity": "input_boolean.valvola_camera"
@@ -1902,25 +1928,33 @@
               "type": "entities",
               "title": "Stato Valvole Netatmo",
               "entities": [
+                {
+                  "entity": "sensor.valvola_zona_giorno_state",
+                  "name": "Valvola Zona Giorno"
+                },
                 {
                   "entity": "sensor.valvola_cucina_state",
-                  "name": "Cucina"
+                  "name": "Valvola Cucina"
                 },
                 {
                   "entity": "sensor.valvola_sala_state",
-                  "name": "Sala"
+                  "name": "Valvola Sala"
                 },
                 {
                   "entity": "sensor.valvola_studio_state",
-                  "name": "Studio"
+                  "name": "Valvola Studio"
+                },
+                {
+                  "entity": "sensor.valvola_bagno_piccolo_state",
+                  "name": "Valvola Bagno Piccolo"
                 },
                 {
-                  "entity": "sensor.valvola_bagno_state",
-                  "name": "Bagno"
+                  "entity": "sensor.valvola_bagno_grande_state",
+                  "name": "Valvola Bagno Grande"
                 },
                 {
                   "entity": "sensor.valvola_camera_state",
-                  "name": "Camera"
+                  "name": "Valvola Camera"
                 }
               ]
             },
@@ -1928,27 +1962,37 @@
               "type": "custom:bar-card",
               "entities": [
                 {
-                  "entity": "sensor.valvola_cucina_battery_percent",
+                  "entity": "sensor.valvola_zona_giorno_batteria",
+                  "name": "Bagno",
+                  "width": "85%"
+                },
+                {
+                  "entity": "sensor.valvola_cucina_batteria",
                   "name": "Cucina",
                   "width": "85%"
                 },
                 {
-                  "entity": "sensor.valvola_sala_battery_percent",
+                  "entity": "sensor.valvola_sala_batteria",
                   "name": "Sala",
                   "width": "85%"
                 },
                 {
-                  "entity": "sensor.valvola_studio_battery_percent",
+                  "entity": "sensor.valvola_studio_batteria",
                   "name": "Studio",
                   "width": "85%"
                 },
                 {
-                  "entity": "sensor.valvola_bagno_battery_percent",
+                  "entity": "sensor.valvola_bagno_piccolo_batteria",
                   "name": "Bagno",
                   "width": "85%"
                 },
                 {
-                  "entity": "sensor.valvola_camera_battery_percent",
+                  "entity": "sensor.valvola_bagno_grande_batteria",
+                  "name": "Bagno",
+                  "width": "85%"
+                },
+                {
+                  "entity": "sensor.valvola_camera_batteria",
                   "name": "Camera",
                   "width": "85%"
                 }
@@ -1963,6 +2007,17 @@
                 "value": "outside"
               }
             },
+            {
+              "type": "history-graph",
+              "entities": [
+                {
+                  "entity": "climate.zona_giorno"
+                }
+              ],
+              "hours_to_show": 24,
+              "refresh_interval": 0,
+              "title": "Valvola Zona Giorno"
+            },
             {
               "type": "history-graph",
               "entities": [
@@ -2000,12 +2055,23 @@
               "type": "history-graph",
               "entities": [
                 {
-                  "entity": "climate.bagno"
+                  "entity": "climate.bagno_piccolo"
+                }
+              ],
+              "hours_to_show": 24,
+              "refresh_interval": 0,
+              "title": "Valvola Bagno Piccolo"
+            },
+            {
+              "type": "history-graph",
+              "entities": [
+                {
+                  "entity": "climate.bagno_grande"
                 }
               ],
               "hours_to_show": 24,
               "refresh_interval": 0,
-              "title": "Valvola Bagno"
+              "title": "Valvola Bagno Grande"
             },
             {
               "type": "history-graph",

diff --git a/.storage/lovelace.lovelace_devices b/.storage/lovelace.lovelace_devices
index b1a7bd62e5655c43e61563475ccbae071ef60a80..07820da0732c167b9a5771dd76be556bfdf22514 100644 (file)
--- a/.storage/lovelace.lovelace_devices
+++ b/.storage/lovelace.lovelace_devices
@@ -3382,7 +3382,7 @@
                   "entities": [
                     {
                       "type": "section",
-                      "label": "Valvola 1 - Cucina"
+                      "label": "Valvola Zona Giorno"
                     },
                     {
                       "type": "custom:hui-element",
@@ -3402,25 +3402,25 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "climate.cucina",
+                                  "entity": "climate.zona_giorno",
                                   "name": "Modalità"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.valvola_cucina_state",
+                                  "entity": "sensor.valvola_zona_giorno_state",
                                   "name": "Stato"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_battery_state",
-                                  "entity": "sensor.valvola_cucina_battery_percent",
+                                  "entity": "sensor.valvola_zona_giorno_batteria",
                                   "name": "Batteria"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "timer.valvola_cucina",
+                                  "entity": "timer.valvola_zona_giorno",
                                   "name": "Timer"
                                 }
                               ]
@@ -3441,7 +3441,7 @@
                   "entities": [
                     {
                       "type": "section",
-                      "label": "Valvola 2 - Sala"
+                      "label": "Valvola Cucina"
                     },
                     {
                       "type": "custom:hui-element",
@@ -3461,25 +3461,25 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "climate.sala",
+                                  "entity": "climate.cucina",
                                   "name": "Modalità"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.valvola_sala_state",
+                                  "entity": "sensor.valvola_cucina_state",
                                   "name": "Stato"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_battery_state",
-                                  "entity": "sensor.valvola_sala_battery_percent",
+                                  "entity": "sensor.valvola_cucina_batteria",
                                   "name": "Batteria"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "timer.valvola_sala",
+                                  "entity": "timer.valvola_cucina",
                                   "name": "Timer"
                                 }
                               ]
@@ -3500,7 +3500,7 @@
                   "entities": [
                     {
                       "type": "section",
-                      "label": "Valvola 3 - Bagno"
+                      "label": "Valvola Sala"
                     },
                     {
                       "type": "custom:hui-element",
@@ -3520,25 +3520,25 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "climate.bagno",
+                                  "entity": "climate.sala",
                                   "name": "Modalità"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "sensor.valvola_bagno_state",
+                                  "entity": "sensor.valvola_sala_state",
                                   "name": "Stato"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_battery_state",
-                                  "entity": "sensor.valvola_bagno_battery_percent",
+                                  "entity": "sensor.valvola_sala_batteria",
                                   "name": "Batteria"
                                 },
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_state",
-                                  "entity": "timer.valvola_bagno",
+                                  "entity": "timer.valvola_sala",
                                   "name": "Timer"
                                 }
                               ]
@@ -3559,7 +3559,7 @@
                   "entities": [
                     {
                       "type": "section",
-                      "label": "Valvola 4 - Studio"
+                      "label": "Valvola Studio"
                     },
                     {
                       "type": "custom:hui-element",
@@ -3591,7 +3591,7 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_battery_state",
-                                  "entity": "sensor.valvola_studio_battery_percent",
+                                  "entity": "sensor.valvola_studio_batteria",
                                   "name": "Batteria"
                                 },
                                 {
@@ -3618,7 +3618,125 @@
                   "entities": [
                     {
                       "type": "section",
-                      "label": "Valvola 5 - Camera"
+                      "label": "Valvola Bagno Piccolo"
+                    },
+                    {
+                      "type": "custom:hui-element",
+                      "card_type": "vertical-stack",
+                      "cards": [
+                        {
+                          "type": "horizontal-stack",
+                          "cards": [
+                            {
+                              "type": "picture",
+                              "style": "ha-card { \n    --paper-card-background-color: 'rgba(0, 0, 0, 0.0)';\n    --ha-card-background: \"rgba(0, 0, 0, 0)\";\n    --ha-card-box-shadow: 'none';\n}\n",
+                              "image": "/local/images/devices/netatmo_valve.png"
+                            },
+                            {
+                              "type": "vertical-stack",
+                              "cards": [
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "climate.bagno_piccolo",
+                                  "name": "Modalità"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "sensor.valvola_bagno_piccolo_state",
+                                  "name": "Stato"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_battery_state",
+                                  "entity": "sensor.valvola_bagno_piccolo_batteria",
+                                  "name": "Batteria"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "timer.valvola_bagno_piccolo",
+                                  "name": "Timer"
+                                }
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ],
+                  "view_layout": {
+                    "grid-area": "fifth"
+                  }
+                },
+                {
+                  "type": "entities",
+                  "show_header_toggle": "off",
+                  "style": ".card-header {\n  padding: 0px 0px 0px 0px !important;\n}\n",
+                  "entities": [
+                    {
+                      "type": "section",
+                      "label": "Valvola Bagno Grande"
+                    },
+                    {
+                      "type": "custom:hui-element",
+                      "card_type": "vertical-stack",
+                      "cards": [
+                        {
+                          "type": "horizontal-stack",
+                          "cards": [
+                            {
+                              "type": "picture",
+                              "style": "ha-card { \n    --paper-card-background-color: 'rgba(0, 0, 0, 0.0)';\n    --ha-card-background: \"rgba(0, 0, 0, 0)\";\n    --ha-card-box-shadow: 'none';\n}\n",
+                              "image": "/local/images/devices/netatmo_valve.png"
+                            },
+                            {
+                              "type": "vertical-stack",
+                              "cards": [
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "climate.bagno_grande",
+                                  "name": "Modalità"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "sensor.valvola_bagno_grande_state",
+                                  "name": "Stato"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_battery_state",
+                                  "entity": "sensor.valvola_bagno_grande_batteria",
+                                  "name": "Batteria"
+                                },
+                                {
+                                  "type": "custom:button-card",
+                                  "template": "template_device_generic_state",
+                                  "entity": "timer.valvola_bagno_grande",
+                                  "name": "Timer"
+                                }
+                              ]
+                            }
+                          ]
+                        }
+                      ]
+                    }
+                  ],
+                  "view_layout": {
+                    "grid-area": "sixth"
+                  }
+                },
+                {
+                  "type": "entities",
+                  "show_header_toggle": "off",
+                  "style": ".card-header {\n  padding: 0px 0px 0px 0px !important;\n}\n",
+                  "entities": [
+                    {
+                      "type": "section",
+                      "label": "Valvola Camera"
                     },
                     {
                       "type": "custom:hui-element",
@@ -3650,7 +3768,7 @@
                                 {
                                   "type": "custom:button-card",
                                   "template": "template_device_generic_battery_state",
-                                  "entity": "sensor.valvola_camera_battery_percent",
+                                  "entity": "sensor.valvola_camera_batteria",
                                   "name": "Batteria"
                                 },
                                 {
@@ -3667,7 +3785,7 @@
                     }
                   ],
                   "view_layout": {
-                    "grid-area": "fifth"
+                    "grid-area": "seventh"
                   }
                 }
               ],

diff --git a/packages/netatmo/netatmo_away.yaml b/packages/netatmo/netatmo_away.yaml
index b0c823999ee520a8f69e948b4446f6a0edfc45ce..77c1e0d4cf3846a1f5f2ada754087878022b09b5 100644 (file)
--- a/packages/netatmo/netatmo_away.yaml
+++ b/packages/netatmo/netatmo_away.yaml
@@ -11,10 +11,12 @@ script:
       - action: climate.set_preset_mode
         data:
           entity_id:
+            - climate.zona_giorno
             - climate.cucina
             - climate.sala
             - climate.studio
-            - climate.bagno
+            - climate.bagno_piccolo
+            - climate.bagno_grande
             - climate.camera
           preset_mode: away
 
@@ -26,10 +28,12 @@ script:
       - action: climate.set_hvac_mode
         data:
           entity_id:
+            - climate.zona_giorno
             - climate.cucina
             - climate.sala
             - climate.studio
-            - climate.bagno
+            - climate.bagno_piccolo
+            - climate.bagno_grande
             - climate.camera
           hvac_mode: auto
 

diff --git a/packages/netatmo/netatmo_boost.yaml b/packages/netatmo/netatmo_boost.yaml
index a080713be6929e0a34cb87fce558f03f28bdfc46..a762d7252323eb5ef0754bd0fca1a0d8b4b45010 100644 (file)
--- a/packages/netatmo/netatmo_boost.yaml
+++ b/packages/netatmo/netatmo_boost.yaml
@@ -3,6 +3,10 @@
 ######################################################################
 
 input_boolean:
+  boost_valvola_zona_giorno:
+    name: Boost Valvola Zona Giorno
+    initial: off
+    icon: mdi:thermometer-plus
   boost_valvola_cucina:
     name: Boost Valvola Cucina
     initial: off
@@ -15,8 +19,12 @@ input_boolean:
     name: Boost Valvola Studio
     initial: off
     icon: mdi:thermometer-plus
-  boost_valvola_bagno:
-    name: Boost Valvola Bagno
+  boost_valvola_bagno_piccolo:
+    name: Boost Valvola Bagno Piccolo
+    initial: off
+    icon: mdi:thermometer-plus
+  boost_valvola_bagno_grande:
+    name: Boost Valvola Bagno Grande
     initial: off
     icon: mdi:thermometer-plus
   boost_valvola_camera:
@@ -38,23 +46,29 @@ automation:
 
     trigger:
       trigger: state
-      entity_id: input_boolean.boost_valvola_cucina,
+      entity_id: input_boolean.boost_valvola_zona_giorno,
+                 input_boolean.boost_valvola_cucina,
                  input_boolean.boost_valvola_sala,
                  input_boolean.boost_valvola_studio,
-                 input_boolean.boost_valvola_bagno,
+                 input_boolean.boost_valvola_bagno_piccolo,
+                 input_boolean.boost_valvola_bagno_grande,
                  input_boolean.boost_valvola_camera
       to: 'on'
 
     variables:
       entity_id: >-
-        {% if trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
+        {% if trigger.entity_id == 'input_boolean.boost_valvola_zona_giorno' %}
+          climate.zona_giorno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
           climate.cucina
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_sala' %}
           climate.sala
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_studio' %}
           climate.studio
-        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno' %}
-          climate.bagno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno_piccolo' %}
+          climate.bagno_piccolo
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno_grande' %}
+          climate.bagno_grande
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera' %}
           climate.camera
         {% endif %}
@@ -85,23 +99,29 @@ automation:
 
     trigger:
       trigger: state
-      entity_id: input_boolean.boost_valvola_cucina,
+      entity_id: input_boolean.boost_valvola_zona_giorno,
+                 input_boolean.boost_valvola_cucina,
                  input_boolean.boost_valvola_sala,
                  input_boolean.boost_valvola_studio,
-                 input_boolean.boost_valvola_bagno,
+                 input_boolean.boost_valvola_bagno_piccolo,
+                 input_boolean.boost_valvola_bagno_grande,
                  input_boolean.boost_valvola_camera
       to: 'off'
 
     variables:
       entity_id: >-
-        {% if trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
+        {% if trigger.entity_id == 'input_boolean.boost_valvola_zona_giorno' %}
+          climate.zona_giorno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_cucina' %}
           climate.cucina
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_sala' %}
           climate.sala
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_studio' %}
           climate.studio
-        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno' %}
-          climate.bagno
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno_piccolo' %}
+          climate.bagno_piccolo
+        {% elif trigger.entity_id == 'input_boolean.boost_valvola_bagno_grande' %}
+          climate.bagno_grande
         {% elif trigger.entity_id == 'input_boolean.boost_valvola_camera' %}
           climate.camera
         {% endif %}

diff --git a/packages/netatmo/netatmo_customizations.yaml b/packages/netatmo/netatmo_customizations.yaml
index f78096a346357060750c9912814a487a9ea725c4..e90a2c010c14071f574987b69cdbf49183120254 100644 (file)
--- a/packages/netatmo/netatmo_customizations.yaml
+++ b/packages/netatmo/netatmo_customizations.yaml
@@ -4,25 +4,33 @@
 
 homeassistant:
   customize:
+    climate.zona_giorno:
+      friendly_name: Valvola Zona Giorno
     climate.cucina:
       friendly_name: Valvola Cucina
     climate.sala:
       friendly_name: Valvola Sala
-    climate.bagno:
-      friendly_name: Valvola Bagno
     climate.studio:
       friendly_name: Valvola Studio
+    climate.bagno_piccolo:
+      friendly_name: Valvola Bagno Piccolo
+    climate.bagno_grande:
+      friendly_name: Valvola Bagno Grande
     climate.camera:
       friendly_name: Valvola Camera
     select.netatmo_casa_ravera_testa:
       friendly_name: Programmazione Valvole
-    sensor.valvola_cucina_battery_percent:
+    sensor.valvola_zona_giorno_batteria:
+      friendly_name: Batteria Valvola Zona Giorno
+    sensor.valvola_cucina_batteria:
       friendly_name: Batteria Valvola Cucina
-    sensor.valvola_sala_battery_percent:
+    sensor.valvola_sala_batteria:
       friendly_name: Batteria Valvola Sala
-    sensor.valvola_bagno_battery_percent:
-      friendly_name: Batteria Valvola Bagno
-    sensor.valvola_studio_battery_percent:
+    sensor.valvola_studio_batteria:
       friendly_name: Batteria Valvola Studio
-    sensor.valvola_camera_battery_percent:
+    sensor.valvola_bagno_piccolo_batteria:
+      friendly_name: Batteria Valvola Bagno Piccolo
+    sensor.valvola_bagno_grande_batteria:
+      friendly_name: Batteria Valvola Bagno Grande
+    sensor.valvola_camera_batteria:
       friendly_name: Batteria Valvola Camera

diff --git a/packages/netatmo/netatmo_groups.yaml b/packages/netatmo/netatmo_groups.yaml
index 4b3fd82cd51cc125a208de1e96e797cce62b0a6f..ec119d47504d301a3db520bfc6ed44fd4bd24482 100644 (file)
--- a/packages/netatmo/netatmo_groups.yaml
+++ b/packages/netatmo/netatmo_groups.yaml
@@ -7,8 +7,10 @@ group:
     name: Termostato
     icon: mdi:thermometer
     entities:
+      - climate.zona_giorno
       - climate.cucina
       - climate.sala
       - climate.studio
-      - climate.bagno
+      - climate.bagno_piccolo
+      - climate.bagno_grande
       - climate.camera

diff --git a/packages/netatmo/netatmo_log.yaml b/packages/netatmo/netatmo_log.yaml
index 33025d373e1f659f860253147294d4947dfd1d35..5df08740b23a351170452365ecc836cb17ca0998 100644 (file)
--- a/packages/netatmo/netatmo_log.yaml
+++ b/packages/netatmo/netatmo_log.yaml
@@ -5,15 +5,19 @@
 logbook:
   exclude:
     entities:
-      - sensor.valvola_cucina_battery_percent
-      - sensor.valvola_sala_battery_percent
-      - sensor.valvola_studio_battery_percent
-      - sensor.valvola_bagno_battery_percent
-      - sensor.valvola_camera_battery_percent
+      - sensor.valvola_zona_giorno_batteria
+      - sensor.valvola_cucina_batteria
+      - sensor.valvola_sala_batteria
+      - sensor.valvola_studio_batteria
+      - sensor.valvola_bagno_piccolo_batteria
+      - sensor.valvola_bagno_grande_batteria
+      - sensor.valvola_camera_batteria
+      - sensor.valvola_zona_giorno_state
       - sensor.valvola_cucina_state
       - sensor.valvola_sala_state
       - sensor.valvola_studio_state
-      - sensor.valvola_bagno_state
+      - sensor.valvola_bagno_piccolo_state
+      - sensor.valvola_bagno_grande_state
       - sensor.valvola_camera_state
       - select.netatmo_casa_ravera_testa
 
@@ -24,14 +28,18 @@ logbook:
 recorder:
   exclude:
     entities:
-      - sensor.valvola_cucina_battery_percent
-      - sensor.valvola_sala_battery_percent
-      - sensor.valvola_studio_battery_percent
-      - sensor.valvola_bagno_battery_percent
-      - sensor.valvola_camera_battery_percent
+      - sensor.valvola_zona_giorno_batteria
+      - sensor.valvola_cucina_batteria
+      - sensor.valvola_sala_batteria
+      - sensor.valvola_studio_batteria
+      - sensor.valvola_bagno_piccolo_batteria
+      - sensor.valvola_bagno_grande_batteria
+      - sensor.valvola_camera_batteria
+      - sensor.valvola_zona_giorno_state
       - sensor.valvola_cucina_state
       - sensor.valvola_sala_state
       - sensor.valvola_studio_state
-      - sensor.valvola_bagno_state
+      - sensor.valvola_bagno_piccolo_state
+      - sensor.valvola_bagno_grande_state
       - sensor.valvola_camera_state
       - select.netatmo_casa_ravera_testa

diff --git a/packages/netatmo/netatmo_main.yaml b/packages/netatmo/netatmo_main.yaml
index 8cd56c3e6fd096fa995263d54617751fc032170c..b89e973643263ef639c18768a48857399a9f153d 100644 (file)
--- a/packages/netatmo/netatmo_main.yaml
+++ b/packages/netatmo/netatmo_main.yaml
@@ -12,7 +12,7 @@ homeassistant:
     package.netatmo:
       customize: &customize
         package: 'netatmo'
-        version: 1.0.0
+        version: 1.2.0
 
     ######################################################################
     # Netatmo Package - Main - Entities
@@ -20,33 +20,45 @@ homeassistant:
 
     group.climate:
       <<: *customize
+    sensor.valvola_zona_giorno_temperature:
+      <<: *customize
     sensor.valvola_cucina_temperature:
       <<: *customize
     sensor.valvola_sala_temperature:
       <<: *customize
     sensor.valvola_studio_temperature:
       <<: *customize
-    sensor.valvola_bagno_temperature:
+    sensor.valvola_bagno_piccolo_temperature:
+      <<: *customize
+    sensor.valvola_bagno_grande_temperature:
       <<: *customize
     sensor.valvola_camera_temperature:
       <<: *customize
+    sensor.valvola_zona_giorno_state:
+      <<: *customize
     sensor.valvola_cucina_state:
       <<: *customize
     sensor.valvola_sala_state:
       <<: *customize
     sensor.valvola_studio_state:
       <<: *customize
-    sensor.valvola_bagno_state:
+    sensor.valvola_bagno_piccolo_state:
+      <<: *customize
+    sensor.valvola_bagno_grande_state:
       <<: *customize
     sensor.valvola_camera_state:
       <<: *customize
+    input_boolean.valvola_zona_giorno:
+      <<: *customize
     input_boolean.valvola_cucina:
       <<: *customize
     input_boolean.valvola_sala:
       <<: *customize
     input_boolean.valvola_studio:
       <<: *customize
-    input_boolean.valvola_bagno:
+    input_boolean.valvola_bagno_piccolo:
+      <<: *customize
+    input_boolean.valvola_bagno_grande:
       <<: *customize
     input_boolean.valvola_camera:
       <<: *customize
@@ -54,13 +66,17 @@ homeassistant:
       <<: *customize
     automation.termosifoni_spegnimento:
       <<: *customize
+    input_boolean.boost_valvola_zona_giorno:
+      <<: *customize
     input_boolean.boost_valvola_cucina:
       <<: *customize
     input_boolean.boost_valvola_sala:
       <<: *customize
     input_boolean.boost_valvola_studio:
       <<: *customize
-    input_boolean.boost_valvola_bagno:
+    input_boolean.boost_valvola_bagno_grande:
+      <<: *customize
+    input_boolean.boost_valvola_bagno_piccolo:
       <<: *customize
     input_boolean.boost_valvola_camera:
       <<: *customize
@@ -75,4 +91,4 @@ homeassistant:
     automation.termosifoni_sincronizzazione_con_riscaldamento_centralizzato:
       <<: *customize
     automation.netatmo_notifica_disconnessione:
-      <<: *customize
\ No newline at end of file
+      <<: *customize

diff --git a/packages/netatmo/netatmo_on_off.yaml b/packages/netatmo/netatmo_on_off.yaml
index 46c6bce89b8264b0d18959d2b444ce4419f7783f..805c80543fb854d23c122cbb877a870e8c13cfbd 100644 (file)
--- a/packages/netatmo/netatmo_on_off.yaml
+++ b/packages/netatmo/netatmo_on_off.yaml
@@ -3,6 +3,10 @@
 ######################################################################
 
 input_boolean:
+  valvola_zona_giorno:
+    name: Valvola Zona Giorno
+    initial: on
+    icon: mdi:thermometer
   valvola_cucina:
     name: Valvola Cucina
     initial: on
@@ -15,8 +19,12 @@ input_boolean:
     name: Valvola Studio
     initial: on
     icon: mdi:thermometer
-  valvola_bagno:
-    name: Valvola Bagno
+  valvola_bagno_piccolo:
+    name: Valvola Bagno Piccolo
+    initial: on
+    icon: mdi:thermometer
+  valvola_bagno_grande:
+    name: Valvola Bagno Grande
     initial: on
     icon: mdi:thermometer
   valvola_camera:
@@ -37,10 +45,12 @@ automation:
 
     trigger:
       trigger: state
-      entity_id: input_boolean.valvola_cucina,
+      entity_id: input_boolean.valvola_zona_giorno,
+                 input_boolean.valvola_cucina,
                  input_boolean.valvola_sala,
                  input_boolean.valvola_studio,
-                 input_boolean.valvola_bagno,
+                 input_boolean.valvola_bagno_piccolo,
+                 input_boolean.valvola_bagno_grande,
                  input_boolean.valvola_camera
       to: 'on'
 
@@ -48,14 +58,18 @@ automation:
       - action: climate.turn_on
         data_template:
           entity_id: >
-            {% if trigger.entity_id == 'input_boolean.valvola_cucina' %}
+            {% if trigger.entity_id == 'input_boolean.valvola_zona_giorno' %}
+              climate.zona_giorno
+            {% elif trigger.entity_id == 'input_boolean.valvola_cucina' %}
               climate.cucina
             {% elif trigger.entity_id == 'input_boolean.valvola_sala' %}
               climate.sala
             {% elif trigger.entity_id == 'input_boolean.valvola_studio' %}
               climate.studio
-            {% elif trigger.entity_id == 'input_boolean.valvola_bagno' %}
-              climate.bagno
+            {% elif trigger.entity_id == 'input_boolean.valvola_bagno_piccolo' %}
+              climate.bagno_piccolo
+            {% elif trigger.entity_id == 'input_boolean.valvola_bagno_grande' %}
+              climate.bagno_grande
             {% elif trigger.entity_id == 'input_boolean.valvola_camera' %}
               climate.camera
             {% endif %}
@@ -68,10 +82,12 @@ automation:
 
     trigger:
       trigger: state
-      entity_id: input_boolean.valvola_cucina,
+      entity_id: input_boolean.valvola_zona_giorno,
+                 input_boolean.valvola_cucina,
                  input_boolean.valvola_sala,
                  input_boolean.valvola_studio,
-                 input_boolean.valvola_bagno,
+                 input_boolean.valvola_bagno_piccolo,
+                 input_boolean.valvola_bagno_grande,
                  input_boolean.valvola_camera
       to: 'off'
 
@@ -79,14 +95,18 @@ automation:
       - action: climate.turn_off
         data_template:
           entity_id: >
-            {% if trigger.entity_id == 'input_boolean.valvola_cucina' %}
+            {% if trigger.entity_id == 'input_boolean.valvola_zona_giorno' %}
+              climate.zona_giorno
+            {% elif trigger.entity_id == 'input_boolean.valvola_cucina' %}
               climate.cucina
             {% elif trigger.entity_id == 'input_boolean.valvola_sala' %}
               climate.sala
             {% elif trigger.entity_id == 'input_boolean.valvola_studio' %}
               climate.studio
-            {% elif trigger.entity_id == 'input_boolean.valvola_bagno' %}
-              climate.bagno
+            {% elif trigger.entity_id == 'input_boolean.valvola_bagno_piccolo' %}
+              climate.bagno_piccolo
+            {% elif trigger.entity_id == 'input_boolean.valvola_bagno_grande' %}
+              climate.bagno_grande
             {% elif trigger.entity_id == 'input_boolean.valvola_camera' %}
               climate.camera
             {% endif %}

diff --git a/packages/netatmo/netatmo_operations.yaml b/packages/netatmo/netatmo_operations.yaml
index f731e43b2589eef0e826f088660ab8ee1e47a74c..4e391c7e74f3c8321129bcba125cf1fd40ec5461 100644 (file)
--- a/packages/netatmo/netatmo_operations.yaml
+++ b/packages/netatmo/netatmo_operations.yaml
@@ -16,6 +16,9 @@ automation:
         }}
 
     trigger:
+      - trigger: state
+        entity_id: climate.zona_giorno
+        to: 'unavailable'
       - trigger: state
         entity_id: climate.cucina
         to: 'unavailable'
@@ -26,7 +29,10 @@ automation:
         entity_id: climate.studio
         to: 'unavailable'
       - trigger: state
-        entity_id: climate.bagno
+        entity_id: climate.bagno_piccolo
+        to: 'unavailable'
+      - trigger: state
+        entity_id: climate.bagno_grande
         to: 'unavailable'
       - trigger: state
         entity_id: climate.camera

diff --git a/packages/netatmo/netatmo_sensor.yaml b/packages/netatmo/netatmo_sensor.yaml
index deb2362da89888839790226ca008ab87d0343022..3be55b0c2d8d9f8f9ca8f62b3ca8ca3e4af673da 100644 (file)
--- a/packages/netatmo/netatmo_sensor.yaml
+++ b/packages/netatmo/netatmo_sensor.yaml
@@ -6,6 +6,14 @@ sensor:
   ######################################################################
   # Sensor: Temperature from Radiator Valve
   ######################################################################
+  - platform: template
+    sensors:
+      valvola_zona_giorno_temperature:
+        friendly_name: "Temperatura Zona Giorno"
+        value_template: "{{ state_attr('climate.zona_giorno', 'current_temperature') }}"
+        unit_of_measurement: '°C'
+        device_class: temperature
+
   - platform: template
     sensors:
       valvola_cucina_temperature:
@@ -32,9 +40,17 @@ sensor:
 
   - platform: template
     sensors:
-      valvola_bagno_temperature:
-        friendly_name: "Temperatura Bagno"
-        value_template: "{{ state_attr('climate.bagno', 'current_temperature') }}"
+      valvola_bagno_piccolo_temperature:
+        friendly_name: "Temperatura Bagno Piccolo"
+        value_template: "{{ state_attr('climate.bagno_piccolo', 'current_temperature') }}"
+        unit_of_measurement: '°C'
+        device_class: temperature
+
+  - platform: template
+    sensors:
+      valvola_bagno_grande_temperature:
+        friendly_name: "Temperatura Bagno Grande"
+        value_template: "{{ state_attr('climate.bagno_grande', 'current_temperature') }}"
         unit_of_measurement: '°C'
         device_class: temperature
 
@@ -49,6 +65,18 @@ sensor:
   ######################################################################
   # Sensor: State from Radiator Valve
   ######################################################################
+  - platform: template
+    sensors:
+      valvola_zona_giorno_state:
+        friendly_name: "Stato Valvola Zona Giorno"
+        value_template: "{{ state_attr('climate.zona_giorno', 'hvac_action') }}"
+        icon_template: >-
+          {% if is_state_attr('climate.zona_giorno', 'hvac_action', 'idle') %}
+            mdi:radiator-disabled
+          {% else %}
+            mdi:radiator
+          {% endif %}
+
   - platform: template
     sensors:
       valvola_cucina_state:
@@ -87,11 +115,23 @@ sensor:
 
   - platform: template
     sensors:
-      valvola_bagno_state:
-        friendly_name: "Stato Valvola Bagno"
-        value_template: "{{ state_attr('climate.bagno', 'hvac_action') }}"
+      valvola_bagno_piccolo_state:
+        friendly_name: "Stato Valvola Bagno Piccolo"
+        value_template: "{{ state_attr('climate.bagno_piccolo', 'hvac_action') }}"
+        icon_template: >-
+          {% if is_state_attr('climate.bagno_piccolo', 'hvac_action', 'idle') %}
+            mdi:radiator-disabled
+          {% else %}
+            mdi:radiator
+          {% endif %}
+
+  - platform: template
+    sensors:
+      valvola_bagno_grande_state:
+        friendly_name: "Stato Valvola Bagno Grande"
+        value_template: "{{ state_attr('climate.bagno_grande', 'hvac_action') }}"
         icon_template: >-
-          {% if is_state_attr('climate.bagno', 'hvac_action', 'idle') %}
+          {% if is_state_attr('climate.bagno_grande', 'hvac_action', 'idle') %}
             mdi:radiator-disabled
           {% else %}
             mdi:radiator