PyViCare 2.42.0__tar.gz → 2.43.0__tar.gz

{pyvicare-2.42.0 → pyvicare-2.43.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: PyViCare
-Version: 2.42.0
+Version: 2.43.0
 Summary: Library to communicate with the Viessmann ViCare API.
 License: Apache-2.0
 Keywords: viessmann,vicare,api

pyvicare-2.43.0/PyViCare/PyViCarePelletsBoiler.py

@@ -0,0 +1,108 @@
+from __future__ import annotations
+from typing import List
+
+from PyViCare.PyViCareHeatingDevice import (HeatingDevice, HeatingDeviceWithComponent, get_available_burners)
+from PyViCare.PyViCareUtils import handleNotSupported
+
+
+class PelletsBoiler(HeatingDevice):
+
+    @property
+    def burners(self) -> List[PelletsBurner]:
+        return list([self.getBurner(x) for x in self.getAvailableBurners()])
+
+    def getBurner(self, burner) -> PelletsBurner:
+        return PelletsBurner(self, burner)
+
+    @handleNotSupported
+    def getAvailableBurners(self):
+        return get_available_burners(self.service)
+
+    @handleNotSupported
+    def getBoilerTemperature(self):
+        return self.service.getProperty("heating.boiler.sensors.temperature.main")["properties"]["value"]["value"]
+
+    @handleNotSupported
+    def getAshLevel(self):
+        return self.service.getProperty('heating.boiler.ash.level.current')['properties']['value']['value']
+
+    @handleNotSupported
+    def getAirFlapsPrimaryPosition(self):
+        return self.service.getProperty('heating.boiler.airflaps.0.position.current')['properties']['value']['value']
+
+    @handleNotSupported
+    def getAirFlapsSecondaryPosition(self):
+        return self.service.getProperty('heating.boiler.airflaps.1.position.current')['properties']['value']['value']
+
+    @handleNotSupported
+    def getExhaustO2Level(self):
+        return self.service.getProperty('heating.flue.sensors.o2.lambda')['properties']['value']['value']
+
+    @handleNotSupported
+    def getBoilerCuircuitPumpCurrentLevel(self):
+        return self.service.getProperty('heating.boiler.pumps.circuit.power.current')['properties']['value']['value']
+
+    @handleNotSupported
+    def getBoilerReturnTemperature(self):
+        return self.service.getProperty('heating.sensors.temperature.return')['properties']['value']['value']
+
+    @handleNotSupported
+    def getFlueTemperature(self):
+        return self.service.getProperty('heating.flue.sensors.temperature.main')['properties']['value']['value']
+
+    @handleNotSupported
+    def getFuelNeed(self):
+        return self.service.getProperty('heating.configuration.fuel.need')['properties']['value']['value']
+
+    @handleNotSupported
+    def getFuelUnit(self) -> str:
+        return str(self.service.getProperty('heating.configuration.fuel.need')['properties']['value']['unit'])
+
+    @handleNotSupported
+    def getBoilerState(self):
+        return self.service.getProperty('heating.boiler.operating.phase')['properties']['value']['value']
+
+    @handleNotSupported
+    def getBoilerCuircuitPumpStatus(self):
+        return self.service.getProperty('heating.boiler.pumps.circuit')['properties']['status']['value']
+    @handleNotSupported
+    def getBufferMainTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.main")["properties"]['value']['value']
+
+    @handleNotSupported
+    def getBufferTopTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.top")["properties"]['value']['value']
+
+    @handleNotSupported
+    def getBufferMidTopTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.midTop")["properties"]['value']['value']
+
+    @handleNotSupported
+    def getBufferMiddleTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.middle")["properties"]['value']['value']
+
+    @handleNotSupported
+    def getBufferMidBottomTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.midBottom")["properties"]['value']['value']
+
+    @handleNotSupported
+    def getBufferBottomTemperature(self):
+        return self.service.getProperty("heating.bufferCylinder.sensors.temperature.bottom")["properties"]['value']['value']
+
+class PelletsBurner(HeatingDeviceWithComponent):
+
+    @property
+    def burner(self) -> str:
+        return self.component
+
+    @handleNotSupported
+    def getActive(self) -> bool:
+        return bool(self.service.getProperty(f"heating.burners.{self.burner}")["properties"]["active"]["value"])
+
+    @handleNotSupported
+    def getHours(self) -> float:
+        return float(self.service.getProperty(f"heating.burners.{self.burner}.statistics")["properties"]["hours"]["value"])
+
+    @handleNotSupported
+    def getStarts(self) -> int:
+        return int(self.service.getProperty(f"heating.burners.{self.burner}.statistics")["properties"]["starts"]["value"])

{pyvicare-2.42.0 → pyvicare-2.43.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "PyViCare"
-version = "2.42.0"
+version = "2.43.0"
 description = "Library to communicate with the Viessmann ViCare API."
 authors = [
   "Simon Gillet <mail+pyvicare@gillet.ninja>"

pyvicare-2.42.0/PyViCare/PyViCarePelletsBoiler.py

@@ -1,65 +0,0 @@
-from PyViCare.PyViCareHeatingDevice import HeatingDevice
-from PyViCare.PyViCareUtils import handleNotSupported
-
-
-class PelletsBoiler(HeatingDevice):
-
-    @handleNotSupported
-    def getActive(self):
-        return self.service.getProperty("heating.burner")["properties"]["active"]["value"]
-
-    @handleNotSupported
-    def getBurnerModulation(self):
-        return self.service.getProperty('heating.burner.modulation')["properties"]["value"]["value"]
-
-    @handleNotSupported
-    def getBoilerTemperature(self):
-        return self.service.getProperty("heating.boiler.sensors.temperature.main")["properties"]["value"]["value"]
-
-    @handleNotSupported
-    def getBurnerHours(self):
-        return self.service.getProperty('heating.burner.statistics')['properties']['hours']['value']
-
-    @handleNotSupported
-    def getBurnerStarts(self):
-        return self.service.getProperty('heating.burner.statistics')['properties']['starts']['value']
-
-    @handleNotSupported
-    def getAshLevel(self):
-        return self.service.getProperty('heating.boiler.ash.level.current')['properties']['value']['value']
-
-    @handleNotSupported
-    def getAirFlapsPrimaryPosition(self):
-        return self.service.getProperty('heating.boiler.airflaps.0.position.current')['properties']['value']['value']
-
-    @handleNotSupported
-    def getAirFlapsSecondaryPosition(self):
-        return self.service.getProperty('heating.boiler.airflaps.0.position.current')['properties']['value']['value']
-
-    @handleNotSupported
-    def getExhaustO2Level(self):
-        return self.service.getProperty('heating.flue.sensors.o2.lambda')['properties']['value']['value']
-
-    @handleNotSupported
-    def getBoilerCuircuitPumpCurrentLevel(self):
-        return self.service.getProperty('heating.boiler.pumps.circuit.power.current')['properties']['value']['value']
-
-    @handleNotSupported
-    def getBoilerReturnTemperature(self):
-        return self.service.getProperty('heating.sensors.temperature.return')['properties']['value']['value']
-
-    @handleNotSupported
-    def getFlueTemperature(self):
-        return self.service.getProperty('heating.flue.sensors.temperature.main')['properties']['value']['value']
-
-    @handleNotSupported
-    def getFuelNeed(self):
-        return self.service.getProperty('heating.configuration.fuel.need')['properties']['value']['value']
-
-    @handleNotSupported
-    def getBoilerState(self):
-        return self.service.getProperty('heating.boiler.operating.phase')['properties']['value']['value']
-
-    @handleNotSupported
-    def getBoilerCuircuitPumpStatus(self):
-        return self.service.getProperty('heating.boiler.pumps.circuit')['properties']['status']['value']

{pyvicare-2.42.0 → pyvicare-2.43.0}/PyViCare/PyViCareDeviceConfig.py

@@ -78,10 +78,10 @@ class PyViCareDeviceConfig:
     def asAutoDetectDevice(self):
         device_types = [
             (self.asFuelCell, r"Vitovalor|Vitocharge|Vitoblo", []),
+            (self.asPelletsBoiler, r"Vitoligno|Ecotronic|VBC550P", []),
+            (self.asOilBoiler, r"Vitoladens|Vitoradial|Vitorondens|VPlusH|V200KW2_6", []),
             (self.asGazBoiler, r"Vitodens|VScotH|Vitocrossal|VDensH|Vitopend|VPendH|OT_Heating_System", ["type:boiler"]),
             (self.asHeatPump, r"Vitocal|VBC70|V200WO1A|CU401B", ["type:heatpump"]),
-            (self.asOilBoiler, r"Vitoladens|Vitoradial|Vitorondens|VPlusH|V200KW2_6", []),
-            (self.asPelletsBoiler, r"Vitoligno|Ecotronic|VBC550P", []),
             (self.asElectricalEnergySystem, r"E3_VitoCharge_03", ["type:ees"]), # ees, it this a typo?
             (self.asElectricalEnergySystem, r"E3_VitoCharge_05", ["type:ess"]),
             (self.asVentilation, r"E3_ViAir", ["type:ventilation"]),