Further improvement on HA water_heater related output data

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## Ongoing
+
+- Improve on v1.12.0 update by outputting dedicated boiler_ and dhw_temperature dicts with current-key added. Rename dhw_mode off to eco for standard cv-heaters.
+
 ## v1.12.0
 
 - Replace the DHW-comfort-mode switch by a DHW mode selector to match the new HA select or water_heater platform updates, via PR [#883](https://github.com/plugwise/python-plugwise/pull/883)

fixtures/adam_bad_thermostat/data.json

@@ -6,35 +6,35 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 20.9,
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 38.0,
+      "upper_bound": 45.0
+    },
     "dev_class": "heater_central",
-    "dhw_mode": "off",
+    "dhw_mode": "eco",
     "dhw_modes": [
       "comfort",
-      "off"
+      "eco"
     ],
-    "location": "856285a783f24bf4b2573c8bc510eabf",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
+      "current": 49.9,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 50.0,
       "upper_bound": 100.0
     },
-    "maximum_boiler_temperature": {
-      "lower_bound": 25.0,
-      "resolution": 0.01,
-      "setpoint": 38.0,
-      "upper_bound": 45.0
-    },
+    "location": "856285a783f24bf4b2573c8bc510eabf",
     "model": "Generic heater",
     "model_id": "1.1",
     "name": "OpenTherm",
     "sensors": {
-      "dhw_temperature": 49.9,
       "intended_boiler_temperature": 0.0,
       "modulation_level": 0.0,
       "outdoor_air_temperature": 13.6,
-      "return_temperature": 33.0,
-      "water_temperature": 20.9
+      "return_temperature": 33.0
     },
     "vendor": "WeHeat"
   },

fixtures/adam_heatpump_cooling/data.json

@@ -54,36 +54,36 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "comfort",
     "dhw_modes": [
       "comfort",
-      "off"
+      "eco"
     ],
-    "location": "eedadcb297564f1483faa509179aebed",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
+      "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "maximum_boiler_temperature": {
-      "lower_bound": 7.0,
-      "resolution": 0.01,
-      "setpoint": 35.0,
-      "upper_bound": 50.0
-    },
+    "location": "eedadcb297564f1483faa509179aebed",
     "model": "Generic heater/cooler",
     "model_id": "17.1",
     "name": "OpenTherm",
     "sensors": {
-      "dhw_temperature": 63.5,
       "intended_boiler_temperature": 0.0,
       "modulation_level": 0.0,
       "outdoor_air_temperature": 13.5,
       "return_temperature": 24.9,
-      "water_pressure": 2.0,
-      "water_temperature": 24.5
+      "water_pressure": 2.0
     },
     "vendor": "Remeha B.V."
   },

fixtures/adam_jip/data.json

@@ -393,34 +393,35 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 37.3,
+      "lower_bound": 20.0,
+      "resolution": 0.01,
+      "setpoint": 90.0,
+      "upper_bound": 90.0
+    },
     "dev_class": "heater_central",
-    "dhw_mode": "off",
+    "dhw_mode": "eco",
     "dhw_modes": [
       "comfort",
-      "off"
+      "eco"
     ],
-    "location": "9e4433a9d69f40b3aefd15e74395eaec",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
+      "current": 37.3,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 60.0
     },
-    "maximum_boiler_temperature": {
-      "lower_bound": 20.0,
-      "resolution": 0.01,
-      "setpoint": 90.0,
-      "upper_bound": 90.0
-    },
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
     "model": "Generic heater",
     "model_id": "10.20",
     "name": "OpenTherm",
     "sensors": {
       "intended_boiler_temperature": 0.0,
       "modulation_level": 0.0,
       "return_temperature": 37.1,
-      "water_pressure": 1.4,
-      "water_temperature": 37.3
+      "water_pressure": 1.4
     },
     "vendor": "Remeha B.V."
   },

fixtures/adam_onoff_cooling_fake_firmware/data.json

@@ -7,35 +7,35 @@
       "flame_state": false,
       "heating_state": false
     },
+    "boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "dev_class": "heater_central",
     "dhw_mode": "comfort",
     "dhw_modes": [
       "comfort",
-      "off"
+      "eco"
     ],
-    "location": "eedadcb297564f1483faa509179aebed",
-    "max_dhw_temperature": {
+    "dhw_temperature": {
+      "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "maximum_boiler_temperature": {
-      "lower_bound": 7.0,
-      "resolution": 0.01,
-      "setpoint": 35.0,
-      "upper_bound": 50.0
-    },
+    "location": "eedadcb297564f1483faa509179aebed",
     "model": "Unknown",
     "name": "OnOff",
     "sensors": {
-      "dhw_temperature": 63.5,
       "intended_boiler_temperature": 0.0,
       "modulation_level": 0.0,
       "outdoor_air_temperature": 13.5,
       "return_temperature": 24.9,
-      "water_pressure": 2.0,
-      "water_temperature": 24.5
+      "water_pressure": 2.0
     }
   },
   "7d97fc3117784cfdafe347bcedcbbbcb": {

fixtures/adam_plus_anna/data.json

@@ -44,24 +44,24 @@
       "flame_state": false,
       "heating_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "off"
-    ],
-    "location": "07d618f0bb80412687f065b8698ce3e7",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
+      "current": 48.0,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 80.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "07d618f0bb80412687f065b8698ce3e7",
     "model": "Generic heater",
     "name": "OpenTherm",
-    "select_dhw_mode": "off",
+    "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 0.0,
-      "water_temperature": 48.0
+      "intended_boiler_temperature": 0.0
     }
   },
   "aa6b0002df0a46e1b1eb94beb61eddfe": {

fixtures/adam_plus_anna_new/data.json

@@ -6,24 +6,24 @@
       "flame_state": true,
       "heating_state": true
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "off"
-    ],
-    "location": "bc93488efab249e5bc54fd7e175a6f91",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
+      "current": 43.0,
       "lower_bound": 25.0,
       "resolution": 0.01,
       "setpoint": 50.0,
       "upper_bound": 95.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
     "model": "Generic heater",
     "name": "OpenTherm",
-    "select_dhw_mode": "off",
+    "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 22.5,
-      "water_temperature": 43.0
+      "intended_boiler_temperature": 22.5
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/adam_plus_anna_new_regulation_off/data.json

@@ -6,24 +6,24 @@
       "flame_state": false,
       "heating_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "off"
-    ],
-    "location": "bc93488efab249e5bc54fd7e175a6f91",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
+      "current": 30.0,
       "lower_bound": 25.0,
       "resolution": 0.01,
       "setpoint": 50.0,
       "upper_bound": 95.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "bc93488efab249e5bc54fd7e175a6f91",
     "model": "Generic heater",
     "name": "OpenTherm",
-    "select_dhw_mode": "off",
+    "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 0.0,
-      "water_temperature": 30.0
+      "intended_boiler_temperature": 0.0
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/anna_elga_2/data.json

@@ -13,12 +13,12 @@
     "dev_class": "heater_central",
     "dhw_modes": [
       "comfort",
-      "off"
+      "eco"
     ],
     "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
-    "select_dhw_mode": "off",
+    "select_dhw_mode": "eco",
     "sensors": {
       "domestic_hot_water_setpoint": 60.0,
       "intended_boiler_temperature": 58.3,

fixtures/anna_elga_2_cooling/data.json

@@ -10,18 +10,19 @@
       "heating_state": false,
       "secondary_boiler_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "off"
-    ],
-    "location": "d34dfe6ab90b410c98068e75de3eb631",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
+      "current": 22.8,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 60.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "select_dhw_mode": "comfort",
@@ -31,8 +32,7 @@
       "modulation_level": 0.0,
       "outdoor_air_temperature": 30.0,
       "return_temperature": 23.4,
-      "water_pressure": 0.5,
-      "water_temperature": 22.8
+      "water_pressure": 0.5
     },
     "vendor": "Techneco"
   },

fixtures/anna_elga_2_schedule_off/data.json

@@ -10,18 +10,19 @@
       "heating_state": false,
       "secondary_boiler_state": false
     },
-    "dev_class": "heater_central",
-    "dhw_modes": [
-      "comfort",
-      "off"
-    ],
-    "location": "d34dfe6ab90b410c98068e75de3eb631",
-    "maximum_boiler_temperature": {
+    "boiler_temperature": {
+      "current": 22.8,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 60.0,
       "upper_bound": 100.0
     },
+    "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "eco"
+    ],
+    "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "select_dhw_mode": "comfort",
@@ -31,8 +32,7 @@
       "modulation_level": 0.0,
       "outdoor_air_temperature": 13.0,
       "return_temperature": 23.4,
-      "water_pressure": 0.5,
-      "water_temperature": 22.8
+      "water_pressure": 0.5
     },
     "vendor": "Techneco"
   },