feat: expose power consumption for heating, dhw and total

PyViCare/PyViCareFuelCell.py

@@ -23,6 +23,7 @@ def getAvailableBurners(self):
     def getReturnTemperature(self):
         return self.getProperty("heating.sensors.temperature.return")["properties"]["value"]["value"]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
@@ -59,6 +60,7 @@ def getPowerConsumptionYears(self):
     def getPowerConsumptionThisYear(self):
         return self.getProperty('heating.power.consumption.total')['properties']['year']['value'][0]
 
+    # Power consumption for Heating:
     @handleNotSupported
     def getPowerConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
@@ -95,6 +97,24 @@ def getPowerConsumptionHeatingYears(self):
     def getPowerConsumptionHeatingThisYear(self):
         return self.getProperty('heating.power.consumption.heating')['properties']['year']['value'][0]
 
+    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterToday(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Gas consumption:
     @handleNotSupported
     def getGasConsumptionUnit(self):
         return self.getProperty("heating.gas.consumption.total")["properties"]["day"]["unit"]

PyViCare/PyViCareGazBoiler.py

@@ -103,9 +103,13 @@ def getBoilerTargetTemperature(self):
     def getDomesticHotWaterChargingLevel(self):
         return self.getProperty("heating.dhw.charging.level")["properties"]["value"]["value"]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
-        return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
+        try :
+            return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.total")["properties"]["unit"]["value"]
 
     @handleNotSupported
     def getPowerConsumptionDays(self):
@@ -139,6 +143,7 @@ def getPowerConsumptionYears(self):
     def getPowerConsumptionThisYear(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["year"]["value"][0]
 
+    # Flow
     @handleNotSupported
     def getVolumetricFlowReturn(self):
         return self.getProperty("heating.sensors.volumetricFlow.allengra")["properties"]["value"]["value"]
@@ -204,6 +209,26 @@ def getGasSummaryConsumptionDomesticHotWaterLastYear(self):
 
     # Power consumption for Heating:
     @handleNotSupported
+    def getPowerConsumptionHeatingUnit(self):
+        try:
+            return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.heating")["properties"]["unit"]["value"]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingToday(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisMonth(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisYear(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Heating:
+    @handleNotSupported
     def getPowerSummaryConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.summary.heating")["properties"]["currentDay"]["unit"]
 
@@ -233,6 +258,26 @@ def getPowerSummaryConsumptionHeatingLastYear(self):
 
     # Power consumption for Domestic Hot Water:
     @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        try:
+            return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+        except KeyError:
+            return self.getProperty("heating.power.consumption.dhw")["properties"]["unit"]["value"]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterToday(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Domestic Hot Water:
+    @handleNotSupported
     def getPowerSummaryConsumptionDomesticHotWaterUnit(self):
         return self.getProperty("heating.power.consumption.summary.dhw")["properties"]["currentDay"]["unit"]
 

PyViCare/PyViCareHeatPump.py

@@ -51,6 +51,23 @@ def getBufferTopTemperature(self):
 
     # Power consumption for Heating:
     @handleNotSupported
+    def getPowerConsumptionHeatingUnit(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["unit"]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingToday(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["day"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisMonth(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionHeatingThisYear(self):
+        return self.getProperty("heating.power.consumption.heating")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Heating:
+    @handleNotSupported
     def getPowerSummaryConsumptionHeatingUnit(self):
         return self.getProperty("heating.power.consumption.summary.heating")["properties"]["currentDay"]["unit"]
 
@@ -95,6 +112,7 @@ def getPowerConsumptionCoolingThisMonth(self):
     def getPowerConsumptionCoolingThisYear(self):
         return self.getProperty("heating.power.consumption.cooling")["properties"]["year"]["value"][0]
 
+    # Total power consumption:
     @handleNotSupported
     def getPowerConsumptionUnit(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["unit"]
@@ -103,11 +121,32 @@ def getPowerConsumptionUnit(self):
     def getPowerConsumptionToday(self):
         return self.getProperty("heating.power.consumption.total")["properties"]["day"]["value"][0]
 
+    @handleNotSupported
+    def getPowerConsumptionThisMonth(self):
+        return self.getProperty("heating.power.consumption.total")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionThisYear(self):
+        return self.getProperty("heating.power.consumption.total")["properties"]["year"]["value"][0]
+
+    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterUnit(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["unit"]
+
     @handleNotSupported
     def getPowerConsumptionDomesticHotWaterToday(self):
         return self.getProperty("heating.power.consumption.dhw")["properties"]["day"]["value"][0]
 
-    # Power consumption for Domestic Hot Water:
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisMonth(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["month"]["value"][0]
+
+    @handleNotSupported
+    def getPowerConsumptionDomesticHotWaterThisYear(self):
+        return self.getProperty("heating.power.consumption.dhw")["properties"]["year"]["value"][0]
+
+    # Power summary consumption for Domestic Hot Water:
     @handleNotSupported
     def getPowerSummaryConsumptionDomesticHotWaterUnit(self):
         return self.getProperty("heating.power.consumption.summary.dhw")["properties"]["currentDay"]["unit"]