Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8be56ae
Adding sensors for heating.power.consumption.dhw, heating.power.consu…
tescnovonesis Nov 18, 2025
26ba9d5
Adding test response file for Vitocal252A
tescnovonesis Nov 19, 2025
adf6bfb
Sorted Vitocal252A.json with jq, according to README
tescnovonesis Nov 19, 2025
2f60fff
Implementing initial tests for Vitocal252A. Copied from Vitocal250A a…
tescnovonesis Nov 19, 2025
8725f4d
Implemented test for Power Consumption Heating
tescnovonesis Nov 19, 2025
acf9a62
Implemented tests for Total power consumption
tescnovonesis Nov 19, 2025
1b79f67
Adding test for Power consumption for Domestic Hot Water
tescnovonesis Nov 19, 2025
43f9fd8
Merge branch 'master' into core_issue_155695
tescnovonesis Nov 19, 2025
f51e092
Align naming on tests
tescnovonesis Nov 19, 2025
b00e90d
Update of test for Vitocal252A, after ViCare API had Maintenance wind…
tescnovonesis Nov 19, 2025
94b50e7
Adding missing Properties for tests. Marked under '# heating - not ye…
tescnovonesis Nov 19, 2025
9b4fc8e
Adding sensors to GazBoiler
tescnovonesis Nov 20, 2025
850912d
Adding another test for GazBoiler
tescnovonesis Nov 20, 2025
4a42e62
Fix for some GazBoilers have unit in another dict
tescnovonesis Nov 20, 2025
e4a9e43
Added additional test for FuelCell
tescnovonesis Nov 20, 2025
b30d661
Adding sensors to fuelcell
tescnovonesis Nov 20, 2025
902e602
adding extra test for Gaz boiler
tescnovonesis Nov 20, 2025
a42c7f5
Adding additional tests
tescnovonesis Nov 20, 2025
ca7b995
Update PyViCare/PyViCareHeatPump.py
tlinnet Nov 21, 2025
8f3f8ab
Renaming getPowerConsumptionHeatingYear to getPowerConsumptionHeating…
tescnovonesis Nov 21, 2025
25aeb6f
Fix for missing return, after implementation of fetching Unit of kilo…
tescnovonesis Nov 21, 2025
8e76b0e
Renamed getPowerConsumptionDomesticHotWaterYear to getPowerConsumptio…
tescnovonesis Nov 21, 2025
497379e
Merge branch 'master' into core_issue_155695
tlinnet Nov 22, 2025
0982c91
pylint Fix C0304: Final newline missing (missing-final-newline) in te…
tescnovonesis Nov 26, 2025
513402b
pylint Fix C0303: Trailing whitespace (trailing-whitespace) in test_V…
tescnovonesis Nov 26, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions PyViCare/PyViCareFuelCell.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]
Expand Down
47 changes: 46 additions & 1 deletion PyViCare/PyViCareGazBoiler.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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"]
Expand Down Expand Up @@ -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"]

Expand Down Expand Up @@ -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"]

Expand Down
41 changes: 40 additions & 1 deletion PyViCare/PyViCareHeatPump.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

Expand Down Expand Up @@ -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"]
Expand All @@ -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"]
Expand Down
Loading
Loading