pyxcp 0.22.2__cp311-cp311-win_amd64.whl → 0.22.8__cp311-cp311-win_amd64.whl

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.2"
+__version__ = "0.22.8"

pyxcp/recorder/unfolder.hpp

@@ -7,6 +7,7 @@
 #include <charconv>
 #include <cstring>
 #include <iostream>
+#include <limits>
 #include <map>
 #if __has_include(<stdfloat>)
     #include <stdfloat>
@@ -637,6 +638,33 @@ struct MeasurementParameters {
         return m_first_pids;
     }
 
+#undef max  // Thanks to Windows.
+
+    auto get_overflow_value() const {
+        std::uint64_t ov_value{};
+        switch (m_ts_size) {
+            case 1:
+                ov_value = std::numeric_limits<std::uint8_t>::max();
+                break;
+            case 2:
+                ov_value = std::numeric_limits<std::uint16_t>::max();
+                break;
+            case 4:
+                ov_value = std::numeric_limits<std::uint32_t>::max();
+                break;
+//            case 8:
+//                ov_value = std::numeric_limits<std::uint64_t>::max() + 1;
+//                break;
+            default:
+                throw std::runtime_error("Invalid timestamp size");
+        }
+        ov_value++;
+        std::cout << "TS-V: " << ov_value << " scale: " << m_ts_scale_factor << std::endl;
+        ov_value = static_cast<std::uint64_t>(ov_value * m_ts_scale_factor);
+        std::cout << "OVRF-Value: " << ov_value << std::endl;
+        return ov_value;
+    }
+
     std::uint8_t               m_byte_order;
     std::uint8_t               m_id_field_size;
     bool                       m_timestamps_supported;
@@ -1050,6 +1078,9 @@ class DAQPolicyBase {
     }
 
     virtual void set_parameters(const MeasurementParameters& params) noexcept {
+        m_overflow_value = params.get_overflow_value();
+        m_overflow_counter = 0ULL;
+        std::cout << "Overflow value: " << m_overflow_value << ", Overflow counter: " << m_overflow_counter << std::endl;
         initialize();
     }
 
@@ -1058,6 +1089,9 @@ class DAQPolicyBase {
     virtual void initialize() = 0;
 
     virtual void finalize() = 0;
+ private:
+    std::uint64_t m_overflow_value{};
+    std::uint64_t m_overflow_counter{};
 };
 
 class DaqRecorderPolicy : public DAQPolicyBase {
@@ -1164,6 +1198,38 @@ struct ValueHolder {
     std::any m_value;
 };
 
+class Overflow {
+public:
+
+    Overflow(std::uint64_t overflow_value) : m_overflow_value(overflow_value), m_overflow_counter(0ULL), m_previous_timestamp(0ULL) {
+    }
+
+    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++;
+    }
+
+    auto get_overflow_counter() const noexcept {
+        return m_overflow_counter;
+    }
+
+    auto get_value() const noexcept {
+        return 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{};
+};
+
 class XcpLogFileDecoder {
    public:
 
@@ -1172,6 +1238,11 @@ class XcpLogFileDecoder {
         if (metadata != "") {
             auto des  = Deserializer(metadata);
             m_params  = des.run();
+
+            for (auto idx=0; idx < m_params.get_daq_lists().size(); ++idx) {
+                m_overflows.emplace_back(Overflow(m_params.get_overflow_value()));
+            }
+
             m_decoder = std::make_unique<DAQProcessor>(m_params);
         } else {
             // cannot proceed!!!
@@ -1215,7 +1286,18 @@ class XcpLogFileDecoder {
                 auto result = m_decoder->feed(timestamp, str_data);
                 if (result) {
                     const auto& [daq_list, ts0, ts1, meas] = *result;
-                    on_daq_list(daq_list, ts0, ts1, meas);
+
+                    auto& overflow = m_overflows[daq_list];
+
+                    if (overflow.get_previous_timestamp() > 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, ts0, ts1 + overflow.get_value(), meas);
+
+                    overflow.set_previous_timestamp(ts1);
                 }
             }
         }
@@ -1244,6 +1326,7 @@ class XcpLogFileDecoder {
     XcpLogFileReader              m_reader;
     std::unique_ptr<DAQProcessor> m_decoder;
     MeasurementParameters         m_params;
+    std::vector<Overflow>           m_overflows;
 };
 
 #endif  // RECORDER_UNFOLDER_HPP

pyxcp/scripts/xcp_examples.py

@@ -0,0 +1,64 @@
+#!/usr/bin/env python
+
+"""
+Copy pyXCP examples to a given directory.
+"""
+
+import argparse
+import sys
+from pathlib import Path
+
+from pyxcp import console
+
+
+pyver = sys.version_info
+if pyver.major == 3 and pyver.minor <= 9:
+    import pkg_resources
+
+    def copy_files_from_package(package_name: str, source_directory: str, args: argparse.Namespace) -> None:
+        destination_directory = args.output_directory
+        force = args.force
+        for fn in pkg_resources.resource_listdir(package_name, source_directory):
+            source_file = Path(pkg_resources.resource_filename(package_name, f"{source_directory}/{fn}"))
+            if source_file.suffix == ".py":
+                dest_file = Path(destination_directory) / fn
+                if dest_file.exists() and not force:
+                    console.print(f"[white]Destination file [blue]{fn!r} [white]already exists. Skipping.")
+                    continue
+                console.print(f"[blue]{source_file} [white]==> [green]{dest_file}")
+                data = source_file.read_text(encoding="utf-8")
+                dest_file.parent.mkdir(parents=True, exist_ok=True)
+                dest_file.write_text(data, encoding="utf-8")
+
+else:
+    import importlib.resources
+
+    def copy_files_from_package(package_name: str, source_directory: str, args: argparse.Namespace) -> None:
+        destination_directory = args.output_directory
+        force = args.force
+        for fn in importlib.resources.files(f"{package_name}.{source_directory}").iterdir():
+            if fn.suffix == ".py":
+                data = fn.read_text(encoding="utf-8")
+                dest_file = Path(destination_directory) / fn.name
+                if dest_file.exists() and not force:
+                    console.print(f"[white]Destination file [blue]{fn.name!r} [white]already exists. Skipping.")
+                    continue
+                console.print(f"[blue]{fn} [white]==> [green]{dest_file}")
+                dest_file.parent.mkdir(parents=True, exist_ok=True)
+                dest_file.write_text(data, encoding="utf-8")
+
+
+def main():
+    parser = argparse.ArgumentParser(description=__doc__)
+
+    parser.add_argument("output_directory", metavar="output_directory", type=Path, help="output directory")
+
+    parser.add_argument("-f", "--force", action="store_true", help="overwrite existing files.")
+
+    args = parser.parse_args()
+    print("Copying pyXCP examples...\n")
+    copy_files_from_package("pyxcp", "examples", args)
+
+
+if __name__ == "__main__":
+    main()

pyxcp/transport/sxi.py

@@ -109,7 +109,7 @@ class SxI(BaseTransport):
         while True:
             if self.closeEvent.is_set():
                 return
-            if not self.comm_port.in_waiting():
+            if not self.comm_port.in_waiting:
                 continue
 
             recv_timestamp = self.timestamp.value
@@ -129,5 +129,5 @@ class SxI(BaseTransport):
         self.post_send_timestamp = self.timestamp.value
 
     def close_connection(self) -> None:
-        if hasattr(self, "comm_port") and self.comm_port.is_open() and not self.has_user_supplied_interface:
+        if hasattr(self, "comm_port") and self.comm_port.is_open and not self.has_user_supplied_interface:
             self.comm_port.close()

{pyxcp-0.22.2.dist-info → pyxcp-0.22.8.dist-info}/METADATA

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

{pyxcp-0.22.2.dist-info → pyxcp-0.22.8.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=dWd-0mhqqHeqKqaSDFeRYxEgUTCGlD8QC6kUYKoIrb4,547
+pyxcp/__init__.py,sha256=U-rXeTf4QzBHk-d_dEPJjgDiScf1TRpEvDl8-vejXIM,547
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=EJYwe3Z3H24vyWAa6lUgcdKnQY8pwFxjyCN6ZU1ST8w,1509
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=NCUnCUEEgRbZYSLGtUGwL2e7zJ8hrp0SbmLHGv8uY58,612
@@ -24,10 +24,10 @@ pyxcp/constants.py,sha256=9yGfujC0ImTYQWfn41wyw8pluJTSrhMGWIVeIZTgsLg,1160
 pyxcp/cpp_ext/__init__.py,sha256=iCsEqSZQIsaNSjQkgTp-DKvOCkRtV6QOydnSUDx5jVk,136
 pyxcp/cpp_ext/bin.hpp,sha256=PwJloZek21la-RBSda2Hc0u_6gID0sfTduPeplaAyR4,2561
 pyxcp/cpp_ext/blockmem.hpp,sha256=ysaJwmTWGTfE54Outk3gJYOfAVFd_QaonBMtXLcXwCc,1242
-pyxcp/cpp_ext/cpp_ext.cp310-win_amd64.pyd,sha256=tOAKbuG3lEU2tB1qa8qdyT5BaZMHwevOJZM7_KZFocg,268288
-pyxcp/cpp_ext/cpp_ext.cp311-win_amd64.pyd,sha256=JeOL-R8ep4MkqT9myBgPnPHF0QtbVPidNwLc8QfmB5E,270336
-pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=VEKqOdMfTgJtql7AzV02MvnIVnzMcuiG9SkLQndPUQs,268288
-pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=8x9Qi2NfQlFE7rrizE03LlYmtkqccp46NkWWTszL_3c,250880
+pyxcp/cpp_ext/cpp_ext.cp310-win_amd64.pyd,sha256=Ty4RoQrpJF8KbTuHbGCG0GAU2TEugQaECYMq5nrMiQk,273920
+pyxcp/cpp_ext/cpp_ext.cp311-win_amd64.pyd,sha256=ciUVzvCe1v8Lx5z24PDqCrSYeGBsVQV1PcjYqWTKtkA,276480
+pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=CbLeNvyOb2VG-0BurZJfewoV4cerrNpKEPQTKR7pM3U,273920
+pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=gkLRVZ9JENr9blmv5MKHx1t-dKhrjOA0gNhwyZqvBBk,256512
 pyxcp/cpp_ext/daqlist.hpp,sha256=sgqodW4vnN82s05mFyXQnpQox4KR3VDhP5FB_VhsmQc,7075
 pyxcp/cpp_ext/event.hpp,sha256=Z-1yxsEKsr81NnLVEWJ2ANA8FV7YsM7EbNxaw-elheE,1200
 pyxcp/cpp_ext/extension_wrapper.cpp,sha256=3vEo7PljGHw6w1mNB08jHe4B6CMSg0jCWPJucpmhmDw,4438
@@ -39,10 +39,10 @@ pyxcp/daq_stim/optimize/__init__.py,sha256=E4HzY8P0aeegNgu71hUcbL-yR6Fzg5PGe8PSi
 pyxcp/daq_stim/optimize/binpacking.py,sha256=zTNjpt91MnGW5ha9Z07hQtuoJ7tspyRwRlLYbE6GMGs,1249
 pyxcp/daq_stim/scheduler.cpp,sha256=a7VK7kP2Hs8yMlcDAkXwJ0bH88lr_yz156sphcHS7Z4,715
 pyxcp/daq_stim/scheduler.hpp,sha256=U_6tUbebmzX5vVZS0EFSgTaPsyxMg6yRXHG_aPWA0x4,1884
-pyxcp/daq_stim/stim.cp310-win_amd64.pyd,sha256=CDzLe0700zMhIViduzFyuIYqWEJQyeUhdRZcPAjSydY,181248
-pyxcp/daq_stim/stim.cp311-win_amd64.pyd,sha256=chIGiox6ct6XBjFHGMt2jR31p1LH9QmQoQLpnI0rIvg,183808
-pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=9ETHV6JKdEAhUy5Np4EWUYdGPfG2q5sDNaj1hR1Cxxc,181248
-pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=Ui-1OGZyWEC8J2fNptVWztxbJL0vt0KGzCb0nsi46w4,175104
+pyxcp/daq_stim/stim.cp310-win_amd64.pyd,sha256=lHFzlfWynww-VU6gO-vJYO-aDPeEoVw-LssJ1UYqLq0,186880
+pyxcp/daq_stim/stim.cp311-win_amd64.pyd,sha256=9cCCa56D9bZOBpIonPOnqH0G4PrQHXiEZryqFR3a3Cw,189440
+pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=CMzj7jyJ72v66aqw3GoMMl9wE9O6YrMAZrY1B3XZjTE,186880
+pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=rsq112DVYvzSAl4oV4GCtACvXBAr__glgmtGs8LLm2A,181248
 pyxcp/daq_stim/stim.cpp,sha256=F2OG67W4KKwTTiUCxm-9egIv3TLFdOkRunX6xf7YOtc,177
 pyxcp/daq_stim/stim.hpp,sha256=U-uInRrA6OCdMl1l1SWbQ_KEPpnNYrWut924IvbW6R0,18508
 pyxcp/daq_stim/stim_wrapper.cpp,sha256=5LbWkK86h_4mHd83dnwCU7BRvVYit8ijxBMT7pthtOE,1830
@@ -87,19 +87,20 @@ pyxcp/recorder/mio.hpp,sha256=5ASJLKSEykH0deAQD5uak-_yAgd5p2n8t06315GSGrg,63346
 pyxcp/recorder/reader.hpp,sha256=qbz-LFg87h4yLaGiv_8zP-95UebbwICei0tvgHu6uII,5190
 pyxcp/recorder/reco.py,sha256=6N6FIwfCEVMpi5dr3eUOQa1lowcg2LCnS_sy_-b-UiQ,8725
 pyxcp/recorder/recorder.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyxcp/recorder/rekorder.cp310-win_amd64.pyd,sha256=GJ8vjxZgdGPCPQmEwbh6Tt6aMpcXAf8zlEgz3gvBRf4,370176
-pyxcp/recorder/rekorder.cp311-win_amd64.pyd,sha256=qA2puY2O0bpsnXnLYq91RAEPQIvoeiOmLgYKEgKFI00,371712
-pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=qZ4YHhO4l7YhhiyOF3b-IS9eCwdYXypZrtWoJAI6o40,369664
-pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=nTXGO-1YyrtzXJpx02c5ZaIUcCL02ssk6ctXIz18eME,356352
+pyxcp/recorder/rekorder.cp310-win_amd64.pyd,sha256=nf82Ajn-gShv1tvZVItg4o1dRKSkZDZf2np5j_wXnVg,378880
+pyxcp/recorder/rekorder.cp311-win_amd64.pyd,sha256=tDdihMCmKWjp0Tp092r7zvwk1ztAMbG-Mug8Tb8pucU,380416
+pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=4Wq1cgT0RVqyXNwfrE195LI-u3OxUXMCzMxYl89_twU,378368
+pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=End-lUEkXt7aYi08zGP1t8hD26vzUIHjqPeN1fnGwzo,364032
 pyxcp/recorder/rekorder.cpp,sha256=U0LMyk8pZXx9emgS_WPVthvn_9IpgE7JGrh4kg-8CX4,1900
 pyxcp/recorder/rekorder.hpp,sha256=sWvRch9bVt6mmgrFHp5mwWhap7HoFG4geeb7UqEIzio,7638
 pyxcp/recorder/setup.py,sha256=_99XFPQAd5V4LcJaSGJwdnbxgxJ7kl8DEXfHsnKO1Yg,998
 pyxcp/recorder/test_reko.py,sha256=M8lfKBmBUl-28IMVoD6lU5Bnorz7fYFOvcAjfVZxuXA,1014
-pyxcp/recorder/unfolder.hpp,sha256=KrzZqXJgCr9tXD7k-2tWq1GT-A3SoThug4jyF4WLDWU,45177
+pyxcp/recorder/unfolder.hpp,sha256=1DOjH3YlExYtJfQpmnyxWiQTgM87ON59tNlhC6o2ACE,48082
 pyxcp/recorder/wrap.cpp,sha256=S3frBevIrPE5m3kt_mXe9TDOwWPJFiVa7Rt9FGMCv2A,8909
 pyxcp/recorder/writer.hpp,sha256=rNjtRTtJes5z-BzKR2K56P_Kvc9MEVQgycu8J0wKf1g,11284
 pyxcp/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/scripts/pyxcp_probe_can_drivers.py,sha256=P_gscDTAofbSVA_Wd1GATrnyWGTf1-Dz_oPdlRFfjuk,567
+pyxcp/scripts/xcp_examples.py,sha256=q2wNXHVZu4GjcIlZwp2j9Sqm5QH39Olro4BQaLoIqiM,2583
 pyxcp/scripts/xcp_fetch_a2l.py,sha256=72818jdJiLsDuWWfkAPxekZ7fzRRz_A4RVSy06LQNe4,1239
 pyxcp/scripts/xcp_id_scanner.py,sha256=2P53qrvM-rYFTBbbm7eAKyOxESkKrorieND-KoZZ9mo,421
 pyxcp/scripts/xcp_info.py,sha256=pjI7EaT7I47b16VyFnrCxWtRjzmCO4HmVPdc0Q2YpvI,3945
@@ -120,15 +121,15 @@ pyxcp/transport/base.py,sha256=MQwdDpff34YOHyabP-NdV1Jq-w2umXMSMSNdc4nMGDU,16281
 pyxcp/transport/base_transport.hpp,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/transport/can.py,sha256=cQ8lrwBL7Ar0GSf48987TztR9wqYS_UnXUngzhaHXe0,14909
 pyxcp/transport/eth.py,sha256=xPzN2oSALoPKJVvZpBljPSV1AxfpjRusOzymO-TD1Rw,8711
-pyxcp/transport/sxi.py,sha256=_r1aEeMVy1tNPVStHH0iaaHTqnC-Uy3FwWDrYpeByI8,4699
+pyxcp/transport/sxi.py,sha256=vM8WZIKuu_dNuqkxZM_1n6iQkQCCzo4ykWpiG6ba8Fk,4695
 pyxcp/transport/transport_wrapper.cpp,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/transport/usb_transport.py,sha256=JuYrwkWsUdibdVNA57LBEQT3a3ykOgWPdWcfqj96nDE,8343
 pyxcp/types.py,sha256=hY4Bb3qT3ZoabGnSKLY6S84MvVyuOCxwVONfs2skx2Y,26043
 pyxcp/utils.py,sha256=tujhw__jUSVIljHfHekN-nzERXC_1orVRBGKNyGqBuo,2961
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=7Gnhvr79geMeqqGVIJPxODXGwABdNDinnqzhpooN5TE,2306
-pyxcp-0.22.2.dist-info/entry_points.txt,sha256=hGDdVkAmhSdsUN_p1aIuhchORwtzkBIQ-HhPUfttXBs,262
-pyxcp-0.22.2.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.22.2.dist-info/METADATA,sha256=0sffU2Eh2iGMohh8qCBicPAbz69-5QJpQz_1YoYAdVs,4075
-pyxcp-0.22.2.dist-info/WHEEL,sha256=-FZBVKyKauScY3vLa8vJR6hBCpAJfFykw2MOwlNKr1g,98
-pyxcp-0.22.2.dist-info/RECORD,,
+pyxcp-0.22.8.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
+pyxcp-0.22.8.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.22.8.dist-info/METADATA,sha256=Q12PIGTD3wxIYuDFBDn5PmwOVIHtbkVA4pylr2MKvt8,4075
+pyxcp-0.22.8.dist-info/WHEEL,sha256=-FZBVKyKauScY3vLa8vJR6hBCpAJfFykw2MOwlNKr1g,98
+pyxcp-0.22.8.dist-info/RECORD,,

{pyxcp-0.22.2.dist-info → pyxcp-0.22.8.dist-info}/entry_points.txt

@@ -1,5 +1,6 @@
 [console_scripts]
 pyxcp-probe-can-drivers=pyxcp.scripts.pyxcp_probe_can_drivers:main
+xcp-examples=pyxcp.scripts.xcp_examples:main
 xcp-fetch-a2l=pyxcp.scripts.xcp_fetch_a2l:main
 xcp-id-scanner=pyxcp.scripts.xcp_id_scanner:main
 xcp-info=pyxcp.scripts.xcp_info:main