pyxcp 0.23.8__cp313-cp313-macosx_11_0_arm64.whl → 0.25.7__cp313-cp313-macosx_11_0_arm64.whl

pyxcp/scripts/xcp_id_scanner.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-"""Scan for available IDs.
-"""
+"""Scan for available IDs."""
 
 from pyxcp.cmdline import ArgumentParser
 

pyxcp/scripts/xcp_info.py

@@ -2,6 +2,7 @@
 
 """XCP info/exploration tool."""
 
+import argparse
 from pprint import pprint
 
 from pyxcp.cmdline import ArgumentParser
@@ -46,7 +47,12 @@ def getPagInfo(x):
 
 
 def main():
-    ap = ArgumentParser(description="XCP info/exploration tool.")
+    parser = argparse.ArgumentParser(description="XCP info/exploration tool.")
+    parser.add_argument("--no-daq", action="store_true", help="Do not query DAQ information.")
+    parser.add_argument("--no-pag", action="store_true", help="Do not query PAG information.")
+    parser.add_argument("--no-pgm", action="store_true", help="Do not query PGM information.")
+    parser.add_argument("--no-ids", action="store_true", help="Do not scan implemented IDs.")
+    ap = ArgumentParser(parser)
 
     with ap.run() as x:
         x.connect()
@@ -56,64 +62,73 @@ def main():
         print("=================")
         pprint(x.slaveProperties)
 
-        result = x.id_scanner()
-        print("\n")
-        print("Implemented IDs:")
-        print("================")
-        for key, value in result.items():
-            print(f"{key}: {value}", end="\n\n")
+        if not ap.args.no_ids:
+            result = x.id_scanner()
+            print("\n")
+            print("Implemented IDs:")
+            print("================")
+            for key, value in result.items():
+                print(f"{key}: {value}", end="\n\n")
+
         cps = x.getCurrentProtectionStatus()
         print("\nProtection Status")
         print("=================")
         for k, v in cps.items():
             print(f"    {k:6s}: {v}")
         x.cond_unlock()
-        print("\nDAQ Info:")
-        print("=========")
-        if x.slaveProperties.supportsDaq:
-            daq_info = x.getDaqInfo()
-            pprint(daq_info)
-
-            daq_pro = daq_info["processor"]
-            daq_properties = daq_pro["properties"]
-            if x.slaveProperties.transport_layer == "CAN":
-                print("")
-                if daq_properties["pidOffSupported"]:
-                    print("*** pidOffSupported -- i.e. one CAN-ID per DAQ-list.")
+
+        if not ap.args.no_daq:
+            print("\nDAQ Info:")
+            print("=========")
+            if x.slaveProperties.supportsDaq:
+                daq_info = x.getDaqInfo()
+                pprint(daq_info)
+
+                daq_pro = daq_info["processor"]
+                daq_properties = daq_pro["properties"]
+                if x.slaveProperties.transport_layer == "CAN":
+                    print("")
+                    if daq_properties["pidOffSupported"]:
+                        print("*** pidOffSupported -- i.e. one CAN-ID per DAQ-list.")
+                    else:
+                        print("*** NO support for PID_OFF")
+                num_predefined = daq_pro["minDaq"]
+                print("\nPredefined DAQ-Lists")
+                print("====================")
+                if num_predefined > 0:
+                    print(f"There are {num_predefined} predefined DAQ-lists")
+                    for idx in range(num_predefined):
+                        print(f"DAQ-List #{idx}\n____________\n")
+                        status, dm = x.try_command(x.getDaqListMode, idx)
+                        if status == TryCommandResult.OK:
+                            print(dm)
+                        status, di = x.try_command(x.getDaqListInfo, idx)
+                        if status == TryCommandResult.OK:
+                            print(di)
                 else:
-                    print("*** NO support for PID_OFF")
-            num_predefined = daq_pro["minDaq"]
-            print("\nPredefined DAQ-Lists")
-            print("====================")
-            if num_predefined > 0:
-                print(f"There are {num_predefined} predefined DAQ-lists")
-                for idx in range(num_predefined):
-                    print(f"DAQ-List #{idx}\n____________\n")
-                    status, dm = x.try_command(x.getDaqListMode, idx)
-                    if status == TryCommandResult.OK:
-                        print(dm)
-                    status, di = x.try_command(x.getDaqListInfo, idx)
-                    if status == TryCommandResult.OK:
-                        print(di)
+                    print("*** NO Predefined DAQ-Lists")
             else:
-                print("*** NO Predefined DAQ-Lists")
-        else:
-            print("*** DAQ IS NOT SUPPORTED .")
-        print("\nPAG Info:")
-        print("=========")
-        if x.slaveProperties.supportsCalpag:
-            pgi = getPagInfo(x)
-            pprint(pgi)
-        else:
-            print("*** PAGING IS NOT SUPPORTED.")
-        print("\nPGM Info:")
-        print("=========")
-        if x.slaveProperties.supportsPgm:
-            status, pgm = x.try_command(x.getPgmProcessorInfo)
-            if status == TryCommandResult.OK:
-                print(pgm)
-        else:
-            print("*** FLASH PROGRAMMING IS NOT SUPPORTED.")
+                print("*** DAQ IS NOT SUPPORTED .")
+
+        if not ap.args.no_pag:
+            print("\nPAG Info:")
+            print("=========")
+            if x.slaveProperties.supportsCalpag:
+                pgi = getPagInfo(x)
+                pprint(pgi)
+            else:
+                print("*** PAGING IS NOT SUPPORTED.")
+
+        if not ap.args.no_pgm:
+            print("\nPGM Info:")
+            print("=========")
+            if x.slaveProperties.supportsPgm:
+                status, pgm = x.try_command(x.getPgmProcessorInfo)
+                if status == TryCommandResult.OK:
+                    print(pgm)
+            else:
+                print("*** FLASH PROGRAMMING IS NOT SUPPORTED.")
+
         if x.slaveProperties.transport_layer == "CAN":
             print("\nTransport-Layer CAN:")
             print("====================")

pyxcp/scripts/xcp_profile.py

@@ -1,6 +1,5 @@
 #!/usr/bin/env python
-"""Create / convert pyxcp profiles (configurations).
-"""
+"""Create / convert pyxcp profiles (configurations)."""
 
 import sys
 

pyxcp/tests/test_daq.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from pyxcp.daq_stim import DaqList, DaqProcessor
+from pyxcp.daq_stim import DaqList
 
 
 DAQ_INFO = {

pyxcp/tests/test_framing.py

@@ -0,0 +1,262 @@
+from pyxcp.transport.base import XcpFraming, XcpFramingConfig, XcpTransportLayerType, ChecksumType
+
+
+def test_prepare_request_sxiL1CN():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.NO_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xFF, 0x00]
+
+
+def test_prepare_request_sxiL1CB():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.BYTE_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xFF, 0x00, 0x01]
+
+
+def test_prepare_request_sxiL1CW_1():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xFF, 0x00, 0x00, 0x02, 0xFF]
+
+
+def test_prepare_request_sxiL1CW_2():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00, 0x55)
+    assert list(request) == [0x03, 0xFF, 0x00, 0x55, 0x03, 0x54]
+
+
+def test_prepare_request_sxiL1C1CN():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=1,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.NO_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 0xAA
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xAA, 0xFF, 0x00]
+
+
+def test_prepare_request_sxiL1C1CB():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=1,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.BYTE_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 0xAA
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xAA, 0xFF, 0x00, 0xAB]
+
+
+def test_prepare_request_sxiL1C1CW_1():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=1,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 0xAA
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0xAA, 0xFF, 0x00, 0x01, 0xAB]
+
+
+def test_prepare_request_sxiL1C1CW_2():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=1,
+        header_ctr=1,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 0xAA
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00, 0x55)
+    assert list(request) == [0x03, 0xAA, 0xFF, 0x00, 0x55, 0x00, 0x57, 0xAB]
+
+
+def test_prepare_request_sxiL2CN():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.NO_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    # print("RQ", list(request))
+    assert list(request) == [0x02, 0x00, 0xFF, 0x00]
+
+
+def test_prepare_request_sxiL2CB():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.BYTE_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    # print("RQ", list(request))
+    assert list(request) == [0x02, 0x00, 0xFF, 0x00, 0x01]
+
+
+def test_prepare_request_sxiL2CW_1():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    # print("RQ", list(request))
+    assert list(request) == [0x02, 0x00, 0xFF, 0x00, 0x01, 0x01]
+
+
+def test_prepare_request_sxiL2CW_2():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=0,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00, 0x00)
+    # print("RQ", list(request))
+    assert list(request) == [0x03, 0x00, 0xFF, 0x00, 0x00, 0x00, 0x02, 0x01]
+
+
+# const uint8_t FRAME5[] = {0x02, 0x00, 0x03, 0x00, 0xff, 0x00};  // LEN_CTR_WORD / NO_CS
+def test_prepare_request_sxiL2C2CN():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=2,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.NO_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0x00, 0x03, 0x00, 0xFF, 0x00]
+
+
+def test_prepare_request_sxiL2C2CB():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=2,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.BYTE_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0x00, 0x03, 0x00, 0xFF, 0x00, 0x04]
+
+
+def test_prepare_request_sxiL2C2CW_1():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=2,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00)
+    assert list(request) == [0x02, 0x00, 0x03, 0x00, 0xFF, 0x00, 0x04, 0x01]
+
+
+def test_prepare_request_sxiL2C2CW_2():
+    config = XcpFramingConfig(
+        transport_layer_type=XcpTransportLayerType.SXI,
+        header_len=2,
+        header_ctr=2,
+        header_fill=0,
+        tail_fill=False,
+        tail_cs=ChecksumType.WORD_CHECKSUM,
+    )
+    framing = XcpFraming(config)
+    framing.counter_send = 3
+    cmd = 0xFF
+    request = framing.prepare_request(cmd, 0x00, 0x55)
+    assert list(request) == [0x03, 0x00, 0x03, 0x00, 0xFF, 0x00, 0x55, 0x00, 0x5A, 0x01]