Merge pull request #330 from plugwise/max_dw_fix

Fix domestic_hot_water_setpoint bug happening in Anna + Elga system

Author: bouwew

CHANGELOG.md

@@ -1,7 +1,8 @@
 # Changelog
 
-## Ongoing
+## V0.31.6: Fix domestic_hot_water_setpoint-related bug for Anna + Elga
 
+- Add guarding for popping domestic_hot_water_setpoint
 - Improved fixture generation and prettifying
 
 ## v0.31.5: Cooling-related fix/improvements

plugwise/constants.py

@@ -58,22 +58,9 @@
 DEFAULT_PORT: Final = 80
 DEFAULT_PW_MAX: Final = 30.0
 DEFAULT_PW_MIN: Final = 4.0
-NONE: Final = "None"
+DHW_SETPOINT: Final = "domestic_hot_water_setpoint"
 FAKE_APPL: Final = "aaaa0000aaaa0000aaaa0000aaaa00aa"
 FAKE_LOC: Final = "0000aaaa0000aaaa0000aaaa0000aa00"
-LEGACY_SMILES: Final[tuple[str, ...]] = (
-    "smile_thermo_v1",
-    "smile_v2",
-    "stretch_v2",
-    "stretch_v3",
-)
-LIMITS: Final[tuple[str, ...]] = (
-    "setpoint",
-    "lower_bound",
-    "upper_bound",
-    "resolution",
-)
-
 HW_MODELS: Final[dict[str, str]] = {
     "143.1": "ThermoTouch",
     "159.2": "Adam",
@@ -111,9 +98,21 @@
     "070051": "Switch",
     "080029": "Switch",
 }
-
+LEGACY_SMILES: Final[tuple[str, ...]] = (
+    "smile_thermo_v1",
+    "smile_v2",
+    "stretch_v2",
+    "stretch_v3",
+)
+LIMITS: Final[tuple[str, ...]] = (
+    "setpoint",
+    "lower_bound",
+    "upper_bound",
+    "resolution",
+)
 MAX_SETPOINT: Final[float] = 30.0
 MIN_SETPOINT: Final[float] = 4.0
+NONE: Final = "None"
 SPECIAL_FORMAT: Final[tuple[str, ...]] = (ENERGY_KILO_WATT_HOUR, VOLUME_CUBIC_METERS)
 SWITCH_GROUP_TYPES: Final[tuple[str, ...]] = ("switching", "report")
 ZONE_THERMOSTATS: Final[tuple[str, ...]] = (

plugwise/helper.py

@@ -29,6 +29,7 @@
     DEFAULT_PW_MAX,
     DEFAULT_PW_MIN,
     DEVICE_MEASUREMENTS,
+    DHW_SETPOINT,
     ENERGY_KILO_WATT_HOUR,
     ENERGY_WATT_HOUR,
     FAKE_APPL,
@@ -107,6 +108,8 @@ def check_model(name: str | None, vendor_name: str | None) -> str | None:
 def _get_actuator_functionalities(xml: etree, data: DeviceData) -> None:
     """Helper-function for _get_appliance_data()."""
     for item in ACTIVE_ACTUATORS:
+        if item == "max_dhw_temperature":
+            continue
         temp_dict: ActuatorData = {}
         for key in LIMITS:
             locator = f'.//actuator_functionalities/thermostat_functionality[type="{item}"]/{key}'
@@ -119,9 +122,10 @@ def _get_actuator_functionalities(xml: etree, data: DeviceData) -> None:
         if temp_dict:
             # If domestic_hot_water_setpoint is present as actuator,
             # rename and remove as sensor
-            if item == "domestic_hot_water_setpoint":
+            if item == DHW_SETPOINT:
                 item = "max_dhw_temperature"
-                data.pop("domestic_hot_water_setpoint")
+                if DHW_SETPOINT in data:
+                    data.pop(DHW_SETPOINT)
 
             data[item] = temp_dict  # type: ignore [literal-required]
 

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name            = "plugwise"
-version         = "0.31.5"
+version         = "0.31.6"
 license         = {file = "LICENSE"}
 description     = "Plugwise Smile (Adam/Anna/P1) and Stretch module for Python 3."
 readme          = "README.md"