Merge pull request #194 from plugwise/fix_#192

Fix for #192: improve OpenTherm/OnOff boiler detection

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.18.5: Smile bugfix for #192
+
 # v0.18.4: Smile: schedule-related bug-fixes and clean-up
 - Update `_last_used_schedule()`: provide the collected schedules as input in order to find the last-modified valid schedule.
 - `_rule_ids_by_x()`: replace None by NONE, allowing for simpler typing.

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.18.4"
+__version__ = "0.18.5"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -542,18 +542,10 @@ def _all_appliances(self) -> None:
                 )
 
         # Find the connected heating/cooling device (heater_central), e.g. heat-pump or gas-fired heater
-        # Legacy Anna only:
-        boiler_state = self._appliances.find(".//logs/point_log[type='boiler_state']")
-        # Anna, Adam:
-        c_heating_state = self._appliances.find(
-            ".//logs/point_log[type='central_heating_state']"
-        )
-        ot_fault_code = self._appliances.find(
-            ".//logs/point_log[type='open_therm_oem_fault_code']"
-        )
-        if boiler_state is not None or c_heating_state is not None:
-            self._opentherm_device = ot_fault_code is not None
-            self._on_off_device = ot_fault_code is None
+        onoff_boiler = self._modules.find("./module/protocols/onoff_boiler")
+        open_therm_boiler = self._modules.find("./module/protocols/open_therm_boiler")
+        self._on_off_device = onoff_boiler is not None
+        self._opentherm_device = open_therm_boiler is not None
 
         for appliance in self._appliances.findall("./appliance"):
             appl = Munch()