Merge pull request #346 from plugwise/add_dhw_setpoint

Add domestic_hot_water_setpoint data to anna_heatpump_heating userdata, update relevant test-cases

Author: bouwew

CHANGELOG.md

@@ -4,6 +4,7 @@
 
 - Repair coverage/fix testing - #294
 - Correct non-unique device names in adam_jip userdata
+- Add domestic_hot_water_setpoint data to anna_heatpump_heating userdata, update relevant test-cases
 
 ## V0.31.6: Fix domestic_hot_water_setpoint-related bug for Anna + Elga
 

fixtures/anna_heatpump_heating/all_data.json

@@ -28,6 +28,12 @@
       },
       "dev_class": "heater_central",
       "location": "a57efe5f145f498c9be62a9b63626fbf",
+      "max_dhw_temperature": {
+        "lower_bound": 35.0,
+        "resolution": 0.01,
+        "setpoint": 53.0,
+        "upper_bound": 60.0
+      },
       "maximum_boiler_temperature": {
         "lower_bound": 0.0,
         "resolution": 1.0,
@@ -38,7 +44,6 @@
       "name": "OpenTherm",
       "sensors": {
         "dhw_temperature": 46.3,
-        "domestic_hot_water_setpoint": 60.0,
         "intended_boiler_temperature": 35.0,
         "modulation_level": 52,
         "outdoor_air_temperature": 3.0,

fixtures/m_anna_heatpump_cooling/all_data.json

@@ -29,6 +29,12 @@
       },
       "dev_class": "heater_central",
       "location": "a57efe5f145f498c9be62a9b63626fbf",
+      "max_dhw_temperature": {
+        "lower_bound": 35.0,
+        "resolution": 0.01,
+        "setpoint": 53.0,
+        "upper_bound": 60.0
+      },
       "maximum_boiler_temperature": {
         "lower_bound": 0.0,
         "resolution": 1.0,
@@ -39,7 +45,6 @@
       "name": "OpenTherm",
       "sensors": {
         "dhw_temperature": 41.5,
-        "domestic_hot_water_setpoint": 60.0,
         "intended_boiler_temperature": 0.0,
         "modulation_level": 40,
         "outdoor_air_temperature": 28.0,

fixtures/m_anna_heatpump_idle/all_data.json

@@ -29,6 +29,12 @@
       },
       "dev_class": "heater_central",
       "location": "a57efe5f145f498c9be62a9b63626fbf",
+      "max_dhw_temperature": {
+        "lower_bound": 35.0,
+        "resolution": 0.01,
+        "setpoint": 53.0,
+        "upper_bound": 60.0
+      },
       "maximum_boiler_temperature": {
         "lower_bound": 0.0,
         "resolution": 1.0,
@@ -39,7 +45,6 @@
       "name": "OpenTherm",
       "sensors": {
         "dhw_temperature": 46.3,
-        "domestic_hot_water_setpoint": 60.0,
         "intended_boiler_temperature": 18.0,
         "modulation_level": 0,
         "outdoor_air_temperature": 28.2,

tests/test_smile.py

@@ -434,7 +434,7 @@ async def device_test(self, smile=pw_smile.Smile, testdata=None):
                         tests += 1
                         if (
                             measure_key in bsw_list
-                            or measure_key in pw_constants.ACTUATOR_CLASSES
+                            or measure_key in pw_constants.ACTIVE_ACTUATORS
                         ):
                             tests -= 1
                             for key_1, val_1 in measure_assert.items():
@@ -3721,6 +3721,12 @@ async def test_connect_anna_heatpump_heating(self):
                     "upper_bound": 100.0,
                     "resolution": 1.0,
                 },
+                "max_dhw_temperature": {
+                    "setpoint": 53.0,
+                    "lower_bound": 35.0,
+                    "upper_bound": 60.0,
+                    "resolution": 0.01,
+                },
                 "available": True,
                 "binary_sensors": {
                     "dhw_state": False,
@@ -3732,7 +3738,6 @@ 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": 35.0,
                     "modulation_level": 52,
@@ -3798,7 +3803,7 @@ async def test_connect_anna_heatpump_heating(self):
 
         await self.device_test(smile, testdata)
         assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
-        assert self.device_items == 57
+        assert self.device_items == 60
         assert not self.cooling_present
         assert not self.notifications
 

userdata/anna_heatpump_heating/core.appliances.xml

@@ -806,6 +806,16 @@
 				<regulations/>
 				<thermostat id='5e49f223e7224c3f93552db2c63881f6'/>
 			</thermostat_functionality>
+			<thermostat_functionality id='d9455c3ba0b0412cb264b8b33f4e3849'>
+				<updated_date>2020-04-08T19:24:38.964+02:00</updated_date>
+				<type>domestic_hot_water_setpoint</type>
+				<setpoint>53</setpoint>
+				<lower_bound>35</lower_bound>
+				<upper_bound>60</upper_bound>
+				<resolution>0.01</resolution>
+				<regulations/>
+				<thermostat id='5e49f223e7224c3f93552db2c63881f6'/>
+			</thermostat_functionality>
 			<timer_functionality id='a047871b00c14c0aa20a5f3c70c1f307'>
 				<timer id='18ac9fc3cc31465c973769dfdbdddfb0'/>
 				<updated_date>2020-04-09T13:25:35.254+02:00</updated_date>