Merge pull request #238 from plugwise/adam-non-cool

Two small fixes

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.26.9: Hide cooling-related switch, binary_sensors when there is no cooling present
+- This fixes the unexpected appearance of new entities after the Adam 3.7.1 firmware-update
+- Properly handle an empty schedule, should fix #313
+
 # v0.25.8: Make collection of toggle-data future-proof
 
 # v0.25.7: Correct faulty logic in the v0.25.6 release

plugwise/__init__.py

@@ -1,6 +1,6 @@
 """Plugwise module."""
 
-__version__ = "0.25.8a0"
+__version__ = "0.25.9"
 
 from plugwise.smile import Smile
 from plugwise.stick import Stick

plugwise/helper.py

@@ -792,7 +792,6 @@ def _presets(self, loc_id: str) -> dict[str, list[float]]:
             directives: etree = self._domain_objects.find(
                 f'rule[@id="{rule_id}"]/directives'
             )
-
             for directive in directives:
                 preset = directive.find("then").attrib
                 if "setpoint" in preset:
@@ -981,9 +980,11 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
             if all(item in data for item in ("cooling_ena_switch", "cooling_enabled")):
                 data.pop("cooling_enabled")
 
-        # Don't show cooling_state when no cooling present
-        if not self._cooling_present and "cooling_state" in data:
-            data.pop("cooling_state")
+        # Don't show cooling-related when no cooling present
+        if not self._cooling_present:
+            for item in ("cooling_state", "cooling_ena_switch", "cooling_enabled"):
+                if item in data:
+                    data.pop(item)
 
         return cast(DeviceData, data)
 
@@ -1254,10 +1255,13 @@ def _schedules(
         for rule_id, loc_id in rule_ids.items():
             name = self._domain_objects.find(f'./rule[@id="{rule_id}"]/name').text
             schedule: dict[str, list[float]] = {}
+            locator = f'./rule[@id="{rule_id}"]/directives'
+            # Show an empty schedule as no schedule found
+            if not (directives := self._domain_objects.find(locator)):
+                continue
+
             # Only process the active schedule in detail for Adam or Anna with cooling
             if self._cooling_present and loc_id != NONE:
-                locator = f'./rule[@id="{rule_id}"]/directives'
-                directives = self._domain_objects.find(locator)
                 for directive in directives:
                     entry = directive.find("then").attrib
                     if "setpoint" in entry:

tests/test_smile.py

@@ -1322,7 +1322,7 @@ async def test_connect_anna_without_boiler_fw4(self):
                 "available": True,
                 "preset_modes": ["vacation", "no_frost", "asleep", "away", "home"],
                 "active_preset": "home",
-                "available_schedules": ["Test", "Normal"],
+                "available_schedules": ["Normal"],
                 "selected_schedule": "Normal",
                 "last_used": "Normal",
                 "mode": "auto",
@@ -1354,7 +1354,7 @@ async def test_connect_anna_without_boiler_fw4(self):
         assert not self.notifications
 
         result = await self.tinker_thermostat(
-            smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Test", "Normal"]
+            smile, "c34c6864216446528e95d88985e714cc", good_schedules=["Normal"]
         )
         assert result
         await smile.close_connection()

userdata/anna_without_boiler_fw4/core.domain_objects.xml

@@ -159,7 +159,6 @@
 		<modified_date>2020-03-12T14:20:45.656+01:00</modified_date>
 		<deleted_date></deleted_date>
 		<directives>
-			<when time="[mo 02:00,mo 02:00)"><then preset="home"/></when>
 		</directives>
 		<contexts>
 			<context>