pyxcp 0.23.7__cp310-cp310-win_amd64.whl → 0.23.9__cp310-cp310-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.23.7"
+__version__ = "0.23.9"

pyxcp/examples/run_daq.py

@@ -129,8 +129,9 @@ 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_01092025_01", 8)  # Record to ".xmraw" file.
 
 with ap.run(policy=daq_parser) as x:
     try:
@@ -149,7 +150,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(15 * 60.0)  # Run for 15 minutes.
 
     print("Stop DAQ....")
     daq_parser.stop()  # Stop DAQ lists.

pyxcp/master/master.py

@@ -223,6 +223,10 @@ class Master:
             self.AG_unpack = self.DWORD_unpack
             self.slaveProperties.bytesPerElement = 4
             # self.connected = True
+        status = self.getStatus()
+        if status.sessionStatus.daqRunning:
+            # TODO: resume
+            self.startStopSynch(0x00)
         return result
 
     @wrapped

pyxcp/recorder/unfolder.hpp

@@ -1109,8 +1109,9 @@ class DaqRecorderPolicy : public DAQPolicyBase {
     }
 
     void feed(std::uint8_t frame_cat, std::uint16_t counter, std::uint64_t timestamp, const std::string& payload) override {
-        if (frame_cat != static_cast<std::uint8_t>(FrameCategory::DAQ)) {
+        if (frame_cat != static_cast<std::uint8_t>(FrameCategory::DAQ) || (!m_initialized)) {
             // Only record DAQ frames for now.
+			// also make sure policy is initialized.
             return;
         }
         m_writer->add_frame(frame_cat, counter, timestamp, static_cast<std::uint16_t>(payload.size()), payload.c_str());
@@ -1142,38 +1143,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; }
-
-    auto get_previous_timestamp() const noexcept {
-        return m_previous_timestamp;
-    }
-
-    void set_previous_timestamp(std::uint64_t timestamp) noexcept {
-        m_previous_timestamp = timestamp;
-    }
+    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";
+	}
 
-    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 +1204,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 +1281,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);
                 }
             }
         }

{pyxcp-0.23.7.dist-info → pyxcp-0.23.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: pyxcp
-Version: 0.23.7
+Version: 0.23.9
 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.7.dist-info → pyxcp-0.23.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=WX5r7dc_dsPzym0sxtX_i0yipNgLxAqy-cddYkfaMpA,547
+pyxcp/__init__.py,sha256=WImr9eP4aKnoAOiISEkdAgAXat53tNYUK5RPv5HWZrI,547
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=EJYwe3Z3H24vyWAa6lUgcdKnQY8pwFxjyCN6ZU1ST8w,1509
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=NCUnCUEEgRbZYSLGtUGwL2e7zJ8hrp0SbmLHGv8uY58,612
@@ -15,6 +15,7 @@ pyxcp/aml/XCPonUSB.aml,sha256=Xcu52ZckyuEX0v5rwYQxz8gJCAs4qyepXmd_bkCJVlA,4953
 pyxcp/asam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/asam/types.py,sha256=_gKcpBF5mon_SDWZBUW0PGBMcb37yrvhhEuk1wslg-s,2441
 pyxcp/asamkeydll.c,sha256=dVEvU0S1kgIo62S0La-T8xHSw668LM_DYc_fiQ0No6g,2952
+pyxcp/asamkeydll.exe,sha256=iK8izyxUe5JeE9TR7_8UU8p46fxu1BUkqx50j68NGUA,11264
 pyxcp/asamkeydll.sh,sha256=DC2NKUMwvi39OQgJ6514Chr4wc1LYbTmQHmMq9jAHHs,59
 pyxcp/checksum.py,sha256=hO2JW_eiO9I0A4eiqovMV9d_y5oidq_w8jKdAE4FeOo,11899
 pyxcp/cmdline.py,sha256=FrVp7G5ORj92h7LWPfoqAzdaoW2etiui5MvCN1F6cRw,2537
@@ -24,7 +25,7 @@ pyxcp/constants.py,sha256=9yGfujC0ImTYQWfn41wyw8pluJTSrhMGWIVeIZTgsLg,1160
 pyxcp/cpp_ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 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=frUoWNDkE0uLOZMwZeBC_vSElOE_7Kefr4_b0JqrbkA,288768
+pyxcp/cpp_ext/cpp_ext.cp310-win_amd64.pyd,sha256=LCiJWaq-wtY9tVYkp7hzrSQr3VeWYKfD7gYwgK8rnu4,288768
 pyxcp/cpp_ext/daqlist.hpp,sha256=g2hlxgoQorAGKHedZFZ0c2FQh1APMIA9sVB6M6hD_n8,7277
 pyxcp/cpp_ext/event.hpp,sha256=Z-1yxsEKsr81NnLVEWJ2ANA8FV7YsM7EbNxaw-elheE,1200
 pyxcp/cpp_ext/extension_wrapper.cpp,sha256=xFs3IcrvHPHA82-n11WPzt8HATGqcks02p84SjQ2BKM,4855
@@ -36,7 +37,7 @@ pyxcp/daq_stim/optimize/__init__.py,sha256=FUWK0GkNpNT-sUlhibp7xa2aSYpm6Flh5yA2w
 pyxcp/daq_stim/optimize/binpacking.py,sha256=Iltho5diKlJG-ltbmx053U2vOFRlCISolXK61T14l_I,1257
 pyxcp/daq_stim/scheduler.cpp,sha256=NuNkAz3Dv849f51_T36YPck2dl-YsdDdG-cozc7XN9U,1504
 pyxcp/daq_stim/scheduler.hpp,sha256=U_6tUbebmzX5vVZS0EFSgTaPsyxMg6yRXHG_aPWA0x4,1884
-pyxcp/daq_stim/stim.cp310-win_amd64.pyd,sha256=7S_7sOEaUTcKAPsGTxeHYR3rhspKGpASipzoA4H-brA,208896
+pyxcp/daq_stim/stim.cp310-win_amd64.pyd,sha256=mSiYMJ-d5avlKsvoUiwpj6DKhwxU8ie3_eYJAXPMB2E,208896
 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=iT2yxJ3LRG7HoYC1bwhM3tCAxF9X_HHierBNsLRmTJg,1995
@@ -51,7 +52,7 @@ pyxcp/examples/conf_nixnet.json,sha256=BvXPrljPGzaRTNPch3K0XfU3KSBP1sVDDNP7yY850
 pyxcp/examples/conf_socket_can.toml,sha256=gTacQGm0p6fhPCMWC3ScLq9Xj-xJmNbjNXkjO4o7r8k,269
 pyxcp/examples/conf_sxi.json,sha256=cXwNGoOpvqhdjXBQcE8lKgTs50wi9beosWKskZGJ-nI,158
 pyxcp/examples/conf_sxi.toml,sha256=t-XsgRljcMdj0f3_CGRT60c77LeQPNbjIT17YxDK3Yg,125
-pyxcp/examples/run_daq.py,sha256=T91EmIVC2CS7vU4IlCzNcxNzkD1AGOWmBGMXklR6g0w,5631
+pyxcp/examples/run_daq.py,sha256=Af_ZwVEv5KAJksPK2L0CimncwfNU1Tr0i3W5ID1aIRY,5667
 pyxcp/examples/xcp_policy.py,sha256=io9tS2W-7PvR8ZzU203KolFrDp67eorUlwNWvA4kC5k,1921
 pyxcp/examples/xcp_read_benchmark.py,sha256=zOG0Yrji10vA0vhHa27KK7zgc3JDpzXzXsFnIU4C_AM,956
 pyxcp/examples/xcp_skel.py,sha256=YXLQC8nn8aAwYSVuBGhr1dvmdMBjmO1Ee1w3e5sy16s,1159
@@ -61,7 +62,7 @@ pyxcp/examples/xcphello.py,sha256=TAFCRf9Cg5uc-WGaxdHHUS_hKYkWqt77-3j9gGG6GW8,26
 pyxcp/examples/xcphello_recorder.py,sha256=QHWJsq5h5CI9t5qEmMSorZyzirTpoXz4nzuKTMzbZCA,3409
 pyxcp/master/__init__.py,sha256=QQbkUJM1WQ-5p2MiNFYxLAmHhNsCQLzDp-S4aoOFxoA,318
 pyxcp/master/errorhandler.py,sha256=-h7agNj040It-rFVVUfzoSrPd7QfzhuMTtEPLV6Qi9I,19949
-pyxcp/master/master.py,sha256=fTthOPn-OMaxG7NNMpTXai0S3qNq9X-kC8Jj9fKZ8XA,79044
+pyxcp/master/master.py,sha256=C4MFu_mB55KK6JiyE0m49ms8e3kb-C_TkvikoCoMsr0,79191
 pyxcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/recorder/__init__.py,sha256=HA8U6V85vbgZNWyNvJlY8l77YeTO0tHWl3t1v9DvjkQ,2846
 pyxcp/recorder/build_clang.cmd,sha256=JvFngSnb28XcBGXxC6MGrcOCGYfahOIvHpgRpqbA6HQ,175
@@ -78,12 +79,12 @@ pyxcp/recorder/mio.hpp,sha256=5ASJLKSEykH0deAQD5uak-_yAgd5p2n8t06315GSGrg,63346
 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.cp310-win_amd64.pyd,sha256=HQAY2Yt3JAdxkOyif7C8FfcADRZEjW6R2JXSMzdK_vE,386560
+pyxcp/recorder/rekorder.cp310-win_amd64.pyd,sha256=ckxZq40r7-dbnkV-LXoaP4m6Om-LSpxk4vO3hrYMM0A,386560
 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=jKvjQs8VSVfsYRkLguV97Csde_Xbt8G-tGkuKnbaSqY,48763
+pyxcp/recorder/unfolder.hpp,sha256=DfjAkAlXZhhuE3FY4jQbK0GBlaPzBZqCEm3Auc0-YW0,48067
 pyxcp/recorder/wrap.cpp,sha256=T4cwpmjhYbr75Q3plQpJTkNLyKE4lL0W7GC-8QSURJ8,8666
 pyxcp/recorder/writer.hpp,sha256=rNjtRTtJes5z-BzKR2K56P_Kvc9MEVQgycu8J0wKf1g,11284
 pyxcp/scripts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -118,8 +119,8 @@ pyxcp/types.py,sha256=mjp3FhsTTbS3D5VuC-dfdbMql0lJwEfbZjf8a2pHi1o,26158
 pyxcp/utils.py,sha256=75j5W91l9gtz0bz8x6JsQxJY9Q3PiFgiyZtFaICabLU,3532
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=7Gnhvr79geMeqqGVIJPxODXGwABdNDinnqzhpooN5TE,2306
-pyxcp-0.23.7.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
-pyxcp-0.23.7.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.23.7.dist-info/METADATA,sha256=t_ndqpGCZ0vWyXI2tRS73YMxpWAS1Co6OXGEAXy1IxY,12718
-pyxcp-0.23.7.dist-info/WHEEL,sha256=o8axJuAMfp9HzdvPbN5KaulfU2ylxvJG0Bzz2VsvQHE,98
-pyxcp-0.23.7.dist-info/RECORD,,
+pyxcp-0.23.9.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
+pyxcp-0.23.9.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.23.9.dist-info/METADATA,sha256=KKZRladjwl9oGnbUyLaMsnLGa65Px9aQe_2uHaentWo,12718
+pyxcp-0.23.9.dist-info/WHEEL,sha256=o8axJuAMfp9HzdvPbN5KaulfU2ylxvJG0Bzz2VsvQHE,98
+pyxcp-0.23.9.dist-info/RECORD,,