pyxcp 0.21.11__cp310-cp310-win_amd64.whl → 0.22.2__cp310-cp310-win_amd64.whl

pyxcp/scripts/xcp_info.py

@@ -1,89 +1,109 @@
 #!/usr/bin/env python
+
 """XCP info/exploration tool.
 """
+
 from pprint import pprint
 
 from pyxcp.cmdline import ArgumentParser
 from pyxcp.types import TryCommandResult
 
 
-ap = ArgumentParser(description="XCP info/exploration tool.")
+def main():
+    ap = ArgumentParser(description="XCP info/exploration tool.")
 
-with ap.run() as x:
-    x.connect()
-    if x.slaveProperties.optionalCommMode:
-        x.try_command(x.getCommModeInfo, extra_msg="availability signaled by CONNECT, this may be a slave configuration error.")
-    print("\nSlave Properties:")
-    print("=================")
-    pprint(x.slaveProperties)
+    with ap.run() as x:
+        x.connect()
+        if x.slaveProperties.optionalCommMode:
+            x.try_command(x.getCommModeInfo, extra_msg="availability signaled by CONNECT, this may be a slave configuration error.")
+        print("\nSlave Properties:")
+        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")
-    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("=========")
-    daq_info = x.getDaqInfo()
-    pprint(daq_info)
+        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("=========")
+        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.")
+        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)
+            print("*** NO Predefined DAQ-Lists")
+        print("\nPAG Info:")
+        print("=========")
+        if x.slaveProperties.supportsCalpag:
+            status, pag = x.try_command(x.getPagProcessorInfo)
             if status == TryCommandResult.OK:
-                print(dm)
-            status, di = x.try_command(x.getDaqListInfo, idx)
+                print(pag)
+                # for idx in range(pag.maxSegments):
+                #     x.getSegmentInfo(0x01, idx, 0, 0)
+        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.")
+
+        if x.slaveProperties.transport_layer == "CAN":
+            print("\nTransport-Layer CAN:")
+            print("====================")
+            status, res = x.try_command(x.getSlaveID, 0)
             if status == TryCommandResult.OK:
-                print(di)
-    else:
-        print("*** NO Predefined DAQ-Lists")
-    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)
-    else:
-        print("*** PAGING IS NOT SUPPORTED.")
+                print("CAN identifier for CMD/STIM:\n", res)
+            else:
+                print("*** GET_SLAVE_ID() IS NOT SUPPORTED.")  # no response from bc address ???
 
-    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("\nPer DAQ-list Identifier")
+            print("-----------------------")
+            daq_id = 0
+            while True:
+                status, res = x.try_command(x.getDaqId, daq_id)
+                if status == TryCommandResult.OK:
+                    print(f"DAQ-list #{daq_id}:", res)
+                    daq_id += 1
+                else:
+                    break
+            if daq_id == 0:
+                print("N/A")
+        x.disconnect()
+        print("\nDone.")
 
-    if x.slaveProperties.transport_layer == "CAN":
-        # print("OK, CAN!!!")
-        for idx in range(num_predefined):
-            status, daq_id = x.try_command(x.getDaqId, idx)
-            if status != TryCommandResult.OK:
-                break
-            print(f"DAQ-ID #{idx}", daq_id)
-    x.disconnect()
 
-    print("\nDone.")
+if __name__ == "__main__":
+    main()

pyxcp/scripts/xcp_profile.py

@@ -0,0 +1,27 @@
+#!/usr/bin/env python
+"""Create / convert pyxcp profiles (configurations).
+"""
+
+import sys
+
+from pyxcp.cmdline import ArgumentParser
+
+
+def main():
+    if len(sys.argv) == 1:
+        sys.argv.append("profile")
+    elif len(sys.argv) >= 2 and sys.argv[1] != "profile":
+        sys.argv.insert(1, "profile")
+
+    ap = ArgumentParser(description="Create / convert pyxcp profiles (configurations).")
+
+    try:
+        with ap.run() as x:  # noqa: F841
+            pass
+    except FileNotFoundError as e:
+        print(f"Error: {e}")
+        sys.exit(1)
+
+
+if __name__ == "__main__":
+    main()

pyxcp/tests/test_asam_types.py

@@ -1,7 +1,7 @@
-from pyxcp.asam import types
-
 import pytest
 
+from pyxcp.asam import types
+
 
 def testEncodeUint32_0():
     assert types.A_Uint32("<").encode(3415750566) == b"\xa67\x98\xcb"

pyxcp/tests/test_binpacking.py

@@ -0,0 +1,184 @@
+import pytest
+
+from pyxcp.daq_stim.optimize import McObject, make_continuous_blocks
+from pyxcp.daq_stim.optimize.binpacking import Bin, first_fit_decreasing
+
+
+@pytest.fixture
+def blocks():
+    return [
+        McObject(name="", address=0x000E10BA, length=2),
+        McObject(name="", address=0x000E10BE, length=2),
+        McObject(name="", address=0x000E41F4, length=4),
+        McObject(name="", address=0x000E51FC, length=4),
+        McObject(name="", address=0x00125288, length=4),
+        McObject(name="", address=0x00125294, length=4),
+        McObject(name="", address=0x001252A1, length=1),
+        McObject(name="", address=0x001252A4, length=4),
+        McObject(name="", address=0x00125438, length=3),
+        McObject(name="", address=0x0012543C, length=1),
+    ]
+
+
+def test_pack_to_single_bin(blocks):
+    BIN_SIZE = 253
+    bins = first_fit_decreasing(items=blocks, bin_size=BIN_SIZE)
+
+    assert len(bins) == 1
+    bin0 = bins[0]
+    assert bin0.residual_capacity == BIN_SIZE - 29
+    assert bin0.entries == [
+        McObject(name="", address=0x000E41F4, length=4),
+        McObject(name="", address=0x000E51FC, length=4),
+        McObject(name="", address=0x00125288, length=4),
+        McObject(name="", address=0x00125294, length=4),
+        McObject(name="", address=0x001252A4, length=4),
+        McObject(name="", address=0x00125438, length=3),
+        McObject(name="", address=0x000E10BA, length=2),
+        McObject(name="", address=0x000E10BE, length=2),
+        McObject(name="", address=0x001252A1, length=1),
+        McObject(name="", address=0x0012543C, length=1),
+    ]
+
+
+def test_pack_empty_block_set():
+    BIN_SIZE = 253
+    bins = first_fit_decreasing(items=[], bin_size=BIN_SIZE)
+    assert bins == [Bin(size=BIN_SIZE)]
+
+
+def test_pack_to_multiple_bins1(blocks):
+    BIN_SIZE = 6
+    bins = first_fit_decreasing(items=blocks, bin_size=BIN_SIZE)
+    assert len(bins) == 6
+    bin0, bin1, bin2, bin3, bin4, bin5 = bins
+    assert bin0.residual_capacity == 0
+    assert bin0.entries == [
+        McObject(name="", address=0x000E41F4, length=4),
+        McObject(name="", address=0x000E10BA, length=2),
+    ]
+    assert bin1.residual_capacity == 0
+    assert bin1.entries == [
+        McObject(name="", address=0x000E51FC, length=4),
+        McObject(name="", address=0x000E10BE, length=2),
+    ]
+    assert bin2.residual_capacity == 0
+    assert bin2.entries == [
+        McObject(name="", address=0x00125288, length=4),
+        McObject(name="", address=0x001252A1, length=1),
+        McObject(name="", address=0x0012543C, length=1),
+    ]
+    assert bin3.residual_capacity == 2
+    assert bin3.entries == [McObject(name="", address=0x00125294, length=4)]
+    assert bin4.residual_capacity == 2
+    assert bin4.entries == [McObject(name="", address=0x001252A4, length=4)]
+    assert bin5.residual_capacity == 3
+    assert bin5.entries == [McObject(name="", address=0x00125438, length=3)]
+
+
+def test_binpacking_raises(blocks):
+    BIN_SIZE = 7
+    with pytest.raises(ValueError):
+        first_fit_decreasing(items=[McObject(name="", address=0x1000, length=32)], bin_size=BIN_SIZE)
+
+
+def test_binpacking_works(blocks):
+    BIN_SIZE = 7
+    first_fit_decreasing(items=[McObject(name="", address=0x1000, length=7)], bin_size=BIN_SIZE)
+
+
+def test_make_continuous_blocks1():
+    BLOCKS = [
+        McObject(name="", address=0x000E0002, length=2),
+        McObject(name="", address=0x000E0008, ext=23, length=4),
+        McObject(name="", address=0x000E0004, length=4),
+        McObject(name="", address=0x000E000C, ext=23, length=4),
+        McObject(name="", address=0x000E0000, length=2),
+    ]
+    bins = make_continuous_blocks(chunks=BLOCKS)
+    assert bins == [
+        McObject(
+            name="",
+            address=917504,
+            ext=0,
+            length=8,
+            components=[
+                McObject(name="", address=917504, ext=0, length=2, components=[]),
+                McObject(name="", address=917506, ext=0, length=2, components=[]),
+                McObject(name="", address=917508, ext=0, length=4, components=[]),
+            ],
+        ),
+        McObject(
+            name="",
+            address=917512,
+            ext=23,
+            length=8,
+            components=[
+                McObject(name="", address=917512, ext=23, length=4, components=[]),
+                McObject(name="", address=917516, ext=23, length=4, components=[]),
+            ],
+        ),
+    ]
+
+
+def test_make_continuous_blocks2():
+    BLOCKS = [
+        McObject(name="", address=0x000E0002, length=2),
+        McObject(name="", address=0x000E0008, length=4),
+        McObject(name="", address=0x000E0004, length=4),
+        McObject(name="", address=0x000E000C, length=4),
+        McObject(name="", address=0x000E0000, length=2),
+    ]
+    bins = make_continuous_blocks(chunks=BLOCKS)
+    assert bins == [
+        McObject(
+            name="",
+            address=917504,
+            ext=0,
+            length=16,
+            components=[
+                McObject(name="", address=917504, ext=0, length=2, components=[]),
+                McObject(name="", address=917506, ext=0, length=2, components=[]),
+                McObject(name="", address=917508, ext=0, length=4, components=[]),
+                McObject(name="", address=917512, ext=0, length=4, components=[]),
+                McObject(name="", address=917516, ext=0, length=4, components=[]),
+            ],
+        )
+    ]
+
+
+def test_make_continuous_blocks3():
+    BLOCKS = [
+        McObject(name="", address=0x000E0002, ext=0x01, length=2),
+        McObject(name="", address=0x000E0008, ext=0x03, length=4),
+        McObject(name="", address=0x000E0004, ext=0x02, length=4),
+        McObject(name="", address=0x000E000C, ext=0x04, length=4),
+        McObject(name="", address=0x000E0000, ext=0x00, length=2),
+    ]
+    bins = make_continuous_blocks(chunks=BLOCKS)
+    assert bins == [
+        McObject(
+            name="", address=917504, ext=0, length=2, components=[McObject(name="", address=917504, ext=0, length=2, components=[])]
+        ),
+        McObject(
+            name="", address=917506, ext=1, length=2, components=[McObject(name="", address=917506, ext=1, length=2, components=[])]
+        ),
+        McObject(
+            name="", address=917508, ext=2, length=4, components=[McObject(name="", address=917508, ext=2, length=4, components=[])]
+        ),
+        McObject(
+            name="", address=917512, ext=3, length=4, components=[McObject(name="", address=917512, ext=3, length=4, components=[])]
+        ),
+        McObject(
+            name="", address=917516, ext=4, length=4, components=[McObject(name="", address=917516, ext=4, length=4, components=[])]
+        ),
+    ]
+
+
+def test_mc_object_len_zero():
+    with pytest.raises(ValueError):
+        McObject(name="", address=0, ext=0, length=0)
+
+
+def test_mc_object_ok():
+    McObject(name="", address=0, ext=0, length=1)