Change water_heater_mode to dhw_mode

Author: bouwew

plugwise/constants.py

@@ -557,9 +557,9 @@ class GwEntityData(TypedDict, total=False):
     available: bool | None
 
     # DHW mode related
-    select_dhw_mode: str
-    water_heater_mode: str
+    dhw_mode: str
     dhw_modes: list[str]
+    select_dhw_mode: str
 
     # Gateway
     gateway_modes: list[str]

plugwise/data.py

@@ -83,7 +83,7 @@ def _update_gw_entities(self) -> None:
                 mode = entity.get("select_dhw_mode")
                 if mode is not None:
                     entity.pop("select_dhw_mode")
-                    entity["water_heater_mode"] = mode
+                    entity["dhw_mode"] = mode
 
     def _detect_low_batteries(self) -> list[str]:
         """Helper-function updating the low-battery binary_sensor status from a Battery-is-low message."""

tests/data/adam/adam_bad_thermostat.json

@@ -27,7 +27,7 @@
     "model": "Generic heater",
     "model_id": "1.1",
     "name": "OpenTherm",
-    "water_heater_mode": "off",
+    "dhw_mode": "off",
     "sensors": {
       "dhw_temperature": 49.9,
       "intended_boiler_temperature": 0.0,

tests/data/adam/adam_heatpump_cooling.json

@@ -63,7 +63,7 @@
     "model": "Generic heater/cooler",
     "model_id": "17.1",
     "name": "OpenTherm",
-    "water_heater_mode": "comfort",
+    "dhw_mode": "comfort",
     "sensors": {
       "dhw_temperature": 63.5,
       "intended_boiler_temperature": 0.0,

tests/data/adam/adam_jip.json

@@ -349,7 +349,7 @@
     "model": "Generic heater",
     "model_id": "10.20",
     "name": "OpenTherm",
-    "water_heater_mode": "off",
+    "dhw_mode": "off",
     "sensors": {
       "intended_boiler_temperature": 0.0,
       "modulation_level": 0.0,

tests/data/adam/adam_onoff_cooling_fake_firmware.json

@@ -27,7 +27,7 @@
     },
     "model": "Unknown",
     "name": "OnOff",
-    "water_heater_mode": "comfort",
+    "dhw_mode": "comfort",
     "sensors": {
       "dhw_temperature": 63.5,
       "intended_boiler_temperature": 0.0,

tests/data/anna/anna_elga_no_cooling.json

@@ -46,7 +46,7 @@
     },
     "model": "Generic heater",
     "name": "OpenTherm",
-    "water_heater_mode": "off",
+    "dhw_mode": "off",
     "sensors": {
       "dhw_temperature": 46.3,
       "intended_boiler_temperature": 35.0,

tests/data/anna/anna_heatpump_heating.json

@@ -48,7 +48,7 @@
     },
     "model": "Generic heater/cooler",
     "name": "OpenTherm",
-    "water_heater_mode": "off",
+    "dhw_mode": "off",
     "sensors": {
       "dhw_temperature": 46.3,
       "intended_boiler_temperature": 35.0,

tests/data/anna/anna_loria_cooling_active.json

@@ -78,7 +78,7 @@
     "model": "Generic heater/cooler",
     "model_id": "173",
     "name": "OpenTherm",
-    "water_heater_mode": "auto",
+    "dhw_mode": "auto",
     "sensors": {
       "dhw_temperature": 52.9,
       "intended_boiler_temperature": 0.0,

tests/data/anna/anna_loria_driessens.json

@@ -84,7 +84,7 @@
     "model": "Generic heater/cooler",
     "model_id": "173",
     "name": "OpenTherm",
-    "water_heater_mode": "auto",
+    "dhw_mode": "auto",
     "sensors": {
       "dhw_temperature": 49.5,
       "intended_boiler_temperature": 0.0,