pyxcp 0.22.26__cp38-cp38-win_amd64.whl → 0.22.28__cp38-cp38-win_amd64.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.26"
+__version__ = "0.22.28"

pyxcp/checksum.py

@@ -3,6 +3,7 @@
 
 .. [1] XCP Specification, BUILD_CHECKSUM service.
 """
+
 import enum
 import struct
 import zlib
@@ -641,7 +642,15 @@ def adder(modulus):
     return add
 
 
-def wordSum(modulus, step):
+def pad_to_word_size(frame: bytes, word_size: int, padding_value=b"\x00") -> bytes:
+    padding_bytes = word_size - (len(frame) % word_size)
+    if padding_bytes == word_size:
+        return frame
+    else:
+        return frame + (padding_value * padding_bytes)
+
+
+def wordSum(modulus: int, step: int) -> int:
     """Factory function for (double-)word modulus sums
 
     Parameters
@@ -657,13 +666,14 @@ def wordSum(modulus, step):
         summation function
     """
 
-    def add(frame):
+    def add(frame: bytes):
         if step == 2:
             mask = "<H"
         elif step == 4:
             mask = "<I"
         else:
             raise NotImplementedError("Only WORDs or DWORDs are supported.")
+        frame = pad_to_word_size(frame, step)
         x = [struct.unpack(mask, frame[x : x + step])[0] for x in range(0, len(frame), step)]
         return sum(x) % modulus
 
@@ -680,7 +690,7 @@ CRC16 = Crc16(CRC16, 0x0000, 0x0000, True, True)
 CRC16_CCITT = Crc16(CRC16_CCITT, 0xFFFF, 0x0000, False, False)
 
 
-def CRC32(x):
+def CRC32(x) -> int:
     return zlib.crc32(x) & 0xFFFFFFFF
 
 
@@ -703,7 +713,7 @@ ALGO = {
 }
 
 
-def check(frame, algo):
+def check(frame: bytes, algo: str):
     """Calculate checksum using given algorithm
 
     Parameters

pyxcp/examples/run_daq.py

@@ -1,9 +1,11 @@
 #!/usr/bin/env python
 
+import sys
 import time
 
 from pyxcp.cmdline import ArgumentParser
 from pyxcp.daq_stim import DaqList, DaqRecorder, DaqToCsv  # noqa: F401
+from pyxcp.types import XcpTimeoutError
 
 
 ap = ArgumentParser(description="DAQ test")
@@ -131,7 +133,12 @@ daq_parser = DaqToCsv(DAQ_LISTS)  # Record to CSV file(s).
 # daq_parser = DaqRecorder(DAQ_LISTS, "run_daq", 2)  # Record to ".xmraw" file.
 
 with ap.run(policy=daq_parser) as x:
-    x.connect()
+    try:
+        x.connect()
+    except XcpTimeoutError:
+        print("TO")
+        sys.exit(2)
+
     if x.slaveProperties.optionalCommMode:
         x.getCommModeInfo()
 

pyxcp/scripts/xcp_info.py

@@ -9,6 +9,44 @@ from pyxcp.cmdline import ArgumentParser
 from pyxcp.types import TryCommandResult
 
 
+def getPagInfo(x):
+    result = {}
+    if x.slaveProperties.supportsCalpag:
+        status, pag = x.try_command(x.getPagProcessorInfo)
+        if status == TryCommandResult.OK:
+            result["maxSegments"] = pag.maxSegments
+            result["pagProperties"] = {}
+            result["pagProperties"]["freezeSupported"] = pag.pagProperties.freezeSupported
+            result["segments"] = []
+            for i in range(pag.maxSegments):
+                segment = {}
+                status, std_info = x.try_command(x.getSegmentInfo, 0x01, i, 0, 0)
+                std_info = x.getSegmentInfo(0x01, i, 2, 0)
+                if status == TryCommandResult.OK:
+                    segment["maxPages"] = std_info.maxPages
+                    segment["addressExtension"] = std_info.addressExtension
+                    segment["maxMapping"] = std_info.maxMapping
+                    segment["compressionMethod"] = std_info.compressionMethod
+                    segment["encryptionMethod"] = std_info.encryptionMethod
+
+                    status, seg_address = x.try_command(x.getSegmentInfo, 0x00, i, 0, 0)
+                    status, seg_length = x.try_command(x.getSegmentInfo, 0x00, i, 1, 0)
+
+                    segment["address"] = seg_address.basicInfo
+                    segment["length"] = seg_length.basicInfo
+
+                    result["segments"].append(segment)
+
+                    status, pgi = x.try_command(x.getPageInfo, i, 0)
+                    # print("PAGE:", pgi)
+                    # for j in range(si.maxPages):
+                    #    pgi = x.getPageInfo(i, j)
+                    #    print(pgi)
+                else:
+                    break
+    return result
+
+
 def main():
     ap = ArgumentParser(description="XCP info/exploration tool.")
 
@@ -66,14 +104,10 @@ def main():
         print("\nPAG Info:")
         print("=========")
         if x.slaveProperties.supportsCalpag:
-            status, pag = x.try_command(x.getPagProcessorInfo)
-            if status == TryCommandResult.OK:
-                print(pag)
-                # for idx in range(pag.maxSegments):
-                #     x.getSegmentInfo(0x01, idx, 0, 0)
+            pgi = getPagInfo(x)
+            pprint(pgi)
         else:
             print("*** PAGING IS NOT SUPPORTED.")
-
         print("\nPGM Info:")
         print("=========")
         if x.slaveProperties.supportsPgm:
@@ -82,7 +116,6 @@ def main():
                 print(pgm)
         else:
             print("*** FLASH PROGRAMMING IS NOT SUPPORTED.")
-
         if x.slaveProperties.transport_layer == "CAN":
             print("\nTransport-Layer CAN:")
             print("====================")
@@ -90,7 +123,8 @@ def main():
             if status == TryCommandResult.OK:
                 print("CAN identifier for CMD/STIM:\n", res)
             else:
-                print("*** GET_SLAVE_ID() IS NOT SUPPORTED.")  # no response from bc address ???
+                pass
+                # print("*** GET_SLAVE_ID() IS NOT SUPPORTED.")  # no response from bc address ???
 
             print("\nPer DAQ-list Identifier")
             print("-----------------------")

pyxcp/scripts/xmraw_converter.py

@@ -0,0 +1,31 @@
+import argparse
+
+from pyxcp.recorder.converter import convert_xmraw
+
+
+parser = argparse.ArgumentParser(description="Convert .xmraw files.")
+
+parser.add_argument(
+    "target_type",
+    help="target file type",
+    choices=[
+        "arrow",
+        "csv",
+        "excel",
+        "hdf5",
+        "mdf",
+        "sqlite3",
+    ],
+)
+
+
+def main():
+    parser.add_argument("xmraw_file", help=".xmraw file")
+    parser.add_argument("-t", "--taget-file-name", dest="target_file_name", help="target file name")
+    args = parser.parse_args()
+
+    convert_xmraw(args.target_type, args.xmraw_file, args.target_file_name)
+
+
+if __name__ == "__main__":
+    main()

pyxcp/transport/base.py

@@ -240,7 +240,7 @@ class BaseTransport(metaclass=abc.ABCMeta):
                 xcpPDU = self.get()
             except EmptyFrameError:
                 if not ignore_timeout:
-                    MSG = f"Response timed out (timeout={self.timeout}s)"
+                    MSG = f"Response timed out (timeout={self.timeout / 1_000_000_000}s)"
                     with self.policy_lock:
                         self.policy.feed(types.FrameCategory.METADATA, self.counter_send, self.timestamp.value, bytes(MSG, "ascii"))
                     raise types.XcpTimeoutError(MSG) from None

{pyxcp-0.22.26.dist-info → pyxcp-0.22.28.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxcp
-Version: 0.22.26
+Version: 0.22.28
 Summary: Universal Calibration Protocol for Python
 Home-page: https://github.com/christoph2/pyxcp
 License: LGPLv3

{pyxcp-0.22.26.dist-info → pyxcp-0.22.28.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=RJc-8q7P408Jmlwt5OMDoDop9h53YvraQnGC0mdVmtY,548
+pyxcp/__init__.py,sha256=Gg_xWPOl3qvbv5BzHeRm8V4nGseVYi2kq0kj6Aq5AZs,548
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=EJYwe3Z3H24vyWAa6lUgcdKnQY8pwFxjyCN6ZU1ST8w,1509
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=NCUnCUEEgRbZYSLGtUGwL2e7zJ8hrp0SbmLHGv8uY58,612
@@ -16,7 +16,7 @@ pyxcp/asam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/asam/types.py,sha256=_gKcpBF5mon_SDWZBUW0PGBMcb37yrvhhEuk1wslg-s,2441
 pyxcp/asamkeydll.c,sha256=dVEvU0S1kgIo62S0La-T8xHSw668LM_DYc_fiQ0No6g,2952
 pyxcp/asamkeydll.sh,sha256=DC2NKUMwvi39OQgJ6514Chr4wc1LYbTmQHmMq9jAHHs,59
-pyxcp/checksum.py,sha256=alze1JiZ2JmdRul9QzP_-fuAqJcNyYBbo35zBwEKqHk,11535
+pyxcp/checksum.py,sha256=hO2JW_eiO9I0A4eiqovMV9d_y5oidq_w8jKdAE4FeOo,11899
 pyxcp/cmdline.py,sha256=na3ZbWQ-5ezsi1MrkuxMTCAXonUF3X6-LutoneyE3dU,1529
 pyxcp/config/__init__.py,sha256=nToBy_zPFQZmCUgRZ1RUjlw-OulCcvoFuGFvPw242z8,41701
 pyxcp/config/legacy.py,sha256=4QdDheX8DbBKv5JVT72_C_cjCgKvZmhN3tJ6hsvBEtI,5220
@@ -24,7 +24,7 @@ pyxcp/constants.py,sha256=9yGfujC0ImTYQWfn41wyw8pluJTSrhMGWIVeIZTgsLg,1160
 pyxcp/cpp_ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/cpp_ext/bin.hpp,sha256=PwJloZek21la-RBSda2Hc0u_6gID0sfTduPeplaAyR4,2561
 pyxcp/cpp_ext/blockmem.hpp,sha256=ysaJwmTWGTfE54Outk3gJYOfAVFd_QaonBMtXLcXwCc,1242
-pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=dAWWWsucJ22tqPC_06-Kr6nhz5nNe4m6YYeMhh384AY,279552
+pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=U0n2Ef7_jHzJT6S1r8NkEj82HEp3rX3U-ve-FxmWzcQ,288256
 pyxcp/cpp_ext/daqlist.hpp,sha256=g2hlxgoQorAGKHedZFZ0c2FQh1APMIA9sVB6M6hD_n8,7277
 pyxcp/cpp_ext/event.hpp,sha256=Z-1yxsEKsr81NnLVEWJ2ANA8FV7YsM7EbNxaw-elheE,1200
 pyxcp/cpp_ext/extension_wrapper.cpp,sha256=FXFjyruBjQYqjCYZZcajdYv6dvNnCggMAbWLqJmfuTM,4756
@@ -36,7 +36,7 @@ pyxcp/daq_stim/optimize/__init__.py,sha256=FUWK0GkNpNT-sUlhibp7xa2aSYpm6Flh5yA2w
 pyxcp/daq_stim/optimize/binpacking.py,sha256=Iltho5diKlJG-ltbmx053U2vOFRlCISolXK61T14l_I,1257
 pyxcp/daq_stim/scheduler.cpp,sha256=a7VK7kP2Hs8yMlcDAkXwJ0bH88lr_yz156sphcHS7Z4,715
 pyxcp/daq_stim/scheduler.hpp,sha256=U_6tUbebmzX5vVZS0EFSgTaPsyxMg6yRXHG_aPWA0x4,1884
-pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=Sh3DMZHjlD4EOKom7gyLPp2yMyIcVZK02msoFsFdCrg,189440
+pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=iwaHAOOMB4BfSb-HttBgEpof5yy7bN0FwtC3d9fv_C8,198656
 pyxcp/daq_stim/stim.cpp,sha256=F2OG67W4KKwTTiUCxm-9egIv3TLFdOkRunX6xf7YOtc,177
 pyxcp/daq_stim/stim.hpp,sha256=U-uInRrA6OCdMl1l1SWbQ_KEPpnNYrWut924IvbW6R0,18508
 pyxcp/daq_stim/stim_wrapper.cpp,sha256=iT2yxJ3LRG7HoYC1bwhM3tCAxF9X_HHierBNsLRmTJg,1995
@@ -51,7 +51,7 @@ pyxcp/examples/conf_nixnet.json,sha256=BvXPrljPGzaRTNPch3K0XfU3KSBP1sVDDNP7yY850
 pyxcp/examples/conf_socket_can.toml,sha256=gTacQGm0p6fhPCMWC3ScLq9Xj-xJmNbjNXkjO4o7r8k,269
 pyxcp/examples/conf_sxi.json,sha256=cXwNGoOpvqhdjXBQcE8lKgTs50wi9beosWKskZGJ-nI,158
 pyxcp/examples/conf_sxi.toml,sha256=t-XsgRljcMdj0f3_CGRT60c77LeQPNbjIT17YxDK3Yg,125
-pyxcp/examples/run_daq.py,sha256=gSKkJ_S4QgP6Pgeu-gNoh_hGzxtrAgcbQ1AEEC2QWHE,5484
+pyxcp/examples/run_daq.py,sha256=osUkVyYiA2f1cTflqbwMdrxgyfXVJ7LmpHt3u68iyQU,5624
 pyxcp/examples/xcp_policy.py,sha256=io9tS2W-7PvR8ZzU203KolFrDp67eorUlwNWvA4kC5k,1921
 pyxcp/examples/xcp_read_benchmark.py,sha256=zOG0Yrji10vA0vhHa27KK7zgc3JDpzXzXsFnIU4C_AM,956
 pyxcp/examples/xcp_skel.py,sha256=YXLQC8nn8aAwYSVuBGhr1dvmdMBjmO1Ee1w3e5sy16s,1159
@@ -78,7 +78,7 @@ pyxcp/recorder/mio.hpp,sha256=5ASJLKSEykH0deAQD5uak-_yAgd5p2n8t06315GSGrg,63346
 pyxcp/recorder/reader.hpp,sha256=rr9XZ_ciL6eF2_xEqyt9XYNqTIze9ytAsnf8uYukO9U,5201
 pyxcp/recorder/reco.py,sha256=6N6FIwfCEVMpi5dr3eUOQa1lowcg2LCnS_sy_-b-UiQ,8725
 pyxcp/recorder/recorder.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=QXsP963LBZg8uxjZqmFgxBlxxjFKiKKrvja-v7asr1c,377856
+pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=GUHwztQv6u3-vUxr-J63Rh_XJoXBuI7sYMtapEyV7Qo,386048
 pyxcp/recorder/rekorder.cpp,sha256=U0LMyk8pZXx9emgS_WPVthvn_9IpgE7JGrh4kg-8CX4,1900
 pyxcp/recorder/rekorder.hpp,sha256=sWvRch9bVt6mmgrFHp5mwWhap7HoFG4geeb7UqEIzio,7638
 pyxcp/recorder/setup.py,sha256=_99XFPQAd5V4LcJaSGJwdnbxgxJ7kl8DEXfHsnKO1Yg,998
@@ -91,8 +91,9 @@ pyxcp/scripts/pyxcp_probe_can_drivers.py,sha256=P_gscDTAofbSVA_Wd1GATrnyWGTf1-Dz
 pyxcp/scripts/xcp_examples.py,sha256=q2wNXHVZu4GjcIlZwp2j9Sqm5QH39Olro4BQaLoIqiM,2583
 pyxcp/scripts/xcp_fetch_a2l.py,sha256=72818jdJiLsDuWWfkAPxekZ7fzRRz_A4RVSy06LQNe4,1239
 pyxcp/scripts/xcp_id_scanner.py,sha256=2P53qrvM-rYFTBbbm7eAKyOxESkKrorieND-KoZZ9mo,421
-pyxcp/scripts/xcp_info.py,sha256=pNb0h7bwAuUEUbCFRIWyHCrOcTU6ElQkFMAvqzjDJUs,4152
+pyxcp/scripts/xcp_info.py,sha256=H4bDcJilgkzHWapuCT49A3dq04CAwrp7z0zv1ibwkZQ,5711
 pyxcp/scripts/xcp_profile.py,sha256=ryJnx7cqQ40O05F3beuUEOthsiW_k9d_2wMf4Z9CWkc,615
+pyxcp/scripts/xmraw_converter.py,sha256=LvjiKAWHUKs5QZNiIDT-vdNgPG0Gioas2MzLJOo62-Y,684
 pyxcp/stim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/tests/test_asam_types.py,sha256=0M08q8dJIVx-rkUtFKTqUhhW9NkThYL83LW3d_yCols,587
 pyxcp/tests/test_binpacking.py,sha256=kxLwYNzop775BkV68WXBoXVnLIuP0y4EKIW7u9niMKc,7623
@@ -105,7 +106,7 @@ pyxcp/tests/test_transport.py,sha256=Qn2VjNRfYCU6DH8olVSBUCqb0zdAM9GlTbVBM99YxFQ
 pyxcp/tests/test_utils.py,sha256=SrURAFc_6jtHng3PSZ5gpqXzVBVuPoMPB0YNvOvaIE0,880
 pyxcp/timing.py,sha256=zE6qPqOuidg6saNt7_zmbQgufxL9Id6akVYhAtpweQc,1705
 pyxcp/transport/__init__.py,sha256=31PaQLj76n5pXr68aJRWcYfrxEYWWgYoe9f_w3jZxsc,438
-pyxcp/transport/base.py,sha256=uyCJF6Lznm4gIa_Jq5Pkp6JAT6H6hQuZwryZkLz3kVI,16337
+pyxcp/transport/base.py,sha256=Wf1ymrchtJ3JaETpVsGEV6X7OQR9o5DZmoD3zoXxkyU,16353
 pyxcp/transport/base_transport.hpp,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/transport/can.py,sha256=cQ8lrwBL7Ar0GSf48987TztR9wqYS_UnXUngzhaHXe0,14909
 pyxcp/transport/eth.py,sha256=xPzN2oSALoPKJVvZpBljPSV1AxfpjRusOzymO-TD1Rw,8711
@@ -116,8 +117,8 @@ pyxcp/types.py,sha256=mjp3FhsTTbS3D5VuC-dfdbMql0lJwEfbZjf8a2pHi1o,26158
 pyxcp/utils.py,sha256=unlg0CoNwcWYfd-BE0hZJ93uhlAoW_nryv9tS_R3C44,2969
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=7Gnhvr79geMeqqGVIJPxODXGwABdNDinnqzhpooN5TE,2306
-pyxcp-0.22.26.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
-pyxcp-0.22.26.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.22.26.dist-info/METADATA,sha256=WyNvE4XGt7N-ZSKS9z4ZuGgPIXpEld_dRAgdKNeaX9Q,4076
-pyxcp-0.22.26.dist-info/WHEEL,sha256=NtstD-IOpW_lEkyZJDu2m1YPTvbwMU6Bl4jmuVneh1M,96
-pyxcp-0.22.26.dist-info/RECORD,,
+pyxcp-0.22.28.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
+pyxcp-0.22.28.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.22.28.dist-info/METADATA,sha256=Z9k9qGNqcwRvJNirOGde7V5nojPfyuaGzLAShb9ibeU,4076
+pyxcp-0.22.28.dist-info/WHEEL,sha256=NtstD-IOpW_lEkyZJDu2m1YPTvbwMU6Bl4jmuVneh1M,96
+pyxcp-0.22.28.dist-info/RECORD,,

{pyxcp-0.22.26.dist-info → pyxcp-0.22.28.dist-info}/entry_points.txt

@@ -5,4 +5,5 @@ xcp-fetch-a2l=pyxcp.scripts.xcp_fetch_a2l:main
 xcp-id-scanner=pyxcp.scripts.xcp_id_scanner:main
 xcp-info=pyxcp.scripts.xcp_info:main
 xcp-profile=pyxcp.scripts.xcp_profile:main
+xmraw-converter=pyxcp.scripts.xmraw_converter:main