Change DHW comfort switch to select

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 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)
+
 ## v1.11.4
 
 - Correct Anna P1 detection via PR [#879](https://github.com/plugwise/python-plugwise/pull/879)

fixtures/adam_bad_thermostat/data.json

@@ -7,6 +7,11 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "off",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "856285a783f24bf4b2573c8bc510eabf",
     "max_dhw_temperature": {
       "lower_bound": 0.0,
@@ -31,9 +36,6 @@
       "return_temperature": 33.0,
       "water_temperature": 20.9
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "WeHeat"
   },
   "3ee6b9486cb04c258a3130fff2b144a4": {

fixtures/adam_heatpump_cooling/data.json

@@ -55,6 +55,11 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "comfort",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "eedadcb297564f1483faa509179aebed",
     "max_dhw_temperature": {
       "lower_bound": 40.0,
@@ -80,9 +85,6 @@
       "water_pressure": 2.0,
       "water_temperature": 24.5
     },
-    "switches": {
-      "dhw_cm_switch": true
-    },
     "vendor": "Remeha B.V."
   },
   "1053c8bbf8be43c6921742b146a625f1": {

fixtures/adam_jip/data.json

@@ -394,6 +394,11 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "off",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "9e4433a9d69f40b3aefd15e74395eaec",
     "max_dhw_temperature": {
       "lower_bound": 40.0,
@@ -417,9 +422,6 @@
       "water_pressure": 1.4,
       "water_temperature": 37.3
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Remeha B.V."
   },
   "f61f1a2535f54f52ad006a3d18e459ca": {

fixtures/adam_onoff_cooling_fake_firmware/data.json

@@ -8,6 +8,11 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "comfort",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "eedadcb297564f1483faa509179aebed",
     "max_dhw_temperature": {
       "lower_bound": 40.0,
@@ -31,9 +36,6 @@
       "return_temperature": 24.9,
       "water_pressure": 2.0,
       "water_temperature": 24.5
-    },
-    "switches": {
-      "dhw_cm_switch": true
     }
   },
   "7d97fc3117784cfdafe347bcedcbbbcb": {

fixtures/adam_plus_anna/data.json

@@ -45,6 +45,10 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "07d618f0bb80412687f065b8698ce3e7",
     "maximum_boiler_temperature": {
       "lower_bound": 0.0,
@@ -54,12 +58,10 @@
     },
     "model": "Generic heater",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "intended_boiler_temperature": 0.0,
       "water_temperature": 48.0
-    },
-    "switches": {
-      "dhw_cm_switch": false
     }
   },
   "aa6b0002df0a46e1b1eb94beb61eddfe": {

fixtures/adam_plus_anna_new/data.json

@@ -7,6 +7,10 @@
       "heating_state": true
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "bc93488efab249e5bc54fd7e175a6f91",
     "maximum_boiler_temperature": {
       "lower_bound": 25.0,
@@ -16,12 +20,10 @@
     },
     "model": "Generic heater",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "intended_boiler_temperature": 22.5,
       "water_temperature": 43.0
-    },
-    "switches": {
-      "dhw_cm_switch": false
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/adam_plus_anna_new_regulation_off/data.json

@@ -7,6 +7,10 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "bc93488efab249e5bc54fd7e175a6f91",
     "maximum_boiler_temperature": {
       "lower_bound": 25.0,
@@ -16,12 +20,10 @@
     },
     "model": "Generic heater",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "intended_boiler_temperature": 0.0,
       "water_temperature": 30.0
-    },
-    "switches": {
-      "dhw_cm_switch": false
     }
   },
   "10016900610d4c7481df78c89606ef22": {

fixtures/anna_elga_2/data.json

@@ -11,9 +11,14 @@
       "secondary_boiler_state": true
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "d34dfe6ab90b410c98068e75de3eb631",
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "domestic_hot_water_setpoint": 60.0,
       "intended_boiler_temperature": 58.3,
@@ -23,9 +28,6 @@
       "water_pressure": 0.5,
       "water_temperature": 42.6
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Techneco"
   },
   "ebd90df1ab334565b5895f37590ccff4": {

fixtures/anna_elga_2_cooling/data.json

@@ -11,6 +11,10 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "d34dfe6ab90b410c98068e75de3eb631",
     "maximum_boiler_temperature": {
       "lower_bound": 0.0,
@@ -20,6 +24,7 @@
     },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
+    "select_dhw_mode": "comfort",
     "sensors": {
       "domestic_hot_water_setpoint": 60.0,
       "intended_boiler_temperature": 0.0,
@@ -29,9 +34,6 @@
       "water_pressure": 0.5,
       "water_temperature": 22.8
     },
-    "switches": {
-      "dhw_cm_switch": true
-    },
     "vendor": "Techneco"
   },
   "ebd90df1ab334565b5895f37590ccff4": {

fixtures/anna_elga_2_schedule_off/data.json

@@ -11,6 +11,10 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "d34dfe6ab90b410c98068e75de3eb631",
     "maximum_boiler_temperature": {
       "lower_bound": 0.0,
@@ -20,6 +24,7 @@
     },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
+    "select_dhw_mode": "comfort",
     "sensors": {
       "domestic_hot_water_setpoint": 60.0,
       "intended_boiler_temperature": 0.0,
@@ -29,9 +34,6 @@
       "water_pressure": 0.5,
       "water_temperature": 22.8
     },
-    "switches": {
-      "dhw_cm_switch": true
-    },
     "vendor": "Techneco"
   },
   "ebd90df1ab334565b5895f37590ccff4": {

fixtures/anna_elga_no_cooling/data.json

@@ -27,6 +27,11 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "off",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "a57efe5f145f498c9be62a9b63626fbf",
     "max_dhw_temperature": {
       "lower_bound": 35.0,
@@ -51,9 +56,6 @@
       "water_pressure": 1.57,
       "water_temperature": 29.1
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Techneco"
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {

fixtures/anna_heatpump_cooling/data.json

@@ -29,6 +29,10 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "a57efe5f145f498c9be62a9b63626fbf",
     "maximum_boiler_temperature": {
       "lower_bound": 0.0,
@@ -38,6 +42,7 @@
     },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "dhw_temperature": 41.5,
       "domestic_hot_water_setpoint": 60.0,
@@ -48,9 +53,6 @@
       "water_pressure": 1.61,
       "water_temperature": 24.7
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Techneco"
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {

fixtures/anna_heatpump_cooling_fake_firmware/data.json

@@ -29,6 +29,10 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "a57efe5f145f498c9be62a9b63626fbf",
     "maximum_boiler_temperature": {
       "lower_bound": 0.0,
@@ -38,6 +42,7 @@
     },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
+    "select_dhw_mode": "off",
     "sensors": {
       "dhw_temperature": 41.5,
       "domestic_hot_water_setpoint": 60.0,
@@ -48,9 +53,6 @@
       "water_pressure": 1.61,
       "water_temperature": 24.7
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Techneco"
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {

fixtures/anna_heatpump_heating/data.json

@@ -29,6 +29,11 @@
       "secondary_boiler_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "off",
+    "dhw_modes": [
+      "comfort",
+      "off"
+    ],
     "location": "a57efe5f145f498c9be62a9b63626fbf",
     "max_dhw_temperature": {
       "lower_bound": 35.0,
@@ -53,9 +58,6 @@
       "water_pressure": 1.57,
       "water_temperature": 29.1
     },
-    "switches": {
-      "dhw_cm_switch": false
-    },
     "vendor": "Techneco"
   },
   "3cb70739631c4d17a86b8b12e8a5161b": {

fixtures/anna_loria_cooling_active/data.json

@@ -71,6 +71,7 @@
       "heating_state": false
     },
     "dev_class": "heater_central",
+    "dhw_mode": "auto",
     "dhw_modes": [
       "off",
       "auto",
@@ -94,7 +95,6 @@
     "model": "Generic heater/cooler",
     "model_id": "173",
     "name": "OpenTherm",
-    "select_dhw_mode": "auto",
     "sensors": {
       "dhw_temperature": 52.9,
       "intended_boiler_temperature": 0.0,
@@ -104,8 +104,7 @@
       "water_temperature": 25.3
     },
     "switches": {
-      "cooling_ena_switch": true,
-      "dhw_cm_switch": true
+      "cooling_ena_switch": true
     },
     "vendor": "Atlantic"
   }