Merge pull request #144 from plugwise/hide_cooling

Show cooling_state only when cooling is present

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.16.6 - Smile
+  - Provide cooling_state and heating_state as `binary_sensors`, show cooling_state only when cooling is present
+  - Clean up gw_data, e.g. remove `single_master_thermostat` key
+
 # v0.16.5 - Smile: small improvements
   - Move schedule debug-message to the correct position
   - Code quality fixes

plugwise/__init__.py

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

plugwise/smile.py

@@ -105,6 +105,15 @@ def get_all_devices(self) -> None:
         # Collect data for each device via helper function
         self._all_device_data()
 
+        # Don't show cooling_state when no cooling present
+        for _, device in self.gw_devices.items():
+            if (
+                not self._cooling_present
+                and "binary_sensors" in device
+                and "cooling_state" in device["binary_sensors"]
+            ):
+                device["binary_sensors"].pop("cooling_state")
+
     def _device_data_switching_group(
         self, details: dict[str, Any], device_data: dict[str, Any]
     ) -> dict[str, bool]:
@@ -209,7 +218,7 @@ def _get_device_data(self, dev_id: str) -> dict[str, Any]:
 
         # Adam: indicate active heating/cooling operation-mode
         # Actual ongoing heating/cooling is shown via heating_state/cooling_state
-        if details["class"] == "heater_central":
+        if details["class"] == "heater_central" and self._cooling_present:
             device_data["cooling_active"] = self.cooling_active
 
         # Switching groups data
@@ -482,7 +491,11 @@ async def async_update(self) -> dict[str, Any]:
                     )
 
         # Anna: update cooling_active to it's final value after all entities have been updated
-        if not self._smile_legacy and self.smile_name == "Anna":
+        if (
+            not self._smile_legacy
+            and self.smile_name == "Anna"
+            and self._cooling_present
+        ):
             self.gw_devices[self._heater_id]["cooling_active"] = self.cooling_active
 
         return [self.gw_data, self.gw_devices]

tests/test_smile.py

@@ -610,7 +610,6 @@ async def test_connect_legacy_anna(self):
                 "model": "4.21",
                 "name": "OpenTherm",
                 "vendor": "Bosch Thermotechniek B.V.",
-                "cooling_active": False,
                 "binary_sensors": {"flame_state": True, "heating_state": True},
                 "sensors": {
                     "water_temperature": 23.6,
@@ -711,7 +710,6 @@ async def test_connect_legacy_anna_2(self):
                 "model": "Generic heater",
                 "name": "OpenTherm",
                 "vendor": None,
-                "cooling_active": False,
                 "binary_sensors": {"flame_state": False, "heating_state": False},
                 "sensors": {
                     "water_temperature": 54.0,
@@ -893,7 +891,6 @@ async def test_connect_anna_v4(self):
                 "model": "2.32",
                 "name": "OpenTherm",
                 "vendor": "Bosch Thermotechniek B.V.",
-                "cooling_active": False,
                 "binary_sensors": {
                     "dhw_state": False,
                     "flame_state": True,
@@ -1105,7 +1102,6 @@ async def test_connect_anna_without_boiler_fw42(self):
                 "model": "Unknown",
                 "name": "OnOff",
                 "vendor": None,
-                "cooling_active": False,
                 "binary_sensors": {"heating_state": True},
             },
             # Anna
@@ -1384,9 +1380,7 @@ async def test_connect_adam_plus_anna_new(self):
                 "model": "Generic heater",
                 "name": "OpenTherm",
                 "vendor": None,
-                "cooling_active": False,
                 "binary_sensors": {
-                    "cooling_state": False,
                     "dhw_state": False,
                     "flame_state": False,
                     "heating_state": True,
@@ -1470,42 +1464,6 @@ async def test_connect_adam_plus_anna_new_copy_dhw_and_heating(self):
         await smile.close_connection()
         await self.disconnect(server, client)
 
-    @pytest.mark.asyncio
-    async def test_connect_adam_plus_anna_new_copy_cooling(self):
-        """Test Adam with Anna and cooling."""
-        testdata = {
-            # Central
-            "2743216f626f43948deec1f7ab3b3d70": {
-                "binary_sensors": {"cooling_state": True},
-            },
-        }
-
-        self.smile_setup = "adam_plus_anna_new_copy_cooling"
-        server, smile, client = await self.connect_wrapper()
-
-        await self.device_test(smile, testdata)
-
-        await smile.close_connection()
-        await self.disconnect(server, client)
-
-    @pytest.mark.asyncio
-    async def test_connect_adam_plus_anna_new_copy_dhw_and_cooling(self):
-        """Test Adam with Anna and cooling."""
-        testdata = {
-            # Central
-            "2743216f626f43948deec1f7ab3b3d70": {
-                "binary_sensors": {"cooling_state": True, "dhw_state": True},
-            }
-        }
-
-        self.smile_setup = "adam_plus_anna_new_copy_dhw_and_cooling"
-        server, smile, client = await self.connect_wrapper()
-
-        await self.device_test(smile, testdata)
-
-        await smile.close_connection()
-        await self.disconnect(server, client)
-
     @pytest.mark.asyncio
     async def test_connect_adam_zone_per_device(self):
         """Test a broad setup of Adam with a zone per device setup."""
@@ -1766,7 +1724,6 @@ async def test_connect_adam_multiple_devices_per_zone(self):
                 "model": "Unknown",
                 "name": "OnOff",
                 "vendor": None,
-                "cooling_active": False,
                 "binary_sensors": {"heating_state": True},
                 "sensors": {
                     "water_temperature": 70.0,