pyxcp 0.23.6__tar.gz → 0.23.8__tar.gz

{pyxcp-0.23.6 → pyxcp-0.23.8}/CMakeLists.txt

@@ -123,4 +123,4 @@ ENDIF()
 install(TARGETS rekorder LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/recorder)
 install(TARGETS cpp_ext LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/cpp_ext)
 install(TARGETS stim LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/daq_stim)
-# install(TARGETS asamkeydll LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/)
+install(TARGETS asamkeydll RUNTIME DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp)

{pyxcp-0.23.6 → pyxcp-0.23.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyxcp
-Version: 0.23.6
+Version: 0.23.8
 Summary: Universal Calibration Protocol for Python
 License: LGPLv3
 Keywords: automotive,ecu,xcp,asam,autosar
@@ -39,7 +39,7 @@ Description-Content-Type: text/x-rst
 Readme
 ======
 
-.. image:: pyxcp_social.jpg
+.. image:: pyxcp_social.svg
     :align: center
 
 Reliable Python tooling for the ASAM MCD-1 XCP protocol (measurement,

{pyxcp-0.23.6 → pyxcp-0.23.8}/build_ext.py

@@ -107,22 +107,20 @@ def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
     debug = debug or get_env_bool("BUILD_DEBUG")
 
     cfg = "Debug" if debug else "Release"
-    print(f" BUILD-TYPE: {cfg!r}")
-
-    py_cfg = get_py_config()
-    # CIBW_ARCHS_LINUX: armv7l
-    cibw_archs_linux = os.environ.get("CIBW_ARCHS_LINUX")
-    if cibw_archs_linux:
-        cibw_archs_linux = cibw_archs_linux.split()
-        if "armv7l" in cibw_archs_linux:
-            print("*** Build on ARM/32!!!")
-    cmake_args = [
-        f"-DPython3_EXECUTABLE={py_cfg['exe']}",
-        f"-DPython3_INCLUDE_DIR={py_cfg['include']}",
-        f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
-    ]
-    if py_cfg["libdir"]:
-        cmake_args.append(f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}")
+    bits, linkage = platform.architecture()
+    print(f"Bits: {bits!r} Linkage: {linkage!r} Build-Type: {cfg!r}")
+
+    if bits == "32bit" and linkage == "ELF":
+        cmake_args = []
+    else:
+        py_cfg = get_py_config()
+        cmake_args = [
+            f"-DPython3_EXECUTABLE={py_cfg['exe']}",
+            f"-DPython3_INCLUDE_DIR={py_cfg['include']}",
+            f"-DCMAKE_BUILD_TYPE={cfg}",  # not used on MSVC, but no harm
+        ]
+        if py_cfg["libdir"]:
+            cmake_args.append(f"-DPython3_LIBRARY={str(Path(py_cfg['libdir']) / Path(py_cfg['library']))}")
 
     build_args = ["--config Release", "--verbose"]
     # cmake -DCMAKE_EXPORT_COMPILE_COMMANDS=1 /path/to/src

{pyxcp-0.23.6 → pyxcp-0.23.8}/docs/README.rst

@@ -1,7 +1,7 @@
 Readme
 ======
 
-.. image:: pyxcp_social.jpg
+.. image:: pyxcp_social.svg
     :align: center
 
 Reliable Python tooling for the ASAM MCD-1 XCP protocol (measurement,

{pyxcp-0.23.6 → pyxcp-0.23.8}/pyproject.toml

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

{pyxcp-0.23.6 → pyxcp-0.23.8}/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.23.6"
+__version__ = "0.23.8"

{pyxcp-0.23.6 → pyxcp-0.23.8}/pyxcp/examples/run_daq.py

@@ -130,7 +130,7 @@ 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 = DaqRecorder(DAQ_LISTS, "run_daq_02092025_01", 4)  # Record to ".xmraw" file.
 
 with ap.run(policy=daq_parser) as x:
     try:
@@ -149,7 +149,8 @@ with ap.run(policy=daq_parser) as x:
     print("start DAQ lists.")
     daq_parser.start()  # Start DAQ lists.
 
-    time.sleep(2.0 * 60.0 * 60.0)  # Run for 15 minutes.
+    time.sleep(2.0 * 60.0)
+    # time.sleep(2.0 * 60.0 * 60.0)  # Run for 15 minutes.
 
     print("Stop DAQ....")
     daq_parser.stop()  # Stop DAQ lists.

{pyxcp-0.23.6 → pyxcp-0.23.8}/pyxcp/recorder/unfolder.hpp

@@ -1142,38 +1142,30 @@ class DaqRecorderPolicy : public DAQPolicyBase {
 class DaqTimeTracker {
 public:
 
-    DaqTimeTracker(std::uint64_t overflow_value) : m_overflow_value(overflow_value), m_overflow_counter(0ULL), m_previous_timestamp(0ULL) { m_ts_base_set=false; m_ts0_base=0ULL; m_ts1_base=0ULL; }
+    DaqTimeTracker(std::uint64_t overflow_value) : m_overflow_value(overflow_value), m_overflow_counter(0ULL), m_previous_timestamp(0ULL) {
+		m_ts_base_set=false;
+		m_ts0_base=0ULL; m_ts1_base=0ULL;
+		//std::cout << "\tOverflow value: " << overflow_value << "\n";
+	}
 
-    auto get_previous_timestamp() const noexcept {
-        return m_previous_timestamp;
-    }
-
-    void set_previous_timestamp(std::uint64_t timestamp) noexcept {
-        m_previous_timestamp = timestamp;
-    }
-
-    void inc_overflow_counter() noexcept {
-        m_overflow_counter++;
-    }
+    std::pair<std::uint64_t,std::uint64_t> normalize(std::uint64_t ts0, std::uint64_t ts1) noexcept {
 
-    auto get_overflow_counter() const noexcept {
-        return m_overflow_counter;
-    }
+		if (m_previous_timestamp > ts1) {
+			m_overflow_counter++;
+		}
+		m_previous_timestamp = ts1;
 
-    auto get_value() const noexcept {
-        return m_overflow_value * m_overflow_counter;
-    }
-
-public:
-    std::pair<std::uint64_t,std::uint64_t> normalize(std::uint64_t ts0, std::uint64_t ts1) noexcept {
         if (!m_ts_base_set) {
             m_ts0_base = ts0;
             m_ts1_base = ts1;
             m_ts_base_set = true;
+			// std::cout << "\tSet ts0: " << ts0 << " ts1:" << ts1 << "\n";
         }
-        return {ts0 - m_ts0_base, ts1 - m_ts1_base};
+		// std::cout << "\t\tts0: " << ts0 << " Base: " << m_ts0_base << "  ts1: " << ts1 << " Base: " << m_ts1_base << "\n";
+        return {ts0 - m_ts0_base, (ts1 - m_ts1_base) + (m_overflow_value * m_overflow_counter) };
     }
 private:
+
     std::uint64_t m_overflow_value{};
     std::uint64_t m_overflow_counter{};
     std::uint64_t m_previous_timestamp{};
@@ -1211,19 +1203,11 @@ class DaqOnlinePolicy : public DAQPolicyBase {
         auto result = m_decoder->feed(timestamp, payload);
         if (result) {
             const auto& [daq_list, ts0, ts1, meas] = *result;
-
 			auto& overflow = m_overflows[daq_list];
 
             auto [norm_ts0, norm_ts1] = overflow.normalize(ts0, ts1);
 
-			if (overflow.get_previous_timestamp() > norm_ts1) {
-				overflow.inc_overflow_counter();
-            }
-
-			on_daq_list(daq_list, norm_ts0, norm_ts1 + overflow.get_value(), meas);
-
-			overflow.set_previous_timestamp(norm_ts1);
-
+			on_daq_list(daq_list, norm_ts0, norm_ts1, meas);
         }
     }
 
@@ -1296,20 +1280,11 @@ class XcpLogFileDecoder {
                 auto result = m_decoder->feed(timestamp, str_data);
                 if (result) {
                     const auto& [daq_list, ts0, ts1, meas] = *result;
-
                     auto& overflow = m_overflows[daq_list];
 
                     auto [norm_ts0, norm_ts1] = overflow.normalize(ts0, ts1);
 
-                    if (overflow.get_previous_timestamp() > norm_ts1) {
-                        overflow.inc_overflow_counter();
-                        // Maybe on debug-level?
-                        // std::cout << "Overflow detected, counter: " << overflow.get_overflow_counter() << " " << overflow.get_previous_timestamp() << " " << ts1 << std::endl;
-                    }
-
-                    on_daq_list(daq_list, norm_ts0, norm_ts1 + overflow.get_value(), meas);
-
-                    overflow.set_previous_timestamp(norm_ts1);
+                    on_daq_list(daq_list, norm_ts0, norm_ts1, meas);
                 }
             }
         }