Add ATW boiler flow and mixing tank temps

Author: Vilppu Vuorinen

CHANGELOG.md

@@ -5,6 +5,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Added
+- Boiler flow and mixing tank temperatures for Atw devices.
+
 ### Changed
 - Increate ListDevices poll rate to match the sensor poll rates.
 

pymelcloud/atw_device.py

@@ -334,16 +334,12 @@ def apply_write(self, state: Dict[str, Any], key: str, value: Any):
     @property
     def tank_temperature(self) -> Optional[float]:
         """Return tank water temperature."""
-        if self._state is None:
-            return None
-        return self._state.get("TankWaterTemperature")
+        return self.get_state_prop("TankWaterTemperature")
 
     @property
     def target_tank_temperature(self) -> Optional[float]:
         """Return target tank water temperature."""
-        if self._state is None:
-            return None
-        return self._state.get("SetTankWaterTemperature")
+        return self.get_state_prop("SetTankWaterTemperature")
 
     @property
     def target_tank_temperature_min(self) -> Optional[float]:
@@ -360,8 +356,7 @@ def target_tank_temperature_max(self) -> Optional[float]:
 
         This value can be set using PROPERTY_TARGET_TANK_TEMPERATURE.
         """
-        device = self._device_conf.get("Device", {})
-        return device.get("MaxTankTemperature")
+        return self.get_device_prop("MaxTankTemperature")
 
     @property
     def outside_temperature(self) -> Optional[float]:
@@ -371,9 +366,22 @@ def outside_temperature(self) -> Optional[float]:
         rate. The value is reported using 1°C (2°F?) accuracy and updated every 2
         hours.
         """
-        if self._state is None:
-            return None
-        return self._state.get("OutdoorTemperature")
+        return self.get_state_prop("OutdoorTemperature")
+
+    @property
+    def flow_temperature_boiler(self) -> Optional[float]:
+        """Return flow temperature of the boiler."""
+        return self.get_device_prop("FlowTemperatureBoiler")
+
+    @property
+    def return_temperature_boiler(self) -> Optional[float]:
+        """Return flow temperature of the boiler."""
+        return self.get_device_prop("FlowTemperatureBoiler")
+
+    @property
+    def mixing_tank_temperature(self) -> Optional[float]:
+        """Return mixing tank temperature."""
+        return self.get_device_prop("MixingTankWaterTemperature")
 
     @property
     def zones(self) -> Optional[List[Zone]]:

pymelcloud/device.py

@@ -49,6 +49,17 @@ def __init__(
         self._write_task: Optional[asyncio.Future[None]] = None
         self._pending_writes: Dict[str, Any] = {}
 
+    def get_device_prop(self, name: str) -> Optional[Any]:
+        """Access device properties while shortcutting the nested device access."""
+        device = self._device_conf.get("Device", {})
+        return device.get(name)
+
+    def get_state_prop(self, name: str) -> Optional[Any]:
+        """Access state prop without None check."""
+        if self._state is None:
+            return None
+        return self._state.get(name)
+
     @abstractmethod
     def apply_write(self, state: Dict[str, Any], key: str, value: Any):
         """Apply writes to state object.

tests/test_atw_properties.py

@@ -59,6 +59,9 @@ async def test_1zone():
     assert device.target_tank_temperature is None
     assert device.target_tank_temperature_min == 40
     assert device.target_tank_temperature_max == 60
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature == 0
     assert device.holiday_mode is None
     assert device.wifi_signal == -73
     assert device.has_error is False
@@ -88,6 +91,9 @@ async def test_1zone():
     assert device.status == STATUS_HEAT_ZONES
     assert device.tank_temperature == 52.0
     assert device.target_tank_temperature == 50.0
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature == 0
     assert device.holiday_mode is False
     assert device.wifi_signal == -73
     assert device.has_error is False
@@ -123,6 +129,9 @@ async def test_2zone():
     assert device.target_tank_temperature is None
     assert device.target_tank_temperature_min == 40
     assert device.target_tank_temperature_max == 60
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature == 0
     assert device.holiday_mode is None
     assert device.wifi_signal == -37
     assert device.has_error is False
@@ -167,6 +176,9 @@ async def test_2zone():
     assert device.status == STATUS_HEAT_ZONES
     assert device.tank_temperature == 49.5
     assert device.target_tank_temperature == 50.0
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature == 0
     assert device.holiday_mode is False
     assert device.wifi_signal == -37
     assert device.has_error is False
@@ -215,6 +227,9 @@ async def test_2zone_cancool():
     assert device.target_tank_temperature is None
     assert device.target_tank_temperature_min == 40
     assert device.target_tank_temperature_max == 60
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature is None
     assert device.holiday_mode is None
     assert device.wifi_signal == -82
     assert device.has_error is False
@@ -263,6 +278,9 @@ async def test_2zone_cancool():
     assert device.status == STATUS_HEAT_WATER
     assert device.tank_temperature == 47.5
     assert device.target_tank_temperature == 52.0
+    assert device.flow_temperature_boiler == 25
+    assert device.return_temperature_boiler == 25
+    assert device.mixing_tank_temperature is None
     assert device.holiday_mode is False
     assert device.wifi_signal == -82
     assert device.has_error is False