Merge pull request #248 from plugwise/max_b_temp_bug

Improve, bugfix

Author: bouwew

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+# v0.25.14: Improve, bugfix
+- Anna+Elga: final solution for https://github.com/plugwise/plugwise-beta/issues/320
+- Related to https://github.com/home-assistant/core/issues/83068: handle actuator_functionality or sensor depending on which one is present
+
 # 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

plugwise/__init__.py

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

plugwise/constants.py

@@ -477,7 +477,8 @@
 HEATER_CENTRAL_MEASUREMENTS: Final[dict[str, DATA | UOM]] = {
     "boiler_temperature": DATA("water_temperature", TEMP_CELSIUS),
     "domestic_hot_water_mode": DATA("dhw_mode", NONE),
-    "domestic_hot_water_state": DATA("dhw_state", TEMP_CELSIUS),
+    "domestic_hot_water_setpoint": UOM(TEMP_CELSIUS),
+    "domestic_hot_water_state": DATA("dhw_state", NONE),
     "domestic_hot_water_temperature": DATA("dhw_temperature", TEMP_CELSIUS),
     "elga_status_code": UOM(NONE),
     "intended_boiler_temperature": UOM(
@@ -547,6 +548,7 @@
     "cooling_activation_outdoor_temperature",
     "cooling_deactivation_threshold",
     "dhw_temperature",
+    "domestic_hot_water_setpoint",
     "temperature",
     "electricity_consumed",
     "electricity_consumed_interval",
@@ -571,6 +573,7 @@
     "humidity",
     "illuminance",
     "intended_boiler_temperature",
+    "maximum_boiler_temperature",
     "modulation_level",
     "net_electricity_cumulative",
     "net_electricity_point",
@@ -758,7 +761,8 @@ class DeviceData(ApplianceData, DeviceDataPoints, TypedDict, total=False):
     """The Device Data class, covering the collected and ordere output-data per device."""
 
     binary_sensors: SmileBinarySensors
-    domestic_hot_water_setpoint: ActuatorData
+    domestic_hot_water_setpoint: ActuatorData | float
+    maximum_boiler_temperature: ActuatorData | float
     sensors: SmileSensors
     switches: SmileSwitches
     thermostat: ActuatorData

plugwise/helper.py

@@ -975,6 +975,12 @@ def _get_appliance_data(self, d_id: str) -> DeviceData:
                 self.smile_name in ("Adam", "Smile Anna") and self._on_off_device
             ):
                 data["heating_state"] = data["c_heating_state"]
+                # Heating is not active when intended_boiler_temperature is 0
+                if (
+                    "intended_boiler_temperature" in data
+                    and data["intended_boiler_temperature"] == 0
+                ):
+                    data["heating_state"] = False
                 # 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:
@@ -1422,7 +1428,8 @@ def _update_device_with_dicts(
                     if self._opentherm_device or self._on_off_device:
                         bs_dict[key] = value  # type: ignore[literal-required]
             for item in SENSORS:
-                if item == key:
+                # Filter for actuator_functionalities, they are not sensors
+                if item == key and not isinstance(value, dict):
                     data.pop(key)  # type: ignore [misc]
                     s_dict[key] = value  # type: ignore[literal-required]
             for item in SWITCHES:

tests/test_smile.py

@@ -3726,8 +3726,9 @@ async def test_connect_anna_heatpump_heating(self):
                 },
                 "sensors": {
                     "water_temperature": 29.1,
+                    "domestic_hot_water_setpoint": 60.0,
                     "dhw_temperature": 46.3,
-                    "intended_boiler_temperature": 0.0,
+                    "intended_boiler_temperature": 35.0,
                     "modulation_level": 52,
                     "return_temperature": 25.1,
                     "water_pressure": 1.57,
@@ -3791,7 +3792,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         await self.device_test(smile, testdata)
         assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
-        assert self.device_items == 56
+        assert self.device_items == 57
         assert not self.cooling_present
         assert not self.notifications
 
@@ -3854,6 +3855,7 @@ async def test_connect_anna_heatpump_cooling(self):
                 },
                 "sensors": {
                     "water_temperature": 24.7,
+                    "domestic_hot_water_setpoint": 60.0,
                     "intended_boiler_temperature": 0.0,
                     "modulation_level": 40,
                     "return_temperature": 23.8,
@@ -3907,7 +3909,7 @@ async def test_connect_anna_heatpump_cooling(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 58
+        assert self.device_items == 59
         assert self.cooling_present
         assert not self.notifications
 
@@ -3966,7 +3968,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 == 59
+        assert self.device_items == 60
         assert smile._cooling_present
         assert smile._cooling_enabled
         assert smile._cooling_active
@@ -4067,6 +4069,7 @@ async def test_connect_anna_elga_2(self):
                 },
                 "sensors": {
                     "water_temperature": 22.8,
+                    "domestic_hot_water_setpoint": 60.0,
                     "intended_boiler_temperature": 0.0,
                     "modulation_level": 0.0,
                     "return_temperature": 23.4,
@@ -4102,7 +4105,7 @@ async def test_connect_anna_elga_2(self):
         assert not smile._smile_legacy
 
         await self.device_test(smile, testdata)
-        assert self.device_items == 57
+        assert self.device_items == 58
         assert smile.gateway_id == "fb49af122f6e4b0f91267e1cf7666d6f"
         assert self.cooling_present
         assert not self.notifications
@@ -4154,7 +4157,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 == 57
+        assert self.device_items == 58
 
         await smile.close_connection()
         await self.disconnect(server, client)
@@ -4221,6 +4224,7 @@ async def test_connect_anna_elga_2_cooling(self):
                 },
                 "sensors": {
                     "water_temperature": 22.8,
+                    "domestic_hot_water_setpoint": 60.0,
                     "intended_boiler_temperature": 0.0,
                     "modulation_level": 0.0,
                     "return_temperature": 23.4,
@@ -4256,7 +4260,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 == 58
+        assert self.device_items == 59
         assert self.cooling_present
         assert not self.notifications
 

userdata/adam_onoff_cooling_fake_firmware/core.appliances.xml

@@ -28,7 +28,7 @@
 				<interval/>
 				<thermo_meter id='a98b220b5a7e4834ae0fbcb949caa7b8'/>
 				<period start_date="2021-12-31T13:36:00.350+01:00" end_date="2021-12-31T13:36:00.350+01:00">
-					<measurement log_date="2021-12-31T13:36:00.350+01:00">0.00</measurement>
+					<measurement log_date="2021-12-31T13:36:00.350+01:00">35.00</measurement>
 				</period>
 			</point_log>
 			<point_log id='0ffcb99c5efe4b26bc2fe33232be4bb2'>

userdata/anna_heatpump_heating/core.appliances.xml

@@ -302,7 +302,7 @@
 				<unit>C</unit>
 				<last_consecutive_log_date>2020-04-03T07:54:47.729+02:00</last_consecutive_log_date>
 				<period start_date="2020-04-08T19:24:39.363+02:00" end_date="2020-04-08T19:24:39.363+02:00">
-					<measurement log_date="2020-04-08T19:24:39.363+02:00">0.00</measurement>
+					<measurement log_date="2020-04-08T19:24:39.363+02:00">35.00</measurement>
 				</period>
 				<thermo_meter id='6a3b56382ef04a2db54c35c349a6521f'/>
 			</point_log>