pyxcp 0.22.33__cp310-cp310-macosx_11_0_arm64.whl → 0.22.35__cp310-cp310-macosx_11_0_arm64.whl

pyxcp/__init__.py

@@ -17,4 +17,4 @@ tb_install(show_locals=True, max_frames=3)  # Install custom exception handler.
 
 # if you update this manually, do not forget to update
 # .bumpversion.cfg and pyproject.toml.
-__version__ = "0.22.33"
+__version__ = "0.22.35"

pyxcp/config/__init__.py

@@ -829,6 +829,7 @@ class General(Configurable):
     )
     seed_n_key_dll = Unicode("", allow_none=False, help="Dynamic library used for slave resource unlocking.").tag(config=True)
     seed_n_key_dll_same_bit_width = Bool(False, help="").tag(config=True)
+    custom_dll_loader = Unicode(allow_none=True, default_value=None, help="Use an custom seed and key DLL loader.").tag(config=True)
     seed_n_key_function = Callable(
         default_value=None,
         allow_none=True,

pyxcp/dllif.py

@@ -36,9 +36,14 @@ else:
     raise RuntimeError(f"Platform {sys.platform!r} currently not supported.")
 
 
-def getKey(logger, dllName: str, privilege: int, seed: bytes, assume_same_bit_width: bool):
+def getKey(logger, loader_cfg: str, dllName: str, privilege: int, seed: bytes, assume_same_bit_width: bool):
     dllName = str(Path(dllName).absolute())  # Fix loader issues.
 
+    if loader_cfg is not None:
+        loader_exe = loader_cfg
+    else:
+        loader_exe = LOADER
+
     use_ctypes: bool = False
     if assume_same_bit_width:
         use_ctypes = True
@@ -70,15 +75,15 @@ def getKey(logger, dllName: str, privilege: int, seed: bytes, assume_same_bit_wi
     else:
         try:
             p0 = subprocess.Popen(
-                [LOADER, dllName, str(privilege), binascii.hexlify(seed).decode("ascii")],
+                [loader_exe, dllName, str(privilege), binascii.hexlify(seed).decode("ascii")],
                 stdout=subprocess.PIPE,
                 shell=False,
             )  # nosec
         except FileNotFoundError as exc:
-            logger.error(f"Could not find executable {LOADER!r} -- {exc}")
+            logger.error(f"Could not find executable {loader_exe!r} -- {exc}")
             return (SeedNKeyResult.ERR_COULD_NOT_LOAD_DLL, None)
         except OSError as exc:
-            logger.error(f"Cannot execute {LOADER!r} -- {exc}")
+            logger.error(f"Cannot execute {loader_exe!r} -- {exc}")
             return (SeedNKeyResult.ERR_COULD_NOT_LOAD_DLL, None)
         key: bytes = b""
         if p0.stdout:

pyxcp/examples/xcphello.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-"""Very basic hello-world example.
-"""
+"""Very basic hello-world example."""
 from pprint import pprint
 
 from pyxcp.cmdline import ArgumentParser
@@ -17,14 +16,14 @@ def callout(master, args):
 
 
 ap = ArgumentParser(description="pyXCP hello world.", callout=callout)
-ap.parser.add_argument(
-    "-d",
-    "--daq-info",
-    dest="daq_info",
-    help="Display DAQ-info",
-    default=False,
-    action="store_true",
-)
+# ap.parser.add_argument(
+#    "-d",
+#    "--daq-info",
+#    dest="daq_info",
+#    help="Display DAQ-info",
+#    default=False,
+#    action="store_true",
+# )
 
 with ap.run() as x:
     x.connect()

pyxcp/master/master.py

@@ -1840,6 +1840,7 @@ class Master:
                 self.logger.debug(f"Using seed and key DLL {self.seed_n_key_dll!r}.")
                 result, key = getKey(
                     self.logger,
+                    self.config.custom_dll_loader,
                     self.seed_n_key_dll,
                     resource_value,
                     bytes(seed),

pyxcp/recorder/converter/__init__.py

@@ -1,5 +1,4 @@
-"""Convert pyXCPs .xmraw files to common data formats.
-"""
+"""Convert pyXCPs .xmraw files to common data formats."""
 
 import csv
 import logging
@@ -318,8 +317,7 @@ class MdfConverter(CollectRows, XcpLogFileDecoder):
             time_flags=FLAG_HD_TIME_OFFSET_VALID,
         )
         hdr.comment = f"""<HDcomment><TX>Timezone: {timestamp_info.timezone}</TX></HDcomment>"""  # Test-Comment.
-        mdf4 = MDF(version="4.10")
-        mdf4.header = hdr
+        mdf4 = MDF(version="4.10", header=hdr)
         for idx, arr in enumerate(self.tables):
             signals = []
             timestamps = arr.timestamp0
@@ -369,7 +367,8 @@ class SqliteConverter(XcpLogFileDecoder):
         self.create_table(sc)
         self.logger.info(f"Creating table {sc.name!r}.")
         self.insert_stmt[sc.name] = (
-            f"""INSERT INTO {sc.name}({', '.join(['timestamp0', 'timestamp1'] + [r.name for r in sc.arr])}) VALUES({', '.join(["?" for _ in range(len(sc.arr) + 2)])})"""
+            f"""INSERT INTO {sc.name}({', '.join(['timestamp0', 'timestamp1'] + [r.name for r in sc.arr])})"""
+            f""" VALUES({', '.join(["?" for _ in range(len(sc.arr) + 2)])})"""
         )
 
     def on_finalize(self) -> None:

pyxcp/utils.py

@@ -1,11 +1,12 @@
 #!/usr/bin/env python
 import datetime
-from enum import IntEnum
 import functools
 import operator
 import sys
 from binascii import hexlify
+from enum import IntEnum
 from time import perf_counter, sleep
+from typing import Any, List, Optional, Union
 
 import chardet
 import pytz
@@ -13,7 +14,7 @@ import pytz
 from pyxcp.cpp_ext.cpp_ext import TimestampInfo
 
 
-def hexDump(arr):
+def hexDump(arr: Union[bytes | bytearray]):
     if isinstance(arr, (bytes, bytearray)):
         size = len(arr)
         try:

{pyxcp-0.22.33.dist-info → pyxcp-0.22.35.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyxcp
-Version: 0.22.33
+Version: 0.22.35
 Summary: Universal Calibration Protocol for Python
 License: LGPLv3
 Keywords: automotive,ecu,xcp,asam,autosar

{pyxcp-0.22.33.dist-info → pyxcp-0.22.35.dist-info}/RECORD

@@ -1,18 +1,18 @@
-pyxcp-0.22.33.dist-info/RECORD,,
-pyxcp-0.22.33.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-pyxcp-0.22.33.dist-info/WHEEL,sha256=LYpYYCEq2c6ymHhOSnJTe4ux3ULYSEUrqCKSUjEORwM,134
-pyxcp-0.22.33.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
-pyxcp-0.22.33.dist-info/METADATA,sha256=zHbq_bYJyscMuwsVQIVMmftnTjW2UyAb-aUog3Ywejo,4085
-pyxcp/dllif.py,sha256=kQ2njvx2flt5_EpIvIhT82NLl_LXoKJVc40H7pRi_0U,3213
+pyxcp-0.22.35.dist-info/RECORD,,
+pyxcp-0.22.35.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+pyxcp-0.22.35.dist-info/WHEEL,sha256=LYpYYCEq2c6ymHhOSnJTe4ux3ULYSEUrqCKSUjEORwM,134
+pyxcp-0.22.35.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
+pyxcp-0.22.35.dist-info/METADATA,sha256=1FG4ObUxb7QK7YO8yFEUJioWfGLPbX0gDB5apo2Hz3Q,4085
+pyxcp/dllif.py,sha256=m4e-_dgDLCD6COU5W2LdeYUlib_Xxyxbh977bbS-VAU,3344
 pyxcp/checksum.py,sha256=aveS0z4vthLXABEFhTqELqFNi7LM6ZzDzq7dD5Xe9oo,11167
 pyxcp/asamkeydll.sh,sha256=iema12sub6qNE0xAuzwGtx0FmkdaaOKoXalhrtWVaa8,57
 pyxcp/asamkeydll.c,sha256=l5RHYcEPY_Q07G-W5IjCq0xci8YfUR-3uYt84OOkOJI,2836
 pyxcp/constants.py,sha256=Yemk_Gi_m78EEU0v-sdGCAodb9dv_vqP969IU3izA2M,1113
 pyxcp/cmdline.py,sha256=lNg_wedKShu_37RhuTIGlINGLSMrg6UqJmYpqQnJbQI,1477
-pyxcp/__init__.py,sha256=3avbYsnOI83QI9CeqBD2d0RG5opFrCMDCZZ9xWj3PZY,528
+pyxcp/__init__.py,sha256=Syqs7GgVi938EmpSl12H_YqMJl5dUAfsPZfuDDc-HtE,528
 pyxcp/types.py,sha256=XJxJUh9bK5Urfia8IHVLJ-NFgQACYBd_n73L-AaeZts,25158
 pyxcp/timing.py,sha256=hzeQZ3P7ij_bfskoVMi10Iv5S4i_6TQYfnB8PXTX6c4,1645
-pyxcp/utils.py,sha256=6WY4Jrdq3W6rYveR_U1JqfmKTWHkwg65LzrhJE6xbyc,3330
+pyxcp/utils.py,sha256=Ax3TNT4OotRdJs_MVz83i7gTinpbOWwPnNVIL9WYTW4,3402
 pyxcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/errormatrix.py,sha256=cYcsJ11Qm39DPuaR4BJ9fMpS3Hkphd_ezIQOKjI-pQE,44586
 pyxcp/asam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -35,7 +35,7 @@ pyxcp/transport/usb_transport.py,sha256=27c19S67BMq1Eup6ViX-SiYpEq93bMTwe031RsE4
 pyxcp/transport/can.py,sha256=bzKV9Lh5suKdZ5dm3ZEz1osOqkRZNlxrVAW7vr38JSM,14485
 pyxcp/transport/base.py,sha256=i9VdWqGNqx5LMdFkD8SmmMQSRoDDXAjMRS3p6KD1A8E,15912
 pyxcp/config/legacy.py,sha256=Uhu_6bp_W8yGmZ2s3TFzf8-5mGwLdeTss56BMYWpsZY,5100
-pyxcp/config/__init__.py,sha256=nToBy_zPFQZmCUgRZ1RUjlw-OulCcvoFuGFvPw242z8,41701
+pyxcp/config/__init__.py,sha256=vIYPtzzNI4kUmevpOsSFgbfuBXPq7e2bhIIwWcqPcqQ,41835
 pyxcp/tests/test_utils.py,sha256=gqv3bhhWfKKdKDkqnELqsOHCfpRRZwlReEy87Ya4Z2w,850
 pyxcp/tests/test_master.py,sha256=a_Q8Fa49y_3vnrp-VFZ-22cHWjq58RC2daF6EcfbhZc,69434
 pyxcp/tests/test_daq.py,sha256=mThMsweEwxzIFRQQ88BNz_60OQ-xmC5OamIxHx9VWis,5358
@@ -60,7 +60,7 @@ pyxcp/aml/XCPonUSB.aml,sha256=rPGduH-PE8-tBeELSm3vfkbf62uhlVP6gvJL0OvMclc,4847
 pyxcp/aml/ifdata_SxI.a2l,sha256=8rAB6HTTAuNlFSrkFpR7fUA702yN4rTTNkw-xspZNV0,303
 pyxcp/aml/XCPonFlx.aml,sha256=z58FMu6ZF4hVun8WBCuxvDrq6FZ_gj3tZM15G7E8Uvw,4647
 pyxcp/master/__init__.py,sha256=o3XB9GDwLiqh-KRFC9YTOd0EvxJXDpyrcVxebiwT934,309
-pyxcp/master/master.py,sha256=XNnX6oHp2B6eNoIZ_kpoxIZk_3ZUU3L9-d3dDyaQJtE,76337
+pyxcp/master/master.py,sha256=RHw-1OT_dxsAeyChqnimqNRWEDKGP__Mw822D-7lKsY,76388
 pyxcp/master/errorhandler.py,sha256=C3T0nvn3L5QCE1AD-7dJp-D16YxfcS2OZOb9SwXySuM,14917
 pyxcp/examples/xcp_read_benchmark.py,sha256=Hl0hrjV3FE-ivswvYOh0MsKiHnk03z7w8lQDYnvfeM8,918
 pyxcp/examples/conf_eth.toml,sha256=b6bKN-K07gMQHNj7yiyB-HKrkVtZREgPXS4ByQueBs4,190
@@ -72,7 +72,7 @@ pyxcp/examples/conf_can_user.toml,sha256=BqCID-GvaNbA6pbqRbyRMuzKAsJaYVube0ql4Cv
 pyxcp/examples/xcp_user_supplied_driver.py,sha256=TD8Ggzdb2T9o6Z-VMvuJMREMpzufI5u27ThaadCxhDg,1024
 pyxcp/examples/xcp_skel.py,sha256=F2g2C79jiYZl0cpRHfzWusfn1ZvodOS_r1Az6aknZL4,1110
 pyxcp/examples/xcp_unlock.py,sha256=vl2Zv7Z6EuBxI2ZxbGQK6-0tZBVqd72FZllsvIfuJ5w,652
-pyxcp/examples/xcphello.py,sha256=1Fzg28dGk3Xhh37SahmsigaEXcCfZFe8f1t9MRAPZDk,2551
+pyxcp/examples/xcphello.py,sha256=yB1YEpxCLuCnjvN5pjZbB3obfSMEEdtfrER57KQ8KE4,2560
 pyxcp/examples/run_daq.py,sha256=JObp9HtjJphwr5sVQ4Jj3Q5GZHGNCK12tYTfR-6qcr4,5461
 pyxcp/examples/conf_socket_can.toml,sha256=JB9zHHaya2mDXf0zPY7zEKiBDX2chzBBRxt7h3LxxDk,257
 pyxcp/examples/conf_sxi.toml,sha256=r81OD0mCLk_h7vrN5MBJk0HFbiWi3bQZtFgFVrW6qcM,118
@@ -109,7 +109,7 @@ pyxcp/recorder/lz4hc.h,sha256=U_uN3Q2wIi3_dbEceJ16xHJZGotUiBTcnL6O5ARPi8M,20179
 pyxcp/recorder/lz4.c,sha256=k5b33lJ7yENd6cdWn7eZjlZUWoS088LYCMAjXAF3RTk,118145
 pyxcp/recorder/build_gcc.sh,sha256=uvMhL4faEJmhG_8rzSOxEBRRqrACC0kmZgaERN8GkUs,209
 pyxcp/recorder/unfolder.hpp,sha256=3gJKT2eMOZuT8o_M2NFLthdUIWd460vdwzlHaf-fQII,47998
-pyxcp/recorder/converter/__init__.py,sha256=Byq0X0xl5iFZfFstJQPbT1z-7TWLtBpchZABYDW57eA,14447
+pyxcp/recorder/converter/__init__.py,sha256=mqzH3jxGpFrtS2dHyfDLCYKeJycav3_-6z8svlI07eU,14452
 pyxcp/stim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=dSxM15eXvZh6izITdJmFxr1rplDUlfaJUbtrm2Xv-dE,2224