pyxcp 0.22.27__tar.gz → 0.22.29__tar.gz

{pyxcp-0.22.27 → pyxcp-0.22.29}/PKG-INFO

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

{pyxcp-0.22.27 → pyxcp-0.22.29}/pyproject.toml

@@ -4,7 +4,7 @@ requires = ["poetry-core>=1.0.0", "pybind11>=2.12.0",  "pybind11[global]>=2.12.0
 build-backend = "poetry.core.masonry.api"
 
 
-[tool.poetry.dev-dependencies]
+[tool.poetry.group.dev.dependencies]
 Pygments = ">=2.10.0"
 bandit = ">=1.7.4"
 black = ">=21.10b0"
@@ -18,7 +18,6 @@ isort = ">=5.10.1"
 mypy = ">=0.930"
 pep8-naming = ">=0.12.1"
 pre-commit = ">=2.16.0"
-pre-commit-hooks = ">=4.1.0"
 pytest = ">=6.2.5"
 pyupgrade = ">=2.29.1"
 safety = ">=1.10.3"
@@ -28,6 +27,8 @@ sphinx-click = ">=3.0.2"
 typeguard = ">=2.13.3"
 xdoctest = {extras = ["colors"], version = ">=0.15.10"}
 myst-parser = {version = ">=0.16.1"}
+ruff = "^0.1.0"
+pre-commit-hooks = "^4.6.0"
 
 [project]
 name = "pyxcp"
@@ -36,7 +37,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.27"
+version = "0.22.29"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]
@@ -85,16 +86,11 @@ rich = "^13.6.0"
 chardet = "^5.2.0"
 traitlets = "<=5.11.2"
 line-profiler-pycharm = "^1.1.0"
-
 toml = "^0.10.2"
 bandit = "^1.7.8"
 tomlkit = "^0.12.5"
 pytz = "^2024.1"
-[tool.poetry.group.dev.dependencies]
-ruff = "^0.1.0"
 
-pre-commit-hooks = "^4.6.0"
-darglint = "^1.8.1"
 [tool.poetry.scripts]
 pyxcp-probe-can-drivers = "pyxcp.scripts.pyxcp_probe_can_drivers:main"
 xcp-id-scanner = "pyxcp.scripts.xcp_id_scanner:main"

{pyxcp-0.22.27 → pyxcp-0.22.29}/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.27"
+__version__ = "0.22.29"

{pyxcp-0.22.27 → pyxcp-0.22.29}/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-0.22.27 → pyxcp-0.22.29}/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-0.22.27 → pyxcp-0.22.29}/pyxcp/master/master.py

@@ -113,6 +113,7 @@ class Master:
 
     def __enter__(self):
         """Context manager entry part."""
+        self.transport.connect()
         return self
 
     def __exit__(self, exc_type, exc_val, exc_tb):
@@ -171,8 +172,6 @@ class Master:
         more attempts to connect are silently ignored.
 
         """
-        self.transport.connect()
-
         response = self.transport.request(types.Command.CONNECT, mode & 0xFF)
 
         # First get byte-order

{pyxcp-0.22.27 → pyxcp-0.22.29}/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("-----------------------")