pypck 0.8.3__py3-none-any.whl → 0.8.4__py3-none-any.whl

pypck/connection.py

@@ -164,12 +164,22 @@ class PchkConnectionManager:
                     break
 
                 try:
-                    message = data.decode().split(PckGenerator.TERMINATION)[0]
+                    message = data.decode("utf-8").split(PckGenerator.TERMINATION)[0]
                 except UnicodeDecodeError as err:
-                    _LOGGER.warning(
-                        "PCK decoding error: %s - skipping received PCK message", err
-                    )
-                    continue
+                    try:
+                        message = data.decode("cp1250").split(PckGenerator.TERMINATION)[
+                            0
+                        ]
+                        _LOGGER.warning(
+                            "Incorrect PCK encoding detected, possibly caused by LinHK: %s - PCK recovered using cp1250",
+                            err,
+                        )
+                    except UnicodeDecodeError as err2:
+                        _LOGGER.warning(
+                            "PCK decoding error: %s - skipping received PCK message",
+                            err2,
+                        )
+                        continue
                 await self.process_message(message)
         except asyncio.CancelledError:
             pass

pypck/inputs.py

@@ -392,7 +392,17 @@ class ModSn(ModInput):
         if matcher:
             addr = LcnAddr(int(matcher.group("seg_id")), int(matcher.group("mod_id")))
             hardware_serial = int(matcher.group("hardware_serial"), 16)
-            manu = int(matcher.group("manu"), 16)
+            try:
+                manu = int(matcher.group("manu"), 16)
+            except (
+                ValueError
+            ):  # unconventional manufacturer code (e.g., due to LinHK VM)
+                manu = 0xFF
+                _LOGGER.debug(
+                    "Unconventional manufacturer code: %s. Defaulting to 0x%02X",
+                    matcher.group("manu"),
+                    manu,
+                )
             software_serial = int(matcher.group("software_serial"), 16)
             try:
                 hardware_type = lcn_defs.HardwareType(

pypck/pck_commands.py

@@ -60,7 +60,7 @@ class PckParser:
     # Pattern to parse serial number and firmware date responses.
     PATTERN_SN = re.compile(
         r"=M(?P<seg_id>\d{3})(?P<mod_id>\d{3})\.SN(?P<hardware_serial>[0-9|A-F]{10})"
-        r"(?P<manu>[0-9|A-F]{2})FW(?P<software_serial>[0-9|A-F]{6})"
+        r"(?P<manu>.{2})FW(?P<software_serial>[0-9|A-F]{6})"
         r"HW(?P<hardware_type>\d+)"
     )
 

{pypck-0.8.3.dist-info → pypck-0.8.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pypck
-Version: 0.8.3
+Version: 0.8.4
 Summary: LCN-PCK library
 Home-page: https://github.com/alengwenus/pypck
 Author-email: Andre Lengwenus <alengwenus@gmail.com>

{pypck-0.8.3.dist-info → pypck-0.8.4.dist-info}/RECORD

@@ -1,15 +1,15 @@
 pypck/__init__.py,sha256=vjI-MSv-ght8Y_tcKPXYMjL-FGlHX6Z2ofrUBrz8g4U,317
-pypck/connection.py,sha256=AamliVspTxlzHkVeWocexRRMhEZ70bt5rI083BqWpHw,23987
+pypck/connection.py,sha256=lvhQE4ndFfvA5Ns5vszTqEQpzG0p9dPoM3Ss3J7ap3w,24487
 pypck/helpers.py,sha256=hEGId1pQ4wOJgIwNKDx17qKBlxvNxvspSrI0gSY3wCQ,1267
-pypck/inputs.py,sha256=QBpdGpHKa2iQdrXMai_mbO_MGRmPCk4BWiNb_ta8-DU,40227
+pypck/inputs.py,sha256=EMz5FsWTBpftHdRBBJ7A-6gXHPTDBiH_S1xqvZCiMco,40599
 pypck/lcn_addr.py,sha256=N2Od8KuANOglqKjf596hJVH1SRcG7MhESKA5YYlDnbw,1946
 pypck/lcn_defs.py,sha256=sU0uGYyCLrnl-1aaHe5BtPE1kExESiPGmJFGdv9FWCk,40610
 pypck/module.py,sha256=o9SB-Gr2w6ZioJa0lpzOWW5IFtWsd1ojV3qgIVjJIxw,37314
-pypck/pck_commands.py,sha256=nR3LAdWbLD7yrtHfQigIIdMYPAIGM36A1fDAc2AD9Dk,46801
+pypck/pck_commands.py,sha256=Rtui9w7TTD5IPiemHVaoaoyIMw0t_BEI3RHm-SP_f0E,46793
 pypck/request_handlers.py,sha256=6TvaWonhWcwDhqoUIS96xIj1_1lcUte2VLDMxovgJAs,24164
 pypck/timeout_retry.py,sha256=5KiTDPzegym-6qi_mM4I8ChJbJjg9HXECFyAZt4c02w,3944
-pypck-0.8.3.dist-info/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
-pypck-0.8.3.dist-info/METADATA,sha256=3N9V2hCU79mo8oegZwSoqBDHZJBaTs574XXXmi2VhrI,5581
-pypck-0.8.3.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-pypck-0.8.3.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
-pypck-0.8.3.dist-info/RECORD,,
+pypck-0.8.4.dist-info/LICENSE,sha256=iYB6zyMJvShfAzQE7nhYFgLzzZuBmhasLw5fYP9KRz4,1023
+pypck-0.8.4.dist-info/METADATA,sha256=eXmEViNAiNF3dGvbbNkPotdJcpA_efTy3ucqfjZiKrM,5581
+pypck-0.8.4.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+pypck-0.8.4.dist-info/top_level.txt,sha256=59ried49iFueDa5mQ_5BGVZcESjjzi4MZZKLcganvQA,6
+pypck-0.8.4.dist-info/RECORD,,

{pypck-0.8.3.dist-info → pypck-0.8.4.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any