Merge pull request #227 from plugwise/0_25_1

Remove sensor-keys from output for systems with cooling

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,7 @@
 # Changelog
 
+# v0.25.1: Remove sensor-keys from output when cooling is present
+
 # v0.25.0: Improve compatibility with HA Core climate platform
 - Change mode cool to heat_cool
 - Add setpoint_high/setpoint_low to output

plugwise/__init__.py

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

plugwise/smile.py

@@ -87,23 +87,19 @@ def update_for_cooling(self, devices: dict[str, DeviceData]) -> None:
                     min_setpoint = self._sched_setpoints[0]
 
                 temp_dict: ActuatorData = {
-                    "setpoint": thermostat["setpoint"],
                     "setpoint_low": thermostat["setpoint"],
                     "setpoint_high": max_setpoint,
                 }
                 if self._cooling_active:
                     temp_dict = {
-                        "setpoint": thermostat["setpoint"],
                         "setpoint_low": min_setpoint,
                         "setpoint_high": thermostat["setpoint"],
                     }
-                # Keep setpoint in sensors, remove when appropriate
-                # if "setpoint" in sensors:
-                #     sensors.pop("setpoint")
+                if "setpoint" in sensors:
+                    sensors.pop("setpoint")
                 sensors["setpoint_low"] = temp_dict["setpoint_low"]
                 sensors["setpoint_high"] = temp_dict["setpoint_high"]
-                # Keep setpoint in output, remove when appropriate
-                # thermostat.pop("setpoint")
+                thermostat.pop("setpoint")
                 temp_dict.update(thermostat)
                 device["thermostat"] = temp_dict
 

tests/test_smile.py

@@ -3257,7 +3257,7 @@ async def test_adam_heatpump_cooling(self):
         server, smile, client = await self.connect_wrapper()
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 428
+        assert self.device_items == 408
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -3802,7 +3802,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         await self.device_test(smile, testdata)
         assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
-        assert self.device_items == 61
+        assert self.device_items == 59
         assert self.cooling_present
         assert not self.notifications
 
@@ -3918,7 +3918,7 @@ async def test_connect_anna_heatpump_cooling(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 60
+        assert self.device_items == 59
         assert self.cooling_present
         assert not self.notifications
 
@@ -3976,7 +3976,7 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
         assert smile.smile_version[0] == "4.10.10"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 62
+        assert self.device_items == 60
         assert smile._cooling_present
         assert smile._cooling_enabled
         assert smile._cooling_active
@@ -4010,7 +4010,7 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
         assert smile.smile_type == "thermostat"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 60
+        assert self.device_items == 58
         assert smile._cooling_present
         assert smile._cooling_enabled
 
@@ -4113,7 +4113,7 @@ async def test_connect_anna_elga_2(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 60
+        assert self.device_items == 58
         assert smile.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
         assert self.cooling_present
         assert not self.notifications
@@ -4166,7 +4166,7 @@ async def test_connect_anna_elga_2_schedule_off(self):
 
         await self.device_test(smile, testdata)
         assert smile._cooling_present
-        assert self.device_items == 60
+        assert self.device_items == 58
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -4268,7 +4268,7 @@ async def test_connect_anna_elga_2_cooling(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 60
+        assert self.device_items == 58
         assert self.cooling_present
         assert not self.notifications
 
@@ -4371,7 +4371,7 @@ async def test_connect_anna_loria_heating_idle(self):
         assert smile.smile_type == "thermostat"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 63
+        assert self.device_items == 61
         assert smile._cooling_present
         assert not smile._cooling_enabled
 
@@ -4480,7 +4480,7 @@ async def test_connect_anna_loria_cooling_active(self):
         assert smile.smile_type == "thermostat"
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 63
+        assert self.device_items == 61
         assert smile._cooling_present
         assert smile._cooling_enabled
 

userdata/anna_heatpump_cooling/core.appliances.xml

@@ -994,7 +994,7 @@
 		<description>A thermostat</description>
 		<type>thermostat</type>
 		<created_date>2019-01-31T12:00:40.511+01:00</created_date>
-		<modified_date>2020-04-16T17:28:58.122+02:00</modified_date>
+		<modified_date>2020-04-16T17:19:58.122+02:00</modified_date>
 		<deleted_date></deleted_date>
 		<location id='c784ee9fdab44e1395b8dee7d7a497d5'/>
 		<groups/>