pyxcp 0.22.11__cp39-cp39-win_amd64.whl → 0.22.13__cp39-cp39-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.11"
+__version__ = "0.22.13"

pyxcp/config/__init__.py

@@ -932,11 +932,11 @@ class PyXCP(Application):
             self.subapp.start()
             exit(2)
         else:
-            self._read_configuration(self.config_file)
             if logging.getLogger().hasHandlers():
                 self.log = logging.getLogger()
             else:
                 self._setup_logger()
+            self._read_configuration(self.config_file)
 
     def _setup_logger(self):
         from pyxcp.types import Command

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/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/recorder/reader.hpp

@@ -33,11 +33,11 @@ class XcpLogFileReader {
         if (detail::VERSION != m_header.version) {
             throw std::runtime_error("File version mismatch.");
         }
-
+#if 0
         if (m_header.num_containers < 1) {
             throw std::runtime_error("At least one container required.");
         }
-
+#endif
         m_offset += detail::FILE_HEADER_SIZE;
 
         if ((m_header.options & XMRAW_HAS_METADATA) == XMRAW_HAS_METADATA) {

pyxcp/recorder/unfolder.hpp

@@ -640,9 +640,11 @@ struct MeasurementParameters {
 
 #undef max  // Thanks to Windows.
 
-    auto get_overflow_value() const {
+    auto get_overflow_value() const -> std::uint64_t {
         std::uint64_t ov_value{};
         switch (m_ts_size) {
+            case 0:
+                return 0ULL;
             case 1:
                 ov_value = std::numeric_limits<std::uint8_t>::max();
                 break;
@@ -659,9 +661,7 @@ struct MeasurementParameters {
                 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;
     }
 
@@ -1080,7 +1080,7 @@ 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;
+        // std::cout << "Overflow value: " << m_overflow_value << ", Overflow counter: " << m_overflow_counter << std::endl;
         initialize();
     }
 

pyxcp/transport/base.py

@@ -82,10 +82,9 @@ class LegacyFrameAcquisitionPolicy(FrameAcquisitionPolicy):
         }
 
     def feed(self, frame_type: types.FrameCategory, counter: int, timestamp: int, payload: bytes) -> None:
-        # print(f"{frame_type.name:8} {counter:6}  {timestamp:7.7f} {hexDump(payload)}")
         if frame_type not in self.filtered_out:
             queue = self.QUEUE_MAP.get(frame_type)
-            if queue:
+            if queue is not None:
                 queue.append((counter, timestamp, payload))
 
 
@@ -118,7 +117,7 @@ class StdoutPolicy(FrameAcquisitionPolicy):
 
     def feed(self, frame_type: types.FrameCategory, counter: int, timestamp: int, payload: bytes) -> None:
         if frame_type not in self.filtered_out:
-            print(f"{frame_type.name:8} {counter:6}  {timestamp:8u} {hexDump(payload)}")
+            print(f"{frame_type.name:8} {counter:6}  {timestamp:8d} {hexDump(payload)}")
 
 
 class EmptyFrameError(Exception):
@@ -210,7 +209,12 @@ class BaseTransport(metaclass=abc.ABCMeta):
 
     @property
     def start_datetime(self) -> int:
-        """"""
+        """datetime of program start.
+
+        Returns
+        -------
+        int
+        """
         return self._start_datetime
 
     def start_listener(self):

{pyxcp-0.22.11.dist-info → pyxcp-0.22.13.dist-info}/METADATA

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

{pyxcp-0.22.11.dist-info → pyxcp-0.22.13.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=qJTsh51O0ValCtABif9KgajJOlsCAiM3d_LNOJ8tu5w,548
+pyxcp/__init__.py,sha256=bK9iNXRraD7dKqK9O3rPHDGnMLdrho8jBVm4uS70WBc,548
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=EJYwe3Z3H24vyWAa6lUgcdKnQY8pwFxjyCN6ZU1ST8w,1509
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=NCUnCUEEgRbZYSLGtUGwL2e7zJ8hrp0SbmLHGv8uY58,612
@@ -18,17 +18,17 @@ pyxcp/asamkeydll.c,sha256=dVEvU0S1kgIo62S0La-T8xHSw668LM_DYc_fiQ0No6g,2952
 pyxcp/asamkeydll.sh,sha256=DC2NKUMwvi39OQgJ6514Chr4wc1LYbTmQHmMq9jAHHs,59
 pyxcp/checksum.py,sha256=alze1JiZ2JmdRul9QzP_-fuAqJcNyYBbo35zBwEKqHk,11535
 pyxcp/cmdline.py,sha256=uSbCtKtQT0JQxMhcoUUx_UJ1nMUILMWckEQGe_tNxXk,1496
-pyxcp/config/__init__.py,sha256=BWrmH3kdVk4__z2eU-3EKuYtXB7bxcSq2K1sWUYtQXo,41954
+pyxcp/config/__init__.py,sha256=Vv0CPXg6hDftPRMmiv845KqcksZPlBqJMmmyWyrH-Vs,41954
 pyxcp/config/legacy.py,sha256=4QdDheX8DbBKv5JVT72_C_cjCgKvZmhN3tJ6hsvBEtI,5220
 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.cp38-win_amd64.pyd,sha256=LTqT6LndI9cL27VjSyDRWaJodSPN9ul798F4diZ-mL8,278016
-pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=MiCjOjgtrrx5phVWpoyPHLqperKQ7whWY4PBfK1-aDw,259584
-pyxcp/cpp_ext/daqlist.hpp,sha256=sgqodW4vnN82s05mFyXQnpQox4KR3VDhP5FB_VhsmQc,7075
+pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=KTZN0uMykiqUOA_qHwyQuCf2OtXMIXRqJTxnnwQOJyE,279040
+pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=oESVot3qiUVTeMs0Fu4gUaswOFMPBZEgeDG2lg8eZQc,260096
+pyxcp/cpp_ext/daqlist.hpp,sha256=5JEYQK96qac4ZsoMVnmVGsrH_4uuqbHwcNGiH4j5FAU,7167
 pyxcp/cpp_ext/event.hpp,sha256=Z-1yxsEKsr81NnLVEWJ2ANA8FV7YsM7EbNxaw-elheE,1200
-pyxcp/cpp_ext/extension_wrapper.cpp,sha256=5ZUYLt87SEAZUzuBkBl7N0eXXBOVq_aZvlNdpVgmy4o,4528
+pyxcp/cpp_ext/extension_wrapper.cpp,sha256=-r1YYgJD4dJiiMeA0HEmIQQfsXrzDozLonCrbpKUXiA,4544
 pyxcp/cpp_ext/helper.hpp,sha256=iAaqORQvZwnSX6gvbu5SJJp2MPmbnsM6d-t2L6KMAA4,7543
 pyxcp/cpp_ext/mcobject.hpp,sha256=A5GKcfjYMcfm3hfTQfFuS4JYNFTvfmzAcMXCe01GOs4,6429
 pyxcp/cpp_ext/tsqueue.hpp,sha256=FWMemzXNgV5dQ7gYmTCzC0QYfgl0VI9JCybYelBcCHU,1026
@@ -37,8 +37,8 @@ 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.cp38-win_amd64.pyd,sha256=QgOvk1Ff411UTO7a0C1hy_Q49ZEtbWAUqkecTp451Qg,186880
-pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=vYkA_iLZ7JVNnjaf2GmeDWIgSMu_JlAUMkoQloR2Axw,181248
+pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=NdQnwT2yoBbe5dj9FpeCO3VfJjjh27gTGIi0OvmvEL0,186880
+pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=G2tGFBhpYdLNRGI5Nh3dWsiX1xnGK9Sp5zPHDfLt_hQ,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
@@ -82,16 +82,16 @@ pyxcp/recorder/lz4.h,sha256=Kz_2V6kvOunNHoPl9-EqxWDVCvYXbU0J-pkSnCeXubs,46483
 pyxcp/recorder/lz4hc.c,sha256=E56iE5CQ6fhQIVi3qNpxiIIP2sTGeC80JtVPyhidV6Q,88870
 pyxcp/recorder/lz4hc.h,sha256=dtxPbesyAongP7CK_pL0M2DL707iMm9jGKrl8hXXRNk,20592
 pyxcp/recorder/mio.hpp,sha256=5ASJLKSEykH0deAQD5uak-_yAgd5p2n8t06315GSGrg,63346
-pyxcp/recorder/reader.hpp,sha256=qbz-LFg87h4yLaGiv_8zP-95UebbwICei0tvgHu6uII,5190
+pyxcp/recorder/reader.hpp,sha256=rr9XZ_ciL6eF2_xEqyt9XYNqTIze9ytAsnf8uYukO9U,5201
 pyxcp/recorder/reco.py,sha256=6N6FIwfCEVMpi5dr3eUOQa1lowcg2LCnS_sy_-b-UiQ,8725
 pyxcp/recorder/recorder.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=_1VnBqbPMV2pnCdJAFJbvwQvcMOWeGZCzLypwsN-haI,377856
-pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=4N4CqJdSlzQBLusSwg_n566FRo6M7JIUrYZwY8j3t44,364032
+pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=OakGVrzIk0gSHO8eZRjWIF0aXSthEdnsr1PN2YI1NBY,377856
+pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=qMuK4SgL393u_FaIDAHyvXBb97JbXIEg_UjzqU0n4U4,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=1DOjH3YlExYtJfQpmnyxWiQTgM87ON59tNlhC6o2ACE,48082
+pyxcp/recorder/unfolder.hpp,sha256=3gJKT2eMOZuT8o_M2NFLthdUIWd460vdwzlHaf-fQII,47998
 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
@@ -113,7 +113,7 @@ pyxcp/tests/test_transport.py,sha256=Qn2VjNRfYCU6DH8olVSBUCqb0zdAM9GlTbVBM99YxFQ
 pyxcp/tests/test_utils.py,sha256=SrURAFc_6jtHng3PSZ5gpqXzVBVuPoMPB0YNvOvaIE0,880
 pyxcp/timing.py,sha256=zE6qPqOuidg6saNt7_zmbQgufxL9Id6akVYhAtpweQc,1705
 pyxcp/transport/__init__.py,sha256=31PaQLj76n5pXr68aJRWcYfrxEYWWgYoe9f_w3jZxsc,438
-pyxcp/transport/base.py,sha256=MQwdDpff34YOHyabP-NdV1Jq-w2umXMSMSNdc4nMGDU,16281
+pyxcp/transport/base.py,sha256=EWevuuTht424_tgYnybU3Xh_jFAdBjdCcMTyU7u_gL4,16288
 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
@@ -124,8 +124,8 @@ 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.11.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
-pyxcp-0.22.11.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.22.11.dist-info/METADATA,sha256=0DJ5GVLdiuKA9LDdmtpy58xSLiImjhkHgqgmEisr6T8,4076
-pyxcp-0.22.11.dist-info/WHEEL,sha256=1IyMrlk0wO7UertYm7pyjf3m1sV0KDb8wW6mQlBtUog,96
-pyxcp-0.22.11.dist-info/RECORD,,
+pyxcp-0.22.13.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
+pyxcp-0.22.13.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.22.13.dist-info/METADATA,sha256=tMTI-W6wlzxx5kxPZcXbAekNr98DKG_h3s0mf2vIw1g,4076
+pyxcp-0.22.13.dist-info/WHEEL,sha256=zL2RsiyB_EeNq9bDnS65cCOuFnoUWWXPWqe16aj1r0k,96
+pyxcp-0.22.13.dist-info/RECORD,,

{pyxcp-0.22.11.dist-info → pyxcp-0.22.13.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 1.9.0
+Generator: poetry-core 1.9.1
 Root-Is-Purelib: false
 Tag: cp39-cp39-win_amd64