aioWiserHeatAPI 1.5.15__tar.gz → 1.5.16__tar.gz

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.15
+Version: 1.5.16
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.15
+# Drayton Wiser Hub API Async v1.5.16
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,9 +72,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.16
+
+* Added support for v2 opentherm endpoint for fw above 4.32.46
+
 ### v1.5.15
 
-* Added addiitonal functions for v2 hub lights, equipments etc
+* Added additonal functions for v2 hub lights, equipments etc
 * Added support for WindowDoor sensors
 * Added support for Boiler Interface device
 

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.5.15
+# Drayton Wiser Hub API Async v1.5.16
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -52,9 +52,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.16
+
+* Added support for v2 opentherm endpoint for fw above 4.32.46
+
 ### v1.5.15
 
-* Added addiitonal functions for v2 hub lights, equipments etc
+* Added additonal functions for v2 hub lights, equipments etc
 * Added support for WindowDoor sensors
 * Added support for Boiler Interface device
 

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/aioWiserHeatAPI/__init__.py

@@ -3,6 +3,6 @@ import logging
 name = "aioWiserHeatAPI"
 __all__ = ["wiserAPI", "wiserDiscovery"]
 
-__VERSION__ = "1.5.15"
+__VERSION__ = "1.5.16"
 
 _LOGGER = logging.getLogger(__name__)

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/aioWiserHeatAPI/const.py

@@ -1,5 +1,7 @@
 import enum
 
+from aioWiserHeatAPI.helpers.version import Version
+
 # Temperature Constants
 DEFAULT_AWAY_MODE_TEMP = 10.5
 DEFAULT_DEGRADED_TEMP = 18
@@ -78,6 +80,7 @@ WEEKENDS = ["Saturday", "Sunday"]
 SPECIAL_DAYS = [TEXT_WEEKDAYS, TEXT_WEEKENDS, TEXT_ALL]
 SPECIAL_TIMES = {"Sunrise": 3000, "Sunset": 4000}
 
+OPENTHERMV2_MIN_VERSION = Version("4.32.47")
 
 # Wiser Hub Rest Api URL Constants
 WISERHUBURL = "http://{}:{}/data/v2/"
@@ -85,6 +88,7 @@ WISERHUBDOMAIN = WISERHUBURL + "domain/"
 WISERHUBNETWORK = WISERHUBURL + "network/"
 WISERHUBSCHEDULES = WISERHUBURL + "schedules/"
 WISERHUBOPENTHERM = WISERHUBURL + "opentherm/"
+WISERHUBOPENTHERMV2 = WISERHUBURL + "openTherm/"
 WISERHUBSTATUS = WISERHUBURL + "status/"
 WISERSYSTEM = "System"
 WISERDEVICE = "Device/{}"

aiowiserheatapi-1.5.16/aioWiserHeatAPI/helpers/version.py

@@ -0,0 +1,67 @@
+"""Version helpers."""
+
+from dataclasses import dataclass
+
+
+@dataclass
+class Version:
+    """Class to handle PEP440 versions."""
+
+    version: str
+
+    def __gt__(self, other):
+        if isinstance(other, Version):
+            return (
+                self.major >= other.major
+                and self.minor >= other.minor
+                and self.micro > other.micro
+            )
+
+    def __ge__(self, other):
+        if isinstance(other, Version):
+            return self.__eq__(other) or self.__gt__(other)
+
+    def __lt__(self, other):
+        if isinstance(other, Version):
+            return (
+                self.major <= other.major
+                and self.minor <= other.minor
+                and self.micro < other.micro
+            )
+
+    def __le__(self, other):
+        if isinstance(other, Version):
+            return self.__eq__(other) or self.__lt__(other)
+
+    def __eq__(self, other):
+        if isinstance(other, Version):
+            return (
+                self.major == other.major
+                and self.minor == other.minor
+                and self.micro == other.micro
+            )
+
+    @property
+    def major(self) -> int:
+        """Get major version."""
+        try:
+            return self.version.split(".")[0]
+        except IndexError:
+            return None
+
+    @property
+    def minor(self) -> int:
+        """Get minor version."""
+        try:
+            return self.version.split(".")[1]
+        except IndexError:
+            return None
+
+    @property
+    def micro(self) -> int:
+        """Get micro version."""
+        try:
+            full_micro = self.version.split(".")[2]
+            return full_micro.split("-")[0]
+        except IndexError:
+            return None

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/aioWiserHeatAPI/wiserhub.py

@@ -16,12 +16,15 @@ import pathlib
 from datetime import datetime
 from typing import Optional
 
+from aioWiserHeatAPI.helpers.version import Version
+
 from . import __VERSION__, _LOGGER
 from .cli import log_response_to_file
 from .const import (
     DEFAULT_AWAY_MODE_TEMP,
     DEFAULT_DEGRADED_TEMP,
     MAX_BOOST_INCREASE,
+    OPENTHERMV2_MIN_VERSION,
     TEMP_ERROR,
     TEMP_HW_OFF,
     TEMP_HW_ON,
@@ -31,6 +34,7 @@ from .const import (
     WISERHUBDOMAIN,
     WISERHUBNETWORK,
     WISERHUBOPENTHERM,
+    WISERHUBOPENTHERMV2,
     WISERHUBSCHEDULES,
     WISERHUBSTATUS,
     WiserUnitsEnum,
@@ -152,9 +156,20 @@ class WiserAPI:
             opentherm = self._domain_data.get("System", {}).get(
                 "OpenThermConnectionStatus", ""
             )
-            if opentherm and opentherm == "Connected":
+            if opentherm and opentherm == "Connected" or True:
+                fw_version = Version(
+                    self._domain_data.get("System", {}).get(
+                        "ActiveSystemVersion", "1.0.0"
+                    )
+                )
+                hw_version = self._domain_data.get("System", {}).get(
+                    "HardwareGeneration", 1
+                )
                 self._opentherm_data = await self._wiser_rest_controller.get_hub_data(
-                    WISERHUBOPENTHERM, False
+                    WISERHUBOPENTHERMV2
+                    if hw_version == 2 and fw_version >= OPENTHERMV2_MIN_VERSION
+                    else WISERHUBOPENTHERM,
+                    False,
                 )
         except (
             WiserHubConnectionError,

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: aioWiserHeatAPI
-Version: 1.5.15
+Version: 1.5.16
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -18,7 +18,7 @@ Requires-Dist: aiohttp>=3.9.3
 Requires-Dist: aiofiles>=23.2.1
 Requires-Dist: pyyaml>=6.0.1
 
-# Drayton Wiser Hub API Async v1.5.15
+# Drayton Wiser Hub API Async v1.5.16
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -72,9 +72,13 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.5.16
+
+* Added support for v2 opentherm endpoint for fw above 4.32.46
+
 ### v1.5.15
 
-* Added addiitonal functions for v2 hub lights, equipments etc
+* Added additonal functions for v2 hub lights, equipments etc
 * Added support for WindowDoor sensors
 * Added support for Boiler Interface device
 

{aiowiserheatapi-1.5.15 → aiowiserheatapi-1.5.16}/aioWiserHeatAPI.egg-info/SOURCES.txt

@@ -51,4 +51,5 @@ aioWiserHeatAPI/helpers/signal.py
 aioWiserHeatAPI/helpers/special_times.py
 aioWiserHeatAPI/helpers/status.py
 aioWiserHeatAPI/helpers/temp.py
+aioWiserHeatAPI/helpers/version.py
 aioWiserHeatAPI/helpers/zigbee.py