pyxcp 0.23.7__cp311-cp311-macosx_11_0_arm64.whl → 0.23.9__cp311-cp311-macosx_11_0_arm64.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,30 +1,26 @@
-pyxcp-0.23.7.dist-info/RECORD,,
-pyxcp-0.23.7.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
-pyxcp-0.23.7.dist-info/WHEEL,sha256=X6-NY9fCWtbM4tHMrme4ihtrUdAQgjDgPOLr1IYsKV8,134
-pyxcp-0.23.7.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
-pyxcp-0.23.7.dist-info/METADATA,sha256=t_ndqpGCZ0vWyXI2tRS73YMxpWAS1Co6OXGEAXy1IxY,12718
 pyxcp/dllif.py,sha256=m4e-_dgDLCD6COU5W2LdeYUlib_Xxyxbh977bbS-VAU,3344
 pyxcp/checksum.py,sha256=aveS0z4vthLXABEFhTqELqFNi7LM6ZzDzq7dD5Xe9oo,11167
 pyxcp/asamkeydll.sh,sha256=iema12sub6qNE0xAuzwGtx0FmkdaaOKoXalhrtWVaa8,57
 pyxcp/asamkeydll.c,sha256=l5RHYcEPY_Q07G-W5IjCq0xci8YfUR-3uYt84OOkOJI,2836
 pyxcp/constants.py,sha256=Yemk_Gi_m78EEU0v-sdGCAodb9dv_vqP969IU3izA2M,1113
 pyxcp/cmdline.py,sha256=OVSO-X6JV1Si2tKZ1ar2gYbiqCTlTaj5jY-z6N2Vk3Q,2453
-pyxcp/__init__.py,sha256=0Lens5crznGTlhKtnOVYewjfcuUNvEEjr3r5kDcYeno,527
+pyxcp/__init__.py,sha256=3f5FNt7GeyC6oJ5XZRxitwjhfpMUwA_bKjk6ZF_qvQQ,527
 pyxcp/types.py,sha256=XJxJUh9bK5Urfia8IHVLJ-NFgQACYBd_n73L-AaeZts,25158
 pyxcp/timing.py,sha256=hzeQZ3P7ij_bfskoVMi10Iv5S4i_6TQYfnB8PXTX6c4,1645
 pyxcp/utils.py,sha256=cHb5RUNim90U1U_a4axRmfa2n_xhFdjqHoRBEODoscs,3404
 pyxcp/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/errormatrix.py,sha256=cYcsJ11Qm39DPuaR4BJ9fMpS3Hkphd_ezIQOKjI-pQE,44586
+pyxcp/asamkeydll,sha256=gN2rba8QriwZO9AZ_cUdmf8TS48P1vjonaaAN3bc9gk,50584
 pyxcp/asam/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/asam/types.py,sha256=V4wSCGI1pXn0EsBemDyaHTBgY2wkV_BeLShnDIGGgDE,2310
 pyxcp/daq_stim/stim.cpp,sha256=sABgEfbQlt5kXbzAsndyhaDFWRWTJw3jJlNfanIVrRs,164
 pyxcp/daq_stim/__init__.py,sha256=7Lly_Sn2SQljadGyY9pcDqTYNIkw8O_t7GVlCZDL2wQ,12171
 pyxcp/daq_stim/scheduler.cpp,sha256=2XW9PmxrJR8DfYMVszGwBX-KANVviwPcUNBvnjw5MlM,1443
 pyxcp/daq_stim/stim.hpp,sha256=1DwAhkY7XJN14aD2BxLJ4O1j4_a6RvpePIbAG1U8iOA,17904
-pyxcp/daq_stim/stim.cpython-310-darwin.so,sha256=pE7imb11QMYyQv8HTO54EmnJrS5GsocxWJJT5vCPHyw,237784
+pyxcp/daq_stim/stim.cpython-310-darwin.so,sha256=ciy3m3t6O2ijjYa190hWupKTv4NYSe6xs7EipP3FBFk,237816
 pyxcp/daq_stim/scheduler.hpp,sha256=H-kwyZBV3S8q6YlCq6OLUbaNXskyCOS4z3SRP32ikPY,1809
 pyxcp/daq_stim/stim_wrapper.cpp,sha256=7iL1-4BPavo5bfrph20Fvicn6HxGEZQqYLvdxniJBYU,1945
-pyxcp/daq_stim/stim.cpython-311-darwin.so,sha256=BH5vuWJS2JJsD1SBdfDSV-ze1_6YQ0ZHMzlukI4y3iE,237864
+pyxcp/daq_stim/stim.cpython-311-darwin.so,sha256=aahyParbpwhlB-BuKK1ZPOP8oiNfNFaserUsVLZ9XHE,237896
 pyxcp/daq_stim/optimize/__init__.py,sha256=joAKvAvlYQEi7VF2oVftn_ohgRO231wnc3e8fY231L4,2453
 pyxcp/daq_stim/optimize/binpacking.py,sha256=AZHABtAnzBVJ-MVUGLrxuAp_bAtv3C-gMxrXXXrgi-Y,1216
 pyxcp/transport/transport_wrapper.cpp,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -61,7 +57,7 @@ pyxcp/aml/XCPonUSB.aml,sha256=rPGduH-PE8-tBeELSm3vfkbf62uhlVP6gvJL0OvMclc,4847
 pyxcp/aml/ifdata_SxI.a2l,sha256=8rAB6HTTAuNlFSrkFpR7fUA702yN4rTTNkw-xspZNV0,303
 pyxcp/aml/XCPonFlx.aml,sha256=z58FMu6ZF4hVun8WBCuxvDrq6FZ_gj3tZM15G7E8Uvw,4647
 pyxcp/master/__init__.py,sha256=o3XB9GDwLiqh-KRFC9YTOd0EvxJXDpyrcVxebiwT934,309
-pyxcp/master/master.py,sha256=oft1aNYqmilFZ00ZI7aO5lPaxXg5-Act6ji23x3bc6U,76980
+pyxcp/master/master.py,sha256=4GTtu_SrALZev52sdEw5AYyDaJ3SWbM_XBG_FpS4NeA,77123
 pyxcp/master/errorhandler.py,sha256=7EftfxWYqRyXurJEZS8PAyXVHs_e4qV8uWsUOMuE2Ug,19402
 pyxcp/examples/xcp_read_benchmark.py,sha256=Hl0hrjV3FE-ivswvYOh0MsKiHnk03z7w8lQDYnvfeM8,918
 pyxcp/examples/conf_eth.toml,sha256=b6bKN-K07gMQHNj7yiyB-HKrkVtZREgPXS4ByQueBs4,190
@@ -74,7 +70,7 @@ pyxcp/examples/xcp_user_supplied_driver.py,sha256=Wyep2KhtcFC2GzZuJPj5ikSqWIWYsf
 pyxcp/examples/xcp_skel.py,sha256=F2g2C79jiYZl0cpRHfzWusfn1ZvodOS_r1Az6aknZL4,1110
 pyxcp/examples/xcp_unlock.py,sha256=vl2Zv7Z6EuBxI2ZxbGQK6-0tZBVqd72FZllsvIfuJ5w,652
 pyxcp/examples/xcphello.py,sha256=JK9U_QkFP0AwKlZK9lFB66GAqUDFRoXL3XMYO5EdRQQ,2550
-pyxcp/examples/run_daq.py,sha256=PMseqJBDnpRofvNQNl619qpJeAaKuzi3HzYuT5zvRN0,5468
+pyxcp/examples/run_daq.py,sha256=fLZSVtM__QkvTzXiGP4Tff79xwVNPCmVoLv89ff9c9I,5502
 pyxcp/examples/conf_socket_can.toml,sha256=JB9zHHaya2mDXf0zPY7zEKiBDX2chzBBRxt7h3LxxDk,257
 pyxcp/examples/conf_sxi.toml,sha256=r81OD0mCLk_h7vrN5MBJk0HFbiWi3bQZtFgFVrW6qcM,118
 pyxcp/examples/conf_can.toml,sha256=oGkZYgmcpPsJ6YKGELm6DqF-hNvokJHCq99LAqxCyso,351
@@ -93,7 +89,7 @@ pyxcp/recorder/recorder.rst,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/recorder/mio.hpp,sha256=emP4qMXTxOe1wRSkB_U0hgOVz4aMUgG5dqcCvNNkAjs,61632
 pyxcp/recorder/build_gcc.cmd,sha256=A1xt8AS7VZxjJq21VzX8cOT7wl9ap_AIXBWbcIEddCw,237
 pyxcp/recorder/writer.hpp,sha256=rNjtRTtJes5z-BzKR2K56P_Kvc9MEVQgycu8J0wKf1g,11284
-pyxcp/recorder/rekorder.cpython-310-darwin.so,sha256=r5_memGnoh681bRzU2tZqk1VRJSxXm1dQLwiktzwXCg,529936
+pyxcp/recorder/rekorder.cpython-310-darwin.so,sha256=987QuXdoVM-fEfqm8PNQZr25nDhhwwSIwfk36fKyVCk,529792
 pyxcp/recorder/lz4hc.c,sha256=GhoLtpQF6ViHkhQ_TaLw9UCzSB_MO-fdflgjR_xFFfM,86829
 pyxcp/recorder/lz4.h,sha256=BkRLAtxukE15Z2yO0Pjrq-n6hw5W6jkGFR5f14MzpEU,45604
 pyxcp/recorder/rekorder.cpp,sha256=LtN3Ud_pigNZ70gJ5-tyFJZN-3PMDVwqbbH694--TxQ,1841
@@ -103,14 +99,14 @@ pyxcp/recorder/reader.hpp,sha256=rr9XZ_ciL6eF2_xEqyt9XYNqTIze9ytAsnf8uYukO9U,520
 pyxcp/recorder/__init__.py,sha256=HA8U6V85vbgZNWyNvJlY8l77YeTO0tHWl3t1v9DvjkQ,2846
 pyxcp/recorder/test_reko.py,sha256=sIM_BBY9sq1ZUTawoxmDzdtd5qHPT9w6eVYZoY4iFik,980
 pyxcp/recorder/build_clang.cmd,sha256=vIWwC1zF_WChakjfj8VaUCN6X8HwyqvGgFRdUub1TtE,174
-pyxcp/recorder/rekorder.cpython-311-darwin.so,sha256=VEOHT-iR21oNMxq2GrwpHDGxsVpBu9lfJtBKi87EjRs,530080
+pyxcp/recorder/rekorder.cpython-311-darwin.so,sha256=-2w3n_6dM8kO8UiUUAkfy_bCHizGFuznoAhv2tazHrA,529936
 pyxcp/recorder/reco.py,sha256=SAO_XMKSBWHhdzxfkmV9ZoPvJjale4BGi8O9p5Sd_iE,8448
 pyxcp/recorder/setup.py,sha256=piwBqaIX6SY1CyjKlantmd3I_VS6rk56sELvmPguKNM,957
 pyxcp/recorder/rekorder.hpp,sha256=sWvRch9bVt6mmgrFHp5mwWhap7HoFG4geeb7UqEIzio,7638
 pyxcp/recorder/lz4hc.h,sha256=U_uN3Q2wIi3_dbEceJ16xHJZGotUiBTcnL6O5ARPi8M,20179
 pyxcp/recorder/lz4.c,sha256=k5b33lJ7yENd6cdWn7eZjlZUWoS088LYCMAjXAF3RTk,118145
 pyxcp/recorder/build_gcc.sh,sha256=uvMhL4faEJmhG_8rzSOxEBRRqrACC0kmZgaERN8GkUs,209
-pyxcp/recorder/unfolder.hpp,sha256=jKvjQs8VSVfsYRkLguV97Csde_Xbt8G-tGkuKnbaSqY,48763
+pyxcp/recorder/unfolder.hpp,sha256=DfjAkAlXZhhuE3FY4jQbK0GBlaPzBZqCEm3Auc0-YW0,48067
 pyxcp/recorder/converter/__init__.py,sha256=mqzH3jxGpFrtS2dHyfDLCYKeJycav3_-6z8svlI07eU,14452
 pyxcp/stim/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -123,6 +119,11 @@ pyxcp/cpp_ext/extension_wrapper.cpp,sha256=XHpMp0e1gNwAiNquAXuyd2fXnlqbEu5V7zCP_
 pyxcp/cpp_ext/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/cpp_ext/helper.hpp,sha256=ONAsVupIqqmNDp8bgGWS0TfSYeCFkk3kwwZbbqsh0HQ,7813
 pyxcp/cpp_ext/bin.hpp,sha256=0CatarJ7jFewlg9EIxsDPxC4wnORHutx-1PLHpf9iqw,2457
-pyxcp/cpp_ext/cpp_ext.cpython-311-darwin.so,sha256=fzNGtnJwuLv2Ner1sg8quHySZ5yh4SqjHM0-I8oHqP8,321600
+pyxcp/cpp_ext/cpp_ext.cpython-311-darwin.so,sha256=82Sn7HnIHykqhK8Any97PvcZiUbrA4XMVbG0ExGHRJ0,321424
 pyxcp/cpp_ext/daqlist.hpp,sha256=Q1Gejo8i1rP2PzyUh4UHJ2z-kG0WNnkbBj7N8DAdzaM,7071
-pyxcp/cpp_ext/cpp_ext.cpython-310-darwin.so,sha256=5sPtzwLXzXBbJ2zI2kGk0gF83xnDHvKbt0XasjPfe1c,321520
+pyxcp/cpp_ext/cpp_ext.cpython-310-darwin.so,sha256=qPV9eNVkRL8z10bnT72IPS_ycDt92S_E2P2fUrctwOQ,321344
+pyxcp-0.23.9.dist-info/RECORD,,
+pyxcp-0.23.9.dist-info/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
+pyxcp-0.23.9.dist-info/WHEEL,sha256=X6-NY9fCWtbM4tHMrme4ihtrUdAQgjDgPOLr1IYsKV8,134
+pyxcp-0.23.9.dist-info/entry_points.txt,sha256=LkHsEwubm30s4oiyCy0cKj6k97ALvQ6KjAVdyEcqu7g,358
+pyxcp-0.23.9.dist-info/METADATA,sha256=KKZRladjwl9oGnbUyLaMsnLGa65Px9aQe_2uHaentWo,12718