Merge pull request #247 from plugwise/0.25.13

Bugfix as suggested by huub66

Author: bouwew

CHANGELOG.md

@@ -1,6 +1,10 @@
 # Changelog
 
-# 0.25.12: Revert remove raising of InvalidSetupError
+# v0.25.13: Anna+Elga, OnOff device: base heating_state, cooling_state on central_heating_state key only
+- Partial solution for https://github.com/plugwise/plugwise-beta/issues/320
+- Improving the solution for https://github.com/home-assistant/core/issues/81839
+
+# v0.25.12: Revert remove raising of InvalidSetupError
 
 # v0.25.11: Improve/change contents building on v0.25.10
 - Revert: Improve handling of xml-data missing, raise exception with warning; the reason for adding this fix is not clear. Needs further investigation.

plugwise/__init__.py

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

plugwise/helper.py

@@ -971,14 +971,14 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
         # Anna + Elga and Adam/Anna + OnOff heater/cooler don't use intended_central_heating_state
         # to show the generic heating state
         if "c_heating_state" in data:
-            if (self._elga and "heating_state" in data) or (
-                self.smile_name in ("Adam", "Anna") and self._on_off_device
+            if self._elga or (
+                self.smile_name in ("Adam", "Smile Anna") and self._on_off_device
             ):
-                if data.get("c_heating_state") and not data.get("heating_state"):
-                    data["heating_state"] = True
-                    # For Adam + OnOff cooling heating_state = True means cooling is active
-                    if self._cooling_present:
-                        self._cooling_active = True
+                data["heating_state"] = data["c_heating_state"]
+                # For Adam + OnOff cooling, central_heating_state = True means cooling is active
+                # For Smile Anna, _cooling_active will be corrected in the next if-construc
+                if self._cooling_present:
+                    self._cooling_active = True
 
             # Finally, remove c_heating_state from the output
             data.pop("c_heating_state")