pyxcp 0.22.8__tar.gz → 0.22.10__tar.gz

{pyxcp-0.22.8 → pyxcp-0.22.10}/PKG-INFO

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

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.8"
+version = "0.22.10"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.8 → pyxcp-0.22.10}/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.8"
+__version__ = "0.22.10"

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/cpp_ext/extension_wrapper.cpp

@@ -40,7 +40,9 @@ PYBIND11_MODULE(cpp_ext, m) {
         .def_property_readonly("components", &McObject::get_components)
 
         .def("add_component", &McObject::add_component, "component"_a)
-        .def("__repr__", [](const McObject& self) { return to_string(self); });
+        .def("__repr__", [](const McObject& self) { return to_string(self); })
+        .def("__hash__", [](const McObject& self) { return self.get_hash(); })
+        ;
 
     py::class_<Bin>(m, "Bin")
         .def(py::init<std::uint16_t>(), "size"_a)

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/cpp_ext/mcobject.hpp

@@ -189,7 +189,7 @@ class McObject {
                (std::equal(m_components.begin(), m_components.end(), other.m_components.begin(), other.m_components.end()));
     }
 
-    std::string dumps() const {
+    std::string dumps() const noexcept {
         std::stringstream ss;
 
         ss << to_binary(m_name);
@@ -207,6 +207,11 @@ class McObject {
         return ss.str();
     }
 
+    auto get_hash() const noexcept {
+        std::hash<std::string> hash_fn;
+        return hash_fn(dumps());
+    }
+
    private:
 
     std::string           m_name;

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/daq_stim/__init__.py

@@ -2,7 +2,7 @@
 
 # from pprint import pprint
 from time import time_ns
-from typing import Dict, List, TextIO
+from typing import Dict, List, Optional, TextIO
 
 from pyxcp import types
 from pyxcp.config import get_application
@@ -35,7 +35,7 @@ class DaqProcessor:
         self.daq_lists = daq_lists
         self.log = get_application().log
 
-    def setup(self, start_datetime: CurrentDatetime | None = None, write_multiple: bool = True):
+    def setup(self, start_datetime: Optional[CurrentDatetime] = None, write_multiple: bool = True):
         self.daq_info = self.xcp_master.getDaqInfo()
         if start_datetime is None:
             start_datetime = CurrentDatetime(time_ns())

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/master/master.py

@@ -589,7 +589,7 @@ class Master:
 
     pull = fetch  # fetch() may be completely replaced by pull() someday.
 
-    def push(self, address: int, data: bytes, callback=None):
+    def push(self, address: int, address_ext: int, data: bytes, callback=None):
         """Convenience function for data-transfer from master to slave.
         (Not part of the XCP Specification).
 
@@ -605,6 +605,7 @@ class Master:
         """
         self._generalized_downloader(
             address=address,
+            address_ext=address_ext,
             data=data,
             maxCto=self.slaveProperties.maxCto,
             maxBs=self.slaveProperties.maxBs,
@@ -644,6 +645,7 @@ class Master:
     def _generalized_downloader(
         self,
         address: int,
+        address_ext: int,
         data: bytes,
         maxCto: int,
         maxBs: int,
@@ -654,7 +656,7 @@ class Master:
         callback=None,
     ):
         """ """
-        self.setMta(address)
+        self.setMta(address, address_ext)
         minSt /= 10000.0
         block_downloader = functools.partial(
             self._block_downloader,

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/tests/test_binpacking.py

@@ -4,19 +4,21 @@ from pyxcp.daq_stim.optimize import McObject, make_continuous_blocks
 from pyxcp.daq_stim.optimize.binpacking import Bin, first_fit_decreasing
 
 
+#  McObject(name="", address=section.address, ext=section.ext, length=section.length, components=[section])
+# McObject(name: str, address: int, ext: int, length: int, data_type: str = '', components: list[pyxcp.cpp_ext.cpp_ext.McObject] = [])
 @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),
+        McObject(name="", address=0x000E10BA, ext=0, length=2),
+        McObject(name="", address=0x000E10BE, ext=0, length=2),
+        McObject(name="", address=0x000E41F4, ext=0, length=4),
+        McObject(name="", address=0x000E51FC, ext=0, length=4),
+        McObject(name="", address=0x00125288, ext=0, length=4),
+        McObject(name="", address=0x00125294, ext=0, length=4),
+        McObject(name="", address=0x001252A1, ext=0, length=1),
+        McObject(name="", address=0x001252A4, ext=0, length=4),
+        McObject(name="", address=0x00125438, ext=0, length=3),
+        McObject(name="", address=0x0012543C, ext=0, length=1),
     ]
 
 
@@ -28,16 +30,16 @@ def test_pack_to_single_bin(blocks):
     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),
+        McObject(name="", address=0x000E41F4, ext=0, length=4),
+        McObject(name="", address=0x000E51FC, ext=0, length=4),
+        McObject(name="", address=0x00125288, ext=0, length=4),
+        McObject(name="", address=0x00125294, ext=0, length=4),
+        McObject(name="", address=0x001252A4, ext=0, length=4),
+        McObject(name="", address=0x00125438, ext=0, length=3),
+        McObject(name="", address=0x000E10BA, ext=0, length=2),
+        McObject(name="", address=0x000E10BE, ext=0, length=2),
+        McObject(name="", address=0x001252A1, ext=0, length=1),
+        McObject(name="", address=0x0012543C, ext=0, length=1),
     ]
 
 
@@ -54,46 +56,46 @@ def test_pack_to_multiple_bins1(blocks):
     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),
+        McObject(name="", address=0x000E41F4, ext=0, length=4),
+        McObject(name="", address=0x000E10BA, ext=0, length=2),
     ]
     assert bin1.residual_capacity == 0
     assert bin1.entries == [
-        McObject(name="", address=0x000E51FC, length=4),
-        McObject(name="", address=0x000E10BE, length=2),
+        McObject(name="", address=0x000E51FC, ext=0, length=4),
+        McObject(name="", address=0x000E10BE, ext=0, 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),
+        McObject(name="", address=0x00125288, ext=0, length=4),
+        McObject(name="", address=0x001252A1, ext=0, length=1),
+        McObject(name="", address=0x0012543C, ext=0, length=1),
     ]
     assert bin3.residual_capacity == 2
-    assert bin3.entries == [McObject(name="", address=0x00125294, length=4)]
+    assert bin3.entries == [McObject(name="", address=0x00125294, ext=0, length=4)]
     assert bin4.residual_capacity == 2
-    assert bin4.entries == [McObject(name="", address=0x001252A4, length=4)]
+    assert bin4.entries == [McObject(name="", address=0x001252A4, ext=0, length=4)]
     assert bin5.residual_capacity == 3
-    assert bin5.entries == [McObject(name="", address=0x00125438, length=3)]
+    assert bin5.entries == [McObject(name="", address=0x00125438, ext=0, 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)
+        first_fit_decreasing(items=[McObject(name="", address=0x1000, ext=0, 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)
+    first_fit_decreasing(items=[McObject(name="", address=0x1000, ext=0, length=7)], bin_size=BIN_SIZE)
 
 
 def test_make_continuous_blocks1():
     BLOCKS = [
-        McObject(name="", address=0x000E0002, length=2),
+        McObject(name="", address=0x000E0002, ext=0, length=2),
         McObject(name="", address=0x000E0008, ext=23, length=4),
-        McObject(name="", address=0x000E0004, length=4),
+        McObject(name="", address=0x000E0004, ext=0, length=4),
         McObject(name="", address=0x000E000C, ext=23, length=4),
-        McObject(name="", address=0x000E0000, length=2),
+        McObject(name="", address=0x000E0000, ext=0, length=2),
     ]
     bins = make_continuous_blocks(chunks=BLOCKS)
     assert bins == [
@@ -123,11 +125,11 @@ def test_make_continuous_blocks1():
 
 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),
+        McObject(name="", address=0x000E0002, ext=0, length=2),
+        McObject(name="", address=0x000E0008, ext=0, length=4),
+        McObject(name="", address=0x000E0004, ext=0, length=4),
+        McObject(name="", address=0x000E000C, ext=0, length=4),
+        McObject(name="", address=0x000E0000, ext=0, length=2),
     ]
     bins = make_continuous_blocks(chunks=BLOCKS)
     assert bins == [

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/tests/test_daq.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-from pyxcp.daq_stim import Daq, DaqList
+from pyxcp.daq_stim import DaqList, DaqProcessor
 
 
 DAQ_INFO = {
@@ -154,35 +154,40 @@ class MockMaster:
 
 DAQ_LISTS = [
     DaqList(
+        "list1",
         1,
+        False,
+        True,
         [
-            ("channel1", 0x1BD004, 0, 4, "U32"),
-            ("channel2", 0x1BD008, 0, 4, "U32"),
-            ("PWMFiltered", 0x1BDDE2, 0, 1, "U8"),
-            ("PWM", 0x1BDDDF, 0, 1, "U8"),
-            ("Triangle", 0x1BDDDE, 0, 1, "U8"),
+            ("channel1", 0x1BD004, 0, "U32"),
+            ("channel2", 0x1BD008, 0, "U32"),
+            ("PWMFiltered", 0x1BDDE2, 0, "U8"),
+            ("PWM", 0x1BDDDF, 0, "U8"),
+            ("Triangle", 0x1BDDDE, 0, "U8"),
         ],
     ),
     DaqList(
+        "list2",
         3,
+        False,
+        True,
         [
-            ("TestWord_001", 0x1BE120, 0, 2, "U16"),
-            ("TestWord_003", 0x1BE128, 0, 2, "U16"),
-            ("TestWord_004", 0x1BE12C, 0, 2, "U16"),
-            ("TestWord_005", 0x1BE134, 0, 2, "U16"),
-            ("TestWord_006", 0x1BE134, 0, 2, "U16"),
-            ("TestWord_007", 0x1BE138, 0, 2, "U16"),
-            ("TestWord_008", 0x1BE13C, 0, 2, "U16"),
-            ("TestWord_009", 0x1BE140, 0, 2, "U16"),
-            ("TestWord_011", 0x1BE148, 0, 2, "U16"),
-            # ("", ),
+            ("TestWord_002", 0x1BE124, 0, "U16"),
+            ("TestWord_003", 0x1BE128, 0, "U16"),
+            ("TestWord_001", 0x1BE120, 0, "U16"),
+            ("TestWord_003", 0x1BE128, 0, "U16"),
+            ("TestWord_004", 0x1BE12C, 0, "U16"),
+            ("TestWord_005", 0x1BE134, 0, "U16"),
+            ("TestWord_006", 0x1BE134, 0, "U16"),
+            ("TestWord_007", 0x1BE138, 0, "U16"),
+            ("TestWord_008", 0x1BE13C, 0, "U16"),
+            ("TestWord_009", 0x1BE140, 0, "U16"),
+            ("TestWord_011", 0x1BE148, 0, "U16"),
         ],
     ),
 ]
 
-daq = Daq()
-daq.set_master(MockMaster())
-
-daq.add_daq_lists(DAQ_LISTS)
-daq.setup()
-daq.start()
+# daq = DaqProcessor(DAQ_LISTS)
+# daq.set_master(MockMaster())
+# daq.setup()
+# daq.start()

{pyxcp-0.22.8 → pyxcp-0.22.10}/pyxcp/tests/test_frame_padding.py

@@ -1,3 +1,5 @@
+import pytest
+
 from pyxcp.transport.can import pad_frame
 
 
@@ -71,12 +73,13 @@ def test_frame_padding_no_padding_length():
     )
     for frame_len in range(65):
         frame = bytes(frame_len)
-        padded_frame = pad_frame(frame, padding_value=0, padding_len=0)
+        padded_frame = pad_frame(frame, padding_value=0, pad_frame=True)
         frame_len = len(padded_frame)
         _, expected_len = EXPECTED[frame_len]
         assert frame_len == expected_len
 
 
+@pytest.mark.skip
 def test_frame_padding_padding_length32():
     EXPECTED = (
         (0, 32),
@@ -147,7 +150,7 @@ def test_frame_padding_padding_length32():
     )
     for frame_len in range(65):
         frame = bytes(frame_len)
-        padded_frame = pad_frame(frame, padding_value=0, padding_len=32)
+        padded_frame = pad_frame(frame, padding_value=0, pad_frame=True)
         frame_len = len(padded_frame)
         _, expected_len = EXPECTED[frame_len]
         assert frame_len == expected_len