pystuderxcom 3.4.7__tar.gz → 3.5.0__tar.gz

{pystuderxcom-3.4.7/src/pystuderxcom.egg-info → pystuderxcom-3.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystuderxcom
-Version: 3.4.7
+Version: 3.5.0
 Summary: Python library to communicate with Studer-Innotec devices on the local network via Xcom protocol
 Author-email: Anko Hanse <anko_hanse@hotmail.com>
 Project-URL: Homepage, https://github.com/ankohanse/pystuderxcom
@@ -22,7 +22,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-asyncio; extra == "tests"
 Dynamic: license-file
 
-[![license](https://img.shields.io/github/license/toreamun/amshan-homeassistant?style=for-the-badge)](LICENSE)
+[![license](https://img.shields.io/github/license/ankohanse/pystuderxcom?style=for-the-badge)](LICENSE)
 [![buy_me_a_coffee](https://img.shields.io/badge/If%20you%20like%20it-Buy%20me%20a%20coffee-yellow.svg?style=for-the-badge)](https://www.buymeacoffee.com/ankohanse)
 
 
@@ -46,7 +46,7 @@ It should also be able to detect and handle
 
 Disclaimer: this library is NOT created by Studer-Innotec, but is based on their documentation of the Xcom protocol.
 That documentation can be found on:
-[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Software and Updates -> Communication protocol Xcom-232i*
+[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Openstuder -> Communication protocol Xcom-232i*
 
 
 # Prerequisites

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/README.md

@@ -1,4 +1,4 @@
-[![license](https://img.shields.io/github/license/toreamun/amshan-homeassistant?style=for-the-badge)](LICENSE)
+[![license](https://img.shields.io/github/license/ankohanse/pystuderxcom?style=for-the-badge)](LICENSE)
 [![buy_me_a_coffee](https://img.shields.io/badge/If%20you%20like%20it-Buy%20me%20a%20coffee-yellow.svg?style=for-the-badge)](https://www.buymeacoffee.com/ankohanse)
 
 
@@ -22,7 +22,7 @@ It should also be able to detect and handle
 
 Disclaimer: this library is NOT created by Studer-Innotec, but is based on their documentation of the Xcom protocol.
 That documentation can be found on:
-[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Software and Updates -> Communication protocol Xcom-232i*
+[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Openstuder -> Communication protocol Xcom-232i*
 
 
 # Prerequisites

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pystuderxcom"
-version = "3.4.7"
+version = "3.5.0"
 authors = [
   { name="Anko Hanse", email="anko_hanse@hotmail.com" },
 ]

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/src/pystuderxcom/__init__.py

@@ -7,7 +7,7 @@ from .discover_async import AsyncXcomDiscover
 from .factory_async import AsyncXcomFactory
 
 from .api_base_sync import XcomApiBase
-from .discover_sync import XcomDiscover
+from .discover_sync import XcomDiscover, XcomDiscoverFlags
 from .factory_sync import XcomFactory
 
 from .const import XcomApiTcpMode, XcomVoltage, XcomLevel, XcomFormat, XcomTarget, XcomCategory, XcomAggregationType

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/src/pystuderxcom/discover_async.py

@@ -8,6 +8,7 @@ import os
 import struct
 
 from dataclasses import dataclass
+from enum import StrEnum
 
 from .api_base_async import (
     AsyncXcomApiBase,
@@ -37,6 +38,10 @@ logging.getLogger("httpx").setLevel(logging.WARNING)
 logging.getLogger("httpcore").setLevel(logging.WARNING)
 
 
+class XcomDiscoverFlags(StrEnum):
+    SKIP_GUID = "skip_guid"
+
+    
 class AsyncXcomDiscover:
 
     def __init__(self, api: AsyncXcomApiBase, dataset: XcomDataset):
@@ -114,25 +119,31 @@ class AsyncXcomDiscover:
 
     async def get_extended_device_info(self, device: XcomDiscoveredDevice, verbose=False) -> XcomDiscoveredDevice:
         # ID type
-        # ID HW
-        # ID HW PWR
+        # ID HW (cmd)/PWR
         # ID SOFT msb/lsb
-        # ID SID
         # ID FID msb/lsb
         try:
             _LOGGER.info(f"Trying to get extended device info for device {device.code})")
             family = XcomDeviceFamilies.get_by_id(device.family_id)
 
-            id_type    = await self._request_value_by_name("ID type",     family.id, device.addr, verbose=verbose)
-            id_hw      = await self._request_value_by_name("ID HW",       family.id, device.addr, verbose=verbose)
-            id_hw_pwr  = await self._request_value_by_name("ID HW PWR",   family.id, device.addr, verbose=verbose)
-            id_sw_msb  = await self._request_value_by_name("ID SOFT msb", family.id, device.addr, verbose=verbose)
-            id_sw_lsb  = await self._request_value_by_name("ID SOFT lsb", family.id, device.addr, verbose=verbose)
-            id_fid_msb = await self._request_value_by_name("ID FID msb",  family.id, device.addr, verbose=verbose)
-            id_fid_lsb = await self._request_value_by_name("ID FID lsb",  family.id, device.addr, verbose=verbose)
-
-            device.device_model = self._decode_type(id_type, "ID type", family.id_for_nr)
-            device.hw_version   = self._decode_id_hw(id_hw, id_hw_pwr)
+            param_id_type    = self._dataset.get_by_nr(family.nr_id_type, family.id) if family.nr_id_type is not None else None
+            param_id_hw_cmd  = self._dataset.get_by_nr(family.nr_id_hw_cmd, family.id) if family.nr_id_hw_cmd is not None else None
+            param_id_hw_pwr  = self._dataset.get_by_nr(family.nr_id_hw_pwr, family.id) if family.nr_id_hw_pwr is not None else None
+            param_id_sw_msb  = self._dataset.get_by_nr(family.nr_id_sw_msb, family.id) if family.nr_id_sw_msb is not None else None
+            param_id_sw_lsb  = self._dataset.get_by_nr(family.nr_id_sw_lsb, family.id) if family.nr_id_sw_lsb is not None else None
+            param_id_fid_msb = self._dataset.get_by_nr(family.nr_id_fid_msb, family.id) if family.nr_id_fid_msb is not None else None
+            param_id_fid_lsb = self._dataset.get_by_nr(family.nr_id_fid_lsb, family.id) if family.nr_id_fid_lsb is not None else None
+
+            id_type    = await self._api.request_value(param_id_type,    device.addr, verbose=verbose) if param_id_type is not None else None
+            id_hw_cmd  = await self._api.request_value(param_id_hw_cmd,  device.addr, verbose=verbose) if param_id_hw_cmd is not None else None
+            id_hw_pwr  = await self._api.request_value(param_id_hw_pwr,  device.addr, verbose=verbose) if param_id_hw_pwr is not None else None
+            id_sw_msb  = await self._api.request_value(param_id_sw_msb,  device.addr, verbose=verbose) if param_id_sw_msb is not None else None
+            id_sw_lsb  = await self._api.request_value(param_id_sw_lsb,  device.addr, verbose=verbose) if param_id_sw_lsb is not None else None
+            id_fid_msb = await self._api.request_value(param_id_fid_msb, device.addr, verbose=verbose) if param_id_fid_msb is not None else None
+            id_fid_lsb = await self._api.request_value(param_id_fid_lsb, device.addr, verbose=verbose) if param_id_fid_lsb is not None else None
+
+            device.device_model = self._decode_type(id_type, param_id_type)
+            device.hw_version   = self._decode_id_hw(id_hw_cmd, id_hw_pwr)
             device.sw_version   = self._decode_id_sw(id_sw_msb, id_sw_lsb)
             device.fid          = self._decode_fid(id_fid_msb, id_fid_lsb)
 
@@ -144,20 +155,10 @@ class AsyncXcomDiscover:
         return device
 
 
-    async def _request_value_by_name(self, param_name, family_id, device_addr, verbose=False):
-        try:
-            param = self._dataset.get_by_name(param_name, family_id)
-            return await self._api.request_value(param, device_addr, verbose=verbose)
-        except:
-            # Not all devices have these IDs
-            return None
-        
-
-    def _decode_type(self, val, param_name, family_id):
-        if val is None:
+    def _decode_type(self, val, param):
+        if val is None or param is None:
             return None
 
-        param = self._dataset.get_by_name(param_name, family_id)
         return param.options.get(str(int(val)), None) if param.options else None
 
 
@@ -189,7 +190,7 @@ class AsyncXcomDiscover:
         return bytes.hex(' ',4).upper()
 
 
-    async def discover_client_info(self, verbose=False) -> XcomDiscoveredClient:
+    async def discover_client_info(self, flags:dict={}, verbose=False) -> XcomDiscoveredClient:
         """
         Discover extended info about the remote Xcom client connected to us
         """
@@ -201,6 +202,8 @@ class AsyncXcomDiscover:
         if not self._api.remote_ip:
             raise XcomDiscoverNotConnected("No IP address was detected for the remote client")
 
+        flags = flags or {}
+
         _LOGGER.info(f"Trying to get client info")
         client_ip = None
         client_guid = None
@@ -214,9 +217,12 @@ class AsyncXcomDiscover:
             _LOGGER.warning(f"  Exception in discoverClientInfo: {e}")
 
         try:
-            client_guid = await self._api.request_guid(verbose=verbose)
+            if flags.get(XcomDiscoverFlags.SKIP_GUID, False):
+                _LOGGER.info(f"  Skip guid discover")
+            else:
+                client_guid = await self._api.request_guid(verbose=verbose)
 
-            _LOGGER.info(f"  Found guid: {client_guid}")
+                _LOGGER.info(f"  Found guid: {client_guid}")
 
         except Exception as e:
             _LOGGER.warning(f"  Exception in discoverClientInfo: {e}")

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/src/pystuderxcom/discover_sync.py

@@ -10,6 +10,7 @@ import os
 import struct
 
 from dataclasses import dataclass
+from enum import StrEnum
 
 from .api_base_async import (
     AsyncXcomApiBase,
@@ -40,6 +41,10 @@ logging.getLogger("httpx").setLevel(logging.WARNING)
 logging.getLogger("httpcore").setLevel(logging.WARNING)
 
 
+class XcomDiscoverFlags(StrEnum):
+    SKIP_GUID = "skip_guid"
+
+    
 class XcomDiscover:
 
     def __init__(self, api: XcomApiBase, dataset: XcomDataset):
@@ -117,25 +122,31 @@ class XcomDiscover:
 
     def get_extended_device_info(self, device: XcomDiscoveredDevice, verbose=False) -> XcomDiscoveredDevice:
         # ID type
-        # ID HW
-        # ID HW PWR
+        # ID HW (cmd)/PWR
         # ID SOFT msb/lsb
-        # ID SID
         # ID FID msb/lsb
         try:
             _LOGGER.info(f"Trying to get extended device info for device {device.code})")
             family = XcomDeviceFamilies.get_by_id(device.family_id)
 
-            id_type    = self._request_value_by_name("ID type",     family.id, device.addr, verbose=verbose)
-            id_hw      = self._request_value_by_name("ID HW",       family.id, device.addr, verbose=verbose)
-            id_hw_pwr  = self._request_value_by_name("ID HW PWR",   family.id, device.addr, verbose=verbose)
-            id_sw_msb  = self._request_value_by_name("ID SOFT msb", family.id, device.addr, verbose=verbose)
-            id_sw_lsb  = self._request_value_by_name("ID SOFT lsb", family.id, device.addr, verbose=verbose)
-            id_fid_msb = self._request_value_by_name("ID FID msb",  family.id, device.addr, verbose=verbose)
-            id_fid_lsb = self._request_value_by_name("ID FID lsb",  family.id, device.addr, verbose=verbose)
-
-            device.device_model = self._decode_type(id_type, "ID type", family.id_for_nr)
-            device.hw_version   = self._decode_id_hw(id_hw, id_hw_pwr)
+            param_id_type    = self._dataset.get_by_nr(family.nr_id_type, family.id) if family.nr_id_type is not None else None
+            param_id_hw_cmd  = self._dataset.get_by_nr(family.nr_id_hw_cmd, family.id) if family.nr_id_hw_cmd is not None else None
+            param_id_hw_pwr  = self._dataset.get_by_nr(family.nr_id_hw_pwr, family.id) if family.nr_id_hw_pwr is not None else None
+            param_id_sw_msb  = self._dataset.get_by_nr(family.nr_id_sw_msb, family.id) if family.nr_id_sw_msb is not None else None
+            param_id_sw_lsb  = self._dataset.get_by_nr(family.nr_id_sw_lsb, family.id) if family.nr_id_sw_lsb is not None else None
+            param_id_fid_msb = self._dataset.get_by_nr(family.nr_id_fid_msb, family.id) if family.nr_id_fid_msb is not None else None
+            param_id_fid_lsb = self._dataset.get_by_nr(family.nr_id_fid_lsb, family.id) if family.nr_id_fid_lsb is not None else None
+
+            id_type    = self._api.request_value(param_id_type,    device.addr, verbose=verbose) if param_id_type is not None else None
+            id_hw_cmd  = self._api.request_value(param_id_hw_cmd,  device.addr, verbose=verbose) if param_id_hw_cmd is not None else None
+            id_hw_pwr  = self._api.request_value(param_id_hw_pwr,  device.addr, verbose=verbose) if param_id_hw_pwr is not None else None
+            id_sw_msb  = self._api.request_value(param_id_sw_msb,  device.addr, verbose=verbose) if param_id_sw_msb is not None else None
+            id_sw_lsb  = self._api.request_value(param_id_sw_lsb,  device.addr, verbose=verbose) if param_id_sw_lsb is not None else None
+            id_fid_msb = self._api.request_value(param_id_fid_msb, device.addr, verbose=verbose) if param_id_fid_msb is not None else None
+            id_fid_lsb = self._api.request_value(param_id_fid_lsb, device.addr, verbose=verbose) if param_id_fid_lsb is not None else None
+
+            device.device_model = self._decode_type(id_type, param_id_type)
+            device.hw_version   = self._decode_id_hw(id_hw_cmd, id_hw_pwr)
             device.sw_version   = self._decode_id_sw(id_sw_msb, id_sw_lsb)
             device.fid          = self._decode_fid(id_fid_msb, id_fid_lsb)
 
@@ -147,20 +158,10 @@ class XcomDiscover:
         return device
 
 
-    def _request_value_by_name(self, param_name, family_id, device_addr, verbose=False):
-        try:
-            param = self._dataset.get_by_name(param_name, family_id)
-            return self._api.request_value(param, device_addr, verbose=verbose)
-        except:
-            # Not all devices have these IDs
-            return None
-        
-
-    def _decode_type(self, val, param_name, family_id):
-        if val is None:
+    def _decode_type(self, val, param):
+        if val is None or param is None:
             return None
 
-        param = self._dataset.get_by_name(param_name, family_id)
         return param.options.get(str(int(val)), None) if param.options else None
 
 
@@ -192,7 +193,7 @@ class XcomDiscover:
         return bytes.hex(' ',4).upper()
 
 
-    def discover_client_info(self, verbose=False) -> XcomDiscoveredClient:
+    def discover_client_info(self, flags:dict={}, verbose=False) -> XcomDiscoveredClient:
         """
         Discover extended info about the remote Xcom client connected to us
         """
@@ -204,6 +205,8 @@ class XcomDiscover:
         if not self._api.remote_ip:
             raise XcomDiscoverNotConnected("No IP address was detected for the remote client")
 
+        flags = flags or {}
+
         _LOGGER.info(f"Trying to get client info")
         client_ip = None
         client_guid = None
@@ -217,9 +220,12 @@ class XcomDiscover:
             _LOGGER.warning(f"  Exception in discoverClientInfo: {e}")
 
         try:
-            client_guid = self._api.request_guid(verbose=verbose)
+            if flags.get(XcomDiscoverFlags.SKIP_GUID, False):
+                _LOGGER.info(f"  Skip guid discover")
+            else:
+                client_guid = self._api.request_guid(verbose=verbose)
 
-            _LOGGER.info(f"  Found guid: {client_guid}")
+                _LOGGER.info(f"  Found guid: {client_guid}")
 
         except Exception as e:
             _LOGGER.warning(f"  Exception in discoverClientInfo: {e}")

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/src/pystuderxcom/families.py

@@ -39,6 +39,13 @@ class XcomDeviceFamily:
     nr_infos_start: int
     nr_infos_end: int
     nr_discover: int
+    nr_id_type: int | None
+    nr_id_hw_cmd: int | None
+    nr_id_hw_pwr: int | None
+    nr_id_sw_msb: int | None
+    nr_id_sw_lsb: int | None
+    nr_id_fid_msb: int | None
+    nr_id_fid_lsb: int | None
 
     def get_code(self, addr):
         if addr == self.addr_multicast:
@@ -64,6 +71,10 @@ class XcomDeviceFamilies:
         1000, 1999,            # nr for params, start to end
         3000, 3999,            # nr for infos,  start to end 
         3000,                  # nr for discovery
+        3124,                  # nr for model/type    
+        3129, 3132,            # nr for hardware version (cmd, pwr)
+        3130, 3131,            # nr for software version (msb, lsb)
+        3156, 3157,            # nr for fid (msb, lsb)
     )
     L1 = XcomDeviceFamily(
         "l1", "xt",
@@ -73,6 +84,10 @@ class XcomDeviceFamilies:
         1000, 1999,            # nr for params, start to end
         3000, 3999,            # nr for infos,  start to end   
         3000,                  # nr for discovery
+        None,                  # nr for model/type    
+        None, None,            # nr for hardware version (cmd, pwr)
+        None, None,            # nr for software version (msb, lsb)
+        None, None,            # nr for fid (msb, lsb)
     )
     L2 = XcomDeviceFamily(
         "l2", "xt",
@@ -82,6 +97,10 @@ class XcomDeviceFamilies:
         1000, 1999,            # nr for params, start to end
         3000, 3999,            # nr for infos,  start to end   
         3000,                  # nr for discovery
+        None,                  # nr for model/type    
+        None, None,            # nr for hardware version (cmd, pwr)
+        None, None,            # nr for software version (msb, lsb)
+        None, None,            # nr for fid (msb, lsb)
     )
     L3 = XcomDeviceFamily(
         "l3", "xt",
@@ -91,6 +110,10 @@ class XcomDeviceFamilies:
         1000, 1999,            # nr for params, start to end
         3000, 3999,            # nr for infos,  start to end   
         3000,                  # nr for discovery
+        None,                  # nr for model/type    
+        None, None,            # nr for hardware version (cmd, pwr)
+        None, None,            # nr for software version (msb, lsb)
+        None, None,            # nr for fid (msb, lsb)
     )
     RCC = XcomDeviceFamily(
         "rcc", "rcc",
@@ -100,6 +123,10 @@ class XcomDeviceFamilies:
         5000, 5999,            # nr for params, start to end
         0, 0,                  # nr for infos,  start to end
         5002,                  # nr for discovery
+        None,                  # nr for model/type    
+        None, None,            # nr for hardware version (cmd, pwr)
+        None, None,            # nr for software version (msb, lsb)
+        None, None,            # nr for fid (msb, lsb)
     )
     BMS = XcomDeviceFamily(
         "bms", "bms",
@@ -109,6 +136,10 @@ class XcomDeviceFamilies:
         6000, 6999,            # nr for params, start to end
         7000, 7999,            # nr for infos,  start to end
         7054,                  # nr for discovery
+        7034,                  # nr for model/type    
+        7036, None,            # nr for hardware version (cmd, pwr)
+        7037, 7038,            # nr for software version (msb, lsb)
+        7048, 7049,            # nr for fid (msb, lsb)
     )
     BSP = XcomDeviceFamily(    # Place AFTER BMS; during Discovery BSP is only tested if no BMS is found
         "bsp", "bsp",
@@ -118,6 +149,10 @@ class XcomDeviceFamilies:
         6000, 6999,            # nr for params, start to end
         7000, 7999,            # nr for infos,  start to end
         7034,                  # nr for discovery
+        7034,                  # nr for model/type    
+        7036, None,            # nr for hardware version (cmd, pwr)
+        7037, 7038,            # nr for software version (msb, lsb)
+        7048, 7049,            # nr for fid (msb, lsb)
     )
     VARIOTRACK = XcomDeviceFamily(
         "vt", "vt",
@@ -127,6 +162,10 @@ class XcomDeviceFamilies:
         10000, 10999,          # nr for params, start to end
         11000, 11999,          # nr for infos,  start to end
         11000,                 # nr for discovery
+        11047,                 # nr for model/type    
+        11049, None,           # nr for hardware version (cmd, pwr)
+        11050, 11051,          # nr for software version (msb, lsb)
+        11067, 11068,          # nr for fid (msb, lsb)
     )
     VARIOSTRING = XcomDeviceFamily(
         "vs", "vs",
@@ -136,6 +175,10 @@ class XcomDeviceFamilies:
         14000, 14999,          # nr for params, start to end
         15000, 15999,          # nr for infos,  start to end
         15000,                 # nr for discovery
+        15074,                 # nr for model/type    
+        15076, None,           # nr for hardware version (cmd, pwr)
+        15077, 15078,          # nr for software version (msb, lsb)
+        15102, 15103,          # nr for fid (msb, lsb)
     )
     XCOM = XcomDeviceFamily(    
         "xcom", "xcom",        # virtual device to expose additional values in a uniform way
@@ -145,6 +188,10 @@ class XcomDeviceFamilies:
         98000, 98999,          # nr for params, start to end
         99000, 99999,          # nr for infos,  start to end 
         99000,                 # nr for discovery
+        None,                  # nr for model/type    
+        None, None,            # nr for hardware version (cmd, pwr)
+        None, None,            # nr for software version (msb, lsb)
+        None, None,            # nr for fid (msb, lsb)
     )
 
 

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0/src/pystuderxcom.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pystuderxcom
-Version: 3.4.7
+Version: 3.5.0
 Summary: Python library to communicate with Studer-Innotec devices on the local network via Xcom protocol
 Author-email: Anko Hanse <anko_hanse@hotmail.com>
 Project-URL: Homepage, https://github.com/ankohanse/pystuderxcom
@@ -22,7 +22,7 @@ Requires-Dist: pytest; extra == "tests"
 Requires-Dist: pytest-asyncio; extra == "tests"
 Dynamic: license-file
 
-[![license](https://img.shields.io/github/license/toreamun/amshan-homeassistant?style=for-the-badge)](LICENSE)
+[![license](https://img.shields.io/github/license/ankohanse/pystuderxcom?style=for-the-badge)](LICENSE)
 [![buy_me_a_coffee](https://img.shields.io/badge/If%20you%20like%20it-Buy%20me%20a%20coffee-yellow.svg?style=for-the-badge)](https://www.buymeacoffee.com/ankohanse)
 
 
@@ -46,7 +46,7 @@ It should also be able to detect and handle
 
 Disclaimer: this library is NOT created by Studer-Innotec, but is based on their documentation of the Xcom protocol.
 That documentation can be found on:
-[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Software and Updates -> Communication protocol Xcom-232i*
+[Studer-Innotec Download Center](https://www.studer-innotec.com/en/downloads/) *-> Openstuder -> Communication protocol Xcom-232i*
 
 
 # Prerequisites

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/tests/test_datapoints_async.py

@@ -17,12 +17,12 @@ from pystuderxcom import (
 @pytest.mark.parametrize(
     "voltageAC, voltageDC, exp_len",
     [
-        (XcomVoltage.AC120, XcomVoltage.DC12, 1460),
-        (XcomVoltage.AC120, XcomVoltage.DC24, 1460),
-        (XcomVoltage.AC120, XcomVoltage.DC48, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC12, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC24, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC48, 1460),
+        (XcomVoltage.AC120, XcomVoltage.DC12, 1461),
+        (XcomVoltage.AC120, XcomVoltage.DC24, 1461),
+        (XcomVoltage.AC120, XcomVoltage.DC48, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC12, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC24, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC48, 1461),
     ]
 )
 async def test_create(voltageAC, voltageDC, exp_len):

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/tests/test_datapoints_sync.py

@@ -19,12 +19,12 @@ from pystuderxcom import (
 @pytest.mark.parametrize(
     "voltageAC, voltageDC, exp_len",
     [
-        (XcomVoltage.AC120, XcomVoltage.DC12, 1460),
-        (XcomVoltage.AC120, XcomVoltage.DC24, 1460),
-        (XcomVoltage.AC120, XcomVoltage.DC48, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC12, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC24, 1460),
-        (XcomVoltage.AC240, XcomVoltage.DC48, 1460),
+        (XcomVoltage.AC120, XcomVoltage.DC12, 1461),
+        (XcomVoltage.AC120, XcomVoltage.DC24, 1461),
+        (XcomVoltage.AC120, XcomVoltage.DC48, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC12, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC24, 1461),
+        (XcomVoltage.AC240, XcomVoltage.DC48, 1461),
     ]
 )
 def test_create(voltageAC, voltageDC, exp_len):

{pystuderxcom-3.4.7 → pystuderxcom-3.5.0}/tests/test_discover_async.py

@@ -4,7 +4,7 @@ import threading
 import pytest
 import pytest_asyncio
 
-from pystuderxcom import AsyncXcomDiscover, XcomDiscover
+from pystuderxcom import AsyncXcomDiscover, XcomDiscover, XcomDiscoverFlags
 from pystuderxcom import AsyncXcomFactory, XcomFactory
 from pystuderxcom import XcomDataset, XcomData, XcomPackage
 from pystuderxcom import XcomApiTimeoutException, XcomApiResponseIsError
@@ -184,23 +184,29 @@ async def test_discover_extendedinfo(name, rsp_dest, rsp_dict, exp_code, exp_mod
 @pytest.mark.asyncio
 @pytest.mark.usefixtures("context", "unused_tcp_port")
 @pytest.mark.parametrize(
-    "name, rsp_dest, rsp_dict, exp_ip, exp_guid",
+    "name, flag_skip_guid, rsp_dest, rsp_dict, exp_ip, exp_guid",
     [
-        ("guid none",   [501], {
+        ("guid none",   False, [501], {
                             "5002": XcomData.pack("137aef81-08b7-4e70-ad89-0dad0563d627", XcomFormat.GUID),    
                     }, "127.0.0.1", None),
-        ("guid ok",     [501], {
+        ("guid ok",     False, [501], {
                             "0": XcomData.pack("137aef81-08b7-4e70-ad89-0dad0563d627", XcomFormat.GUID),    
                     }, "127.0.0.1", "137aef81-08b7-4e70-ad89-0dad0563d627"),
+        ("guid skip",   True,  [501], {
+                            "0": XcomData.pack("137aef81-08b7-4e70-ad89-0dad0563d627", XcomFormat.GUID),    
+                    }, "127.0.0.1", None),
     ]        
 )
-async def test_clientinfo(name, rsp_dest, rsp_dict, exp_ip, exp_guid, request):
+async def test_clientinfo(name, flag_skip_guid, rsp_dest, rsp_dict, exp_ip, exp_guid, request):
     # Create discover instance
     context = request.getfixturevalue("context")
     await context.start_discover(rsp_dest, rsp_dict)
 
     # Perform the discover
-    client_info = await context.discover.discover_client_info()
+    flags = {
+        XcomDiscoverFlags.SKIP_GUID: flag_skip_guid,
+    }
+    client_info = await context.discover.discover_client_info(flags)
 
     # Check discovered info
     assert client_info is not None