pyxcp 0.22.12__tar.gz → 0.22.14__tar.gz

{pyxcp-0.22.12 → pyxcp-0.22.14}/CMakeLists.txt

@@ -29,13 +29,13 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
 	if (MSVC)
 		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS}  /Od /fsanitize=address /Zi")
 	else()
-		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -Og -g3 -ggdb --fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined -fsanitize=bounds")	# -fsanitize=hwaddress
+		SET(GCC_N_CLANG_BASE_OPTIONS "${GCC_N_CLANG_BASE_OPTIONS} -Og -g3 -ggdb --fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined -fsanitize=bounds")	# -fsanitize=hwaddress
 	endif()
 else ()
 	if (MSVC)
 		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} /Ox")
 	else()
-		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -O3 --fomit-frame-pointer")
+		SET(GCC_N_CLANG_BASE_OPTIONS "${GCC_N_CLANG_BASE_OPTIONS} -O3 --fomit-frame-pointer")
 	endif()
  endif ()
 

{pyxcp-0.22.12 → pyxcp-0.22.14}/PKG-INFO

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

{pyxcp-0.22.12 → pyxcp-0.22.14}/build_ext.py

@@ -119,7 +119,8 @@ def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
     if py_cfg["libdir"]:
         cmake_args.append(f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}")
 
-    build_args = ["--config Release", "--verbose"]
+    build_args = []
+    #    build_args = ["--config Release", "--verbose"]
     # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src
 
     if sys.platform.startswith("darwin"):

{pyxcp-0.22.12 → pyxcp-0.22.14}/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.12"
+version = "0.22.14"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]
@@ -190,7 +190,7 @@ manylinux-aarch64-image = "manylinux_2_35"
 [tool.cibuildwheel.linux]
 # archs = ["auto", "aarch64"]
 archs = ["x86_64", "aarch64"]
-before-all = "yum install -y libffi openssl openssl-devel gcc"
+# before-all = "yum install -y libffi openssl openssl-devel gcc libpython3-dev"
 
 [tool.pyright]
 include = ["pyxcp", "build_ext.py"]

{pyxcp-0.22.12 → pyxcp-0.22.14}/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.12"
+__version__ = "0.22.14"

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/cpp_ext/daqlist.hpp

@@ -37,6 +37,10 @@ class DaqList {
         return m_event_num;
     }
 
+    void set_event_num(std::uint16_t event_num) {
+        m_event_num = event_num;
+    }
+
     bool get_stim() const {
         return m_stim;
     }
@@ -75,7 +79,6 @@ class DaqList {
 
     void set_measurements_opt(const std::vector<Bin>& measurements_opt) {
         m_measurements_opt = measurements_opt;
-
         auto odt_count     = 0u;
         auto total_entries = 0u;
         auto total_length  = 0u;

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/cpp_ext/extension_wrapper.cpp

@@ -64,7 +64,7 @@ PYBIND11_MODULE(cpp_ext, m) {
         )
         .def("__repr__", [](const DaqList& self) { return self.to_string(); })
         .def_property("name", &DaqList::get_name, nullptr)
-        .def_property("event_num", &DaqList::get_event_num, nullptr)
+        .def_property("event_num", &DaqList::get_event_num, &DaqList::set_event_num)
         .def_property("stim", &DaqList::get_stim, nullptr)
         .def_property("enable_timestamps", &DaqList::get_enable_timestamps, nullptr)
         .def_property("measurements", &DaqList::get_measurements, nullptr)

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/cpp_ext/helper.hpp

@@ -251,6 +251,22 @@ class Timestamp {
     std::uint64_t m_initial;
 };
 
+template<typename T, typename V>
+T variant_get(V&& value) {
+
+    T result;
+
+    const T* value_ptr = std::get_if<T>(&value);
+    if (value_ptr == nullptr) {
+        result = T{};
+    }
+    else {
+        result = *value_ptr;
+    }
+
+    return result;
+}
+
 #if 0
 inline void sleep_ms(std::uint64_t milliseconds) {
     std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/daq_stim/__init__.py

@@ -6,7 +6,7 @@ from typing import Dict, List, Optional, TextIO
 
 from pyxcp import types
 from pyxcp.config import get_application
-from pyxcp.cpp_ext import DaqList
+from pyxcp.cpp_ext.cpp_ext import DaqList
 from pyxcp.daq_stim.optimize import make_continuous_blocks
 from pyxcp.daq_stim.optimize.binpacking import first_fit_decreasing
 from pyxcp.recorder import DaqOnlinePolicy as _DaqOnlinePolicy

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/daq_stim/optimize/__init__.py

@@ -5,7 +5,7 @@ from itertools import groupby
 from operator import attrgetter
 from typing import List
 
-from pyxcp.cpp_ext import McObject
+from pyxcp.cpp_ext.cpp_ext import McObject
 
 
 def make_continuous_blocks(chunks: List[McObject], upper_bound=None, upper_bound_initial=None) -> List[McObject]:

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/daq_stim/optimize/binpacking.py

@@ -3,7 +3,7 @@
 """
 from typing import List, Optional
 
-from pyxcp.cpp_ext import Bin
+from pyxcp.cpp_ext.cpp_ext import Bin
 
 
 def first_fit_decreasing(items, bin_size: int, initial_bin_size: Optional[int] = None) -> List[Bin]:

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/examples/run_daq.py

@@ -22,23 +22,23 @@ if XCP_LITE:
             False,
             False,
             [
-                ("byteCounter", 0x203EA, 0, "U8"),
-                ("wordCounter", 0x203EC, 0, "U16"),
-                ("dwordCounter", 0x20410, 0, "U32"),
-                ("sbyteCounter", 0x203EB, 0, "I8"),
+                ("byteCounter", 0x00023648, 0, "U8"),
+                ("wordCounter", 0x0002364C, 0, "U16"),
+                ("dwordCounter", 0x00023650, 0, "U32"),
+                ("sbyteCounter", 0x00023649, 0, "I8"),
             ],
         ),
         DaqList(
             "part_2",
-            0,
+            7,
             False,
             False,
             [
-                ("swordCounter", 0x20414, 0, "I16"),
-                ("sdwordCounter", 0x20418, 0, "I32"),
-                ("channel1", 0x203F8, 0, "F64"),
-                ("channel2", 0x20400, 0, "F64"),
-                ("channel3", 0x20408, 0, "F64"),
+                ("swordCounter", 0x00023654, 0, "I16"),
+                ("sdwordCounter", 0x00023658, 0, "I32"),
+                ("channel1", 0x00023630, 0, "F64"),
+                ("channel2", 0x00023638, 0, "F64"),
+                ("channel3", 0x00023640, 0, "F64"),
             ],
         ),
     ]
@@ -117,8 +117,8 @@ else:
         ),
     ]
 
-# daq_parser = DaqToCsv(DAQ_LISTS)  # Record to CSV file(s).
-daq_parser = DaqRecorder(DAQ_LISTS, "run_daq", 2)  # Record to ".xmraw" file.
+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()
@@ -127,12 +127,14 @@ with ap.run(policy=daq_parser) as x:
 
     x.cond_unlock("DAQ")  # DAQ resource is locked in many cases.
 
+    DAQ_LISTS[1].event_num = 0
+
     print("setup DAQ lists.")
     daq_parser.setup()  # Execute setup procedures.
     print("start DAQ lists.")
     daq_parser.start()  # Start DAQ lists.
 
-    time.sleep(15.0 * 60.0)  # Run for 15 minutes.
+    time.sleep(5.0 * 60.0)  # Run for 15 minutes.
 
     print("Stop DAQ....")
     daq_parser.stop()  # Stop DAQ lists.

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/transport/base.py

@@ -5,11 +5,10 @@ from collections import deque
 from typing import Any, Dict, Optional, Set, Type
 
 import pyxcp.types as types
-
-from ..cpp_ext import Timestamp, TimestampType
-from ..recorder import XcpLogFileWriter
-from ..timing import Timing
-from ..utils import (
+from pyxcp.cpp_ext.cpp_ext import Timestamp, TimestampType
+from pyxcp.recorder import XcpLogFileWriter
+from pyxcp.timing import Timing
+from pyxcp.utils import (
     CurrentDatetime,
     flatten,
     hexDump,

{pyxcp-0.22.12 → pyxcp-0.22.14}/pyxcp/utils.py

@@ -9,7 +9,7 @@ from time import perf_counter, sleep
 import chardet
 import pytz
 
-from pyxcp.cpp_ext import TimestampInfo
+from pyxcp.cpp_ext.cpp_ext import TimestampInfo
 
 
 def hexDump(arr):

pyxcp-0.22.12/pyxcp/cpp_ext/__init__.py

@@ -1,8 +0,0 @@
-from .cpp_ext import (  # noqa: F401
-    Bin,
-    DaqList,
-    McObject,
-    Timestamp,
-    TimestampInfo,
-    TimestampType,
-)