Fix and improve logic

Author: bouwew

plugwise/helper.py

@@ -1005,7 +1005,7 @@ def _cleanup_data(self, data: DeviceData) -> None:
         Clean up the data dict.
         """
         # Fix for Adam + Anna: heating_state also present under Anna, remove
-        if "temperature" in data["binary_sensors"]:
+        if "temperature" in data["sensors"] and "heating_state" in data["binary_sensors"]:
             data["binary_sensors"].pop("heating_state", None)
 
         # Don't show cooling-related when no cooling present,