aioWiserHeatAPI 1.7.0__tar.gz → 1.7.2__tar.gz

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioWiserHeatAPI
-Version: 1.7.0
+Version: 1.7.2
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -28,7 +28,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Drayton Wiser Hub API Async v1.7.0
+# Drayton Wiser Hub API Async v1.7.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -49,7 +49,6 @@ Reference [https://it.knightnet.org.uk/kb/nr-qa/drayton-wiser-heating-control/#c
    Look for the Wi-Fi network (SSID) called **‘WiserHeatXXXXXX’** where XXXXXX is last 6 digits of the MAC address
 2. Connect to the network from a Windows/Linux/Mac/Android/iPhone machine
 3. Execute the secret url :-)
-
    - Open a browser to url `http://192.168.8.1/secret`
 
    This will return a string which is your system secret, store this somewhere. If you are running the test script simply put this value , with the ip address of the hub, in your wiserkeys.params
@@ -83,6 +82,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.7.2
+
+- Fix: Set min f/w version of 4.42.23 for https on gen2 hubs
+
 ### v1.7.0
 
 - Added https support for v2 hubs -> required for some commands

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/README.md

@@ -1,4 +1,4 @@
-# Drayton Wiser Hub API Async v1.7.0
+# Drayton Wiser Hub API Async v1.7.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -19,7 +19,6 @@ Reference [https://it.knightnet.org.uk/kb/nr-qa/drayton-wiser-heating-control/#c
    Look for the Wi-Fi network (SSID) called **‘WiserHeatXXXXXX’** where XXXXXX is last 6 digits of the MAC address
 2. Connect to the network from a Windows/Linux/Mac/Android/iPhone machine
 3. Execute the secret url :-)
-
    - Open a browser to url `http://192.168.8.1/secret`
 
    This will return a string which is your system secret, store this somewhere. If you are running the test script simply put this value , with the ip address of the hub, in your wiserkeys.params
@@ -53,6 +52,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.7.2
+
+- Fix: Set min f/w version of 4.42.23 for https on gen2 hubs
+
 ### v1.7.0
 
 - Added https support for v2 hubs -> required for some commands

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/aioWiserHeatAPI/__init__.py

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

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/aioWiserHeatAPI/const.py

@@ -81,6 +81,7 @@ SPECIAL_DAYS = [TEXT_WEEKDAYS, TEXT_WEEKENDS, TEXT_ALL]
 SPECIAL_TIMES = {"Sunrise": 3000, "Sunset": 4000}
 
 OPENTHERMV2_MIN_VERSION = Version("4.32.47")
+HUB_GEN2_MIN_HTTPS_VERSION = Version("4.42.23")
 
 # Wiser Hub Rest Api URL Constants
 WISERHUBURL = "{}:{}/data/v2/"

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/aioWiserHeatAPI/wiserhub.py

@@ -23,6 +23,7 @@ from .cli import log_response_to_file
 from .const import (
     DEFAULT_AWAY_MODE_TEMP,
     DEFAULT_DEGRADED_TEMP,
+    HUB_GEN2_MIN_HTTPS_VERSION,
     MAX_BOOST_INCREASE,
     OPENTHERMV2_MIN_VERSION,
     TEMP_ERROR,
@@ -161,12 +162,18 @@ class WiserAPI:
                 WISERHUBDOMAIN
             )
 
-            # Determine if we need to use https for v2 hubs
-            if self._domain_data and self._domain_data.get("System", {}).get(
-                "HardwareGeneration", 1
-            ) > 1:
-                self._wiser_rest_controller.use_https = True
-                
+            # Determine if we need to use https for v2 hubs.  FW needs to be 4.42.23 or higher
+            if self._domain_data:
+                hw_gen = self._domain_data.get("System", {}).get(
+                    "HardwareGeneration", 1
+                )
+                fw_version = Version(
+                    self._domain_data.get("System", {}).get(
+                        "ActiveSystemVersion", "1.0.0"
+                    )
+                )
+                if hw_gen == 2 and fw_version >= HUB_GEN2_MIN_HTTPS_VERSION:
+                    self._wiser_rest_controller.use_https = True
 
             self._network_data = await self._wiser_rest_controller.get_hub_data(
                 WISERHUBNETWORK

{aiowiserheatapi-1.7.0 → aiowiserheatapi-1.7.2}/aioWiserHeatAPI.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aioWiserHeatAPI
-Version: 1.7.0
+Version: 1.7.2
 Summary: An AsyncIO API for controlling the Drayton Wiser Heating system
 Home-page: https://github.com/msp1974/aioWiserHeatAPI
 Author: Mark Parker
@@ -28,7 +28,7 @@ Dynamic: requires-dist
 Dynamic: requires-python
 Dynamic: summary
 
-# Drayton Wiser Hub API Async v1.7.0
+# Drayton Wiser Hub API Async v1.7.2
 
 This repository contains a simple API which queries the Drayton Wiser Heating sysystem used in the UK.
 
@@ -49,7 +49,6 @@ Reference [https://it.knightnet.org.uk/kb/nr-qa/drayton-wiser-heating-control/#c
    Look for the Wi-Fi network (SSID) called **‘WiserHeatXXXXXX’** where XXXXXX is last 6 digits of the MAC address
 2. Connect to the network from a Windows/Linux/Mac/Android/iPhone machine
 3. Execute the secret url :-)
-
    - Open a browser to url `http://192.168.8.1/secret`
 
    This will return a string which is your system secret, store this somewhere. If you are running the test script simply put this value , with the ip address of the hub, in your wiserkeys.params
@@ -83,6 +82,10 @@ Documentation available in [info.md](https://github.com/msp1974/wiserHeatAPIv2/b
 
 ## Changelog
 
+### v1.7.2
+
+- Fix: Set min f/w version of 4.42.23 for https on gen2 hubs
+
 ### v1.7.0
 
 - Added https support for v2 hubs -> required for some commands