From 80529c7eae711af0d7fa3e08c032633ebdd16e6c Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Wed, 26 Jun 2024 23:16:49 +0200 Subject: [PATCH 1/5] add methods for heat pump cooling consumption --- PyViCare/PyViCareHeatPump.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/PyViCare/PyViCareHeatPump.py b/PyViCare/PyViCareHeatPump.py index 72079634..75ae4659 100644 --- a/PyViCare/PyViCareHeatPump.py +++ b/PyViCare/PyViCareHeatPump.py @@ -55,6 +55,23 @@ def getPowerSummaryConsumptionHeatingLastSevenDays(self): def getPowerSummaryConsumptionHeatingLastYear(self): return self.service.getProperty("heating.power.consumption.summary.heating")["properties"]["lastYear"]["value"] + # Power consumption for Cooling: + @handleNotSupported + def getPowerConsumptionCoolingUnit(self): + return self.service.getProperty("heating.power.consumption.cooling")["properties"]["day"]["unit"] + + @handleNotSupported + def getPowerConsumptionCoolingCurrentDay(self): + return self.service.getProperty("heating.power.consumption.cooling")["properties"]["day"]["value"][0] + + @handleNotSupported + def getPowerConsumptionCoolingCurrentMonth(self): + return self.service.getProperty("heating.power.consumption.cooling")["properties"]["month"]["value"][0] + + @handleNotSupported + def getPowerConsumptionCoolingCurrentYear(self): + return self.service.getProperty("heating.power.consumption.cooling")["properties"]["year"]["value"][0] + @handleNotSupported def getPowerConsumptionUnit(self): return self.service.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"] From 890ef17a952acab86342b67f4e8d906995fd7ebe Mon Sep 17 00:00:00 2001 From: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Date: Wed, 25 Sep 2024 11:45:21 +0200 Subject: [PATCH 2/5] Update test_TestForMissingProperties.py --- tests/test_TestForMissingProperties.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_TestForMissingProperties.py b/tests/test_TestForMissingProperties.py index 1c484733..21279a2f 100644 --- a/tests/test_TestForMissingProperties.py +++ b/tests/test_TestForMissingProperties.py @@ -58,8 +58,6 @@ def test_missingProperties(self): 'heating.configuration.dhw.temperature.dhwCylinder.max', # TODO: to analyse, from Vitocal 333G - 'heating.power.consumption.cooling', # TODO: to analyse, from Vitocal 151A - 'heating.buffer.sensors.temperature.main', # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated 'heating.buffer.sensors.temperature.top', # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated 'heating.dhw.sensors.temperature.hotWaterStorage', # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated From 089ccfdc25b8fd293968a9a3e7e49419d05c3d23 Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Wed, 25 Sep 2024 11:52:45 +0200 Subject: [PATCH 3/5] add test case --- tests/test_Vitocal151A.py | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 tests/test_Vitocal151A.py diff --git a/tests/test_Vitocal151A.py b/tests/test_Vitocal151A.py new file mode 100644 index 00000000..e22190fd --- /dev/null +++ b/tests/test_Vitocal151A.py @@ -0,0 +1,18 @@ +import unittest + +from PyViCare.PyViCareHeatPump import HeatPump +from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError +from tests.helper import now_is +from tests.ViCareServiceMock import ViCareServiceMock + + +class Vitocal200(unittest.TestCase): + def setUp(self): + self.service = ViCareServiceMock('response/Vitocal151A.json') + self.device = HeatPump(self.service) + + def test_getPowerConsumptionCooling(self): + self.assertEqual(self.device.getPowerConsumptionCoolingUnit(), "kilowattHour") + self.assertEqual(self.device.getPowerConsumptionCoolingCurrentDay(), 0) + self.assertEqual(self.device.getPowerConsumptionCoolingCurrentMonth(), 0.1) + self.assertEqual(self.device.getPowerConsumptionCoolingCurrentYear(), 0.1) From 2cb29f11b9452a6565c132b176aa639648338ff6 Mon Sep 17 00:00:00 2001 From: Christopher Fenner <9592452+CFenner@users.noreply.github.com> Date: Wed, 25 Sep 2024 12:26:50 +0200 Subject: [PATCH 4/5] Update test_Vitocal151A.py --- tests/test_Vitocal151A.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/test_Vitocal151A.py b/tests/test_Vitocal151A.py index e22190fd..fe49d50f 100644 --- a/tests/test_Vitocal151A.py +++ b/tests/test_Vitocal151A.py @@ -1,8 +1,6 @@ import unittest from PyViCare.PyViCareHeatPump import HeatPump -from PyViCare.PyViCareUtils import PyViCareNotSupportedFeatureError -from tests.helper import now_is from tests.ViCareServiceMock import ViCareServiceMock From 1d73c2ffc6ee2e50f8e09d27ea712e7b624715a7 Mon Sep 17 00:00:00 2001 From: Christopher Fenner Date: Thu, 26 Sep 2024 10:54:32 +0200 Subject: [PATCH 5/5] change naming --- PyViCare/PyViCareHeatPump.py | 6 +++--- tests/test_Vitocal151A.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/PyViCare/PyViCareHeatPump.py b/PyViCare/PyViCareHeatPump.py index fe23b3a4..800b4758 100644 --- a/PyViCare/PyViCareHeatPump.py +++ b/PyViCare/PyViCareHeatPump.py @@ -62,15 +62,15 @@ def getPowerConsumptionCoolingUnit(self): return self.service.getProperty("heating.power.consumption.cooling")["properties"]["day"]["unit"] @handleNotSupported - def getPowerConsumptionCoolingCurrentDay(self): + def getPowerConsumptionCoolingToday(self): return self.service.getProperty("heating.power.consumption.cooling")["properties"]["day"]["value"][0] @handleNotSupported - def getPowerConsumptionCoolingCurrentMonth(self): + def getPowerConsumptionCoolingThisMonth(self): return self.service.getProperty("heating.power.consumption.cooling")["properties"]["month"]["value"][0] @handleNotSupported - def getPowerConsumptionCoolingCurrentYear(self): + def getPowerConsumptionCoolingThisYear(self): return self.service.getProperty("heating.power.consumption.cooling")["properties"]["year"]["value"][0] @handleNotSupported diff --git a/tests/test_Vitocal151A.py b/tests/test_Vitocal151A.py index fe49d50f..512b139c 100644 --- a/tests/test_Vitocal151A.py +++ b/tests/test_Vitocal151A.py @@ -11,6 +11,6 @@ def setUp(self): def test_getPowerConsumptionCooling(self): self.assertEqual(self.device.getPowerConsumptionCoolingUnit(), "kilowattHour") - self.assertEqual(self.device.getPowerConsumptionCoolingCurrentDay(), 0) - self.assertEqual(self.device.getPowerConsumptionCoolingCurrentMonth(), 0.1) - self.assertEqual(self.device.getPowerConsumptionCoolingCurrentYear(), 0.1) + self.assertEqual(self.device.getPowerConsumptionCoolingToday(), 0) + self.assertEqual(self.device.getPowerConsumptionCoolingThisMonth(), 0.1) + self.assertEqual(self.device.getPowerConsumptionCoolingThisYear(), 0.1)