Include both old and new entities for a step-wise introduction of water_heaters in HA

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.14.0
+
+- Include both old and new entities for a step-wise introduction of water_heaters in HA via PR [#895](https://github.com/plugwise/python-plugwise/pull/895):
+  - Keep the `dhw_cm_switch` and add the `dhw_modes list` and the `select_dhw_mode` string that will replace the `dhw_cm_switch` in the future
+  - `dhw_cm_switch` = `on` --> `select_dhw_mode` = `comfort`, `dhw_cm_switch` = `off` --> `select_dhw_mode` = `eco`
+  - Add a `current` (`temperature`) key to the `maximum_boiler_temperature` and `max_dhw_temperature` dicts
+
 ## v1.13.1
 
 - Implement dedicated boiler_temperature dict for legacy Anna via PR [#893](https://github.com/plugwise/python-plugwise/pull/893)

fixtures/adam_bad_thermostat/data.json

@@ -6,35 +6,40 @@
       "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": "eco",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "dhw_temperature": {
+    "location": "856285a783f24bf4b2573c8bc510eabf",
+    "max_dhw_temperature": {
       "current": 49.9,
       "lower_bound": 0.0,
       "resolution": 1.0,
       "setpoint": 50.0,
       "upper_bound": 100.0
     },
-    "location": "856285a783f24bf4b2573c8bc510eabf",
+    "maximum_boiler_temperature": {
+      "current": 20.9,
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 38.0,
+      "upper_bound": 45.0
+    },
     "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
+      "return_temperature": 33.0,
+      "water_temperature": 20.9
+    },
+    "switches": {
+      "dhw_cm_switch": false
     },
     "vendor": "WeHeat"
   },

fixtures/adam_heatpump_cooling/data.json

@@ -54,36 +54,41 @@
       "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",
       "eco"
     ],
-    "dhw_temperature": {
+    "location": "eedadcb297564f1483faa509179aebed",
+    "max_dhw_temperature": {
       "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "location": "eedadcb297564f1483faa509179aebed",
+    "maximum_boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "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_pressure": 2.0,
+      "water_temperature": 24.5
+    },
+    "switches": {
+      "dhw_cm_switch": true
     },
     "vendor": "Remeha B.V."
   },

fixtures/adam_jip/data.json

@@ -393,35 +393,39 @@
       "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": "eco",
     "dhw_modes": [
       "comfort",
       "eco"
     ],
-    "dhw_temperature": {
+    "location": "9e4433a9d69f40b3aefd15e74395eaec",
+    "max_dhw_temperature": {
       "current": 37.3,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 60.0
     },
-    "location": "9e4433a9d69f40b3aefd15e74395eaec",
+    "maximum_boiler_temperature": {
+      "current": 37.3,
+      "lower_bound": 20.0,
+      "resolution": 0.01,
+      "setpoint": 90.0,
+      "upper_bound": 90.0
+    },
     "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_pressure": 1.4,
+      "water_temperature": 37.3
+    },
+    "switches": {
+      "dhw_cm_switch": false
     },
     "vendor": "Remeha B.V."
   },

fixtures/adam_onoff_cooling_fake_firmware/data.json

@@ -7,35 +7,40 @@
       "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",
       "eco"
     ],
-    "dhw_temperature": {
+    "location": "eedadcb297564f1483faa509179aebed",
+    "max_dhw_temperature": {
       "current": 63.5,
       "lower_bound": 40.0,
       "resolution": 0.01,
       "setpoint": 60.0,
       "upper_bound": 65.0
     },
-    "location": "eedadcb297564f1483faa509179aebed",
+    "maximum_boiler_temperature": {
+      "current": 24.5,
+      "lower_bound": 7.0,
+      "resolution": 0.01,
+      "setpoint": 35.0,
+      "upper_bound": 50.0
+    },
     "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_pressure": 2.0,
+      "water_temperature": 24.5
+    },
+    "switches": {
+      "dhw_cm_switch": true
     }
   },
   "7d97fc3117784cfdafe347bcedcbbbcb": {

fixtures/adam_plus_anna/data.json

@@ -44,24 +44,28 @@
       "flame_state": false,
       "heating_state": false
     },
-    "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",
+    "maximum_boiler_temperature": {
+      "current": 48.0,
+      "lower_bound": 0.0,
+      "resolution": 1.0,
+      "setpoint": 80.0,
+      "upper_bound": 100.0
+    },
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 0.0
+      "intended_boiler_temperature": 0.0,
+      "water_temperature": 48.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
     }
   },
   "aa6b0002df0a46e1b1eb94beb61eddfe": {

fixtures/adam_plus_anna_new/data.json

@@ -6,24 +6,28 @@
       "flame_state": true,
       "heating_state": true
     },
-    "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",
+    "maximum_boiler_temperature": {
+      "current": 43.0,
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 50.0,
+      "upper_bound": 95.0
+    },
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 22.5
+      "intended_boiler_temperature": 22.5,
+      "water_temperature": 43.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/adam_plus_anna_new_regulation_off/data.json

@@ -6,24 +6,28 @@
       "flame_state": false,
       "heating_state": false
     },
-    "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",
+    "maximum_boiler_temperature": {
+      "current": 30.0,
+      "lower_bound": 25.0,
+      "resolution": 0.01,
+      "setpoint": 50.0,
+      "upper_bound": 95.0
+    },
     "model": "Generic heater",
     "name": "OpenTherm",
     "select_dhw_mode": "eco",
     "sensors": {
-      "intended_boiler_temperature": 0.0
+      "intended_boiler_temperature": 0.0,
+      "water_temperature": 30.0
+    },
+    "switches": {
+      "dhw_cm_switch": false
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/anna_elga_2/data.json

@@ -28,6 +28,9 @@
       "water_pressure": 0.5,
       "water_temperature": 42.6
     },
+    "switches": {
+      "dhw_cm_switch": false
+    },
     "vendor": "Techneco"
   },
   "ebd90df1ab334565b5895f37590ccff4": {

fixtures/anna_elga_2_cooling/data.json

@@ -10,19 +10,19 @@
       "heating_state": false,
       "secondary_boiler_state": false
     },
-    "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",
+    "maximum_boiler_temperature": {
+      "current": 22.8,
+      "lower_bound": 0.0,
+      "resolution": 1.0,
+      "setpoint": 60.0,
+      "upper_bound": 100.0
+    },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
     "select_dhw_mode": "comfort",
@@ -32,7 +32,11 @@
       "modulation_level": 0.0,
       "outdoor_air_temperature": 30.0,
       "return_temperature": 23.4,
-      "water_pressure": 0.5
+      "water_pressure": 0.5,
+      "water_temperature": 22.8
+    },
+    "switches": {
+      "dhw_cm_switch": true
     },
     "vendor": "Techneco"
   },