pyxcp 0.22.12__cp310-cp310-win_amd64.whl → 0.22.14__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.22.12"
+__version__ = "0.22.14"

pyxcp/cpp_ext/__init__.py

@@ -1,8 +0,0 @@
-from .cpp_ext import (  # noqa: F401
-    Bin,
-    DaqList,
-    McObject,
-    Timestamp,
-    TimestampInfo,
-    TimestampType,
-)

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/cpp_ext/helper.hpp

@@ -251,6 +251,22 @@ class Timestamp {
     std::uint64_t m_initial;
 };
 
+template<typename T, typename V>
+T variant_get(V&& value) {
+
+    T result;
+
+    const T* value_ptr = std::get_if<T>(&value);
+    if (value_ptr == nullptr) {
+        result = T{};
+    }
+    else {
+        result = *value_ptr;
+    }
+
+    return result;
+}
+
 #if 0
 inline void sleep_ms(std::uint64_t milliseconds) {
     std::this_thread::sleep_for(std::chrono::milliseconds(milliseconds));

pyxcp/daq_stim/__init__.py

@@ -6,7 +6,7 @@ from typing import Dict, List, Optional, TextIO
 
 from pyxcp import types
 from pyxcp.config import get_application
-from pyxcp.cpp_ext import DaqList
+from pyxcp.cpp_ext.cpp_ext import DaqList
 from pyxcp.daq_stim.optimize import make_continuous_blocks
 from pyxcp.daq_stim.optimize.binpacking import first_fit_decreasing
 from pyxcp.recorder import DaqOnlinePolicy as _DaqOnlinePolicy

pyxcp/daq_stim/optimize/__init__.py

@@ -5,7 +5,7 @@ from itertools import groupby
 from operator import attrgetter
 from typing import List
 
-from pyxcp.cpp_ext import McObject
+from pyxcp.cpp_ext.cpp_ext import McObject
 
 
 def make_continuous_blocks(chunks: List[McObject], upper_bound=None, upper_bound_initial=None) -> List[McObject]:

pyxcp/daq_stim/optimize/binpacking.py

@@ -3,7 +3,7 @@
 """
 from typing import List, Optional
 
-from pyxcp.cpp_ext import Bin
+from pyxcp.cpp_ext.cpp_ext import Bin
 
 
 def first_fit_decreasing(items, bin_size: int, initial_bin_size: Optional[int] = None) -> List[Bin]:

pyxcp/examples/run_daq.py

@@ -22,23 +22,23 @@ if XCP_LITE:
             False,
             False,
             [
-                ("byteCounter", 0x203EA, 0, "U8"),
-                ("wordCounter", 0x203EC, 0, "U16"),
-                ("dwordCounter", 0x20410, 0, "U32"),
-                ("sbyteCounter", 0x203EB, 0, "I8"),
+                ("byteCounter", 0x00023648, 0, "U8"),
+                ("wordCounter", 0x0002364C, 0, "U16"),
+                ("dwordCounter", 0x00023650, 0, "U32"),
+                ("sbyteCounter", 0x00023649, 0, "I8"),
             ],
         ),
         DaqList(
             "part_2",
-            0,
+            7,
             False,
             False,
             [
-                ("swordCounter", 0x20414, 0, "I16"),
-                ("sdwordCounter", 0x20418, 0, "I32"),
-                ("channel1", 0x203F8, 0, "F64"),
-                ("channel2", 0x20400, 0, "F64"),
-                ("channel3", 0x20408, 0, "F64"),
+                ("swordCounter", 0x00023654, 0, "I16"),
+                ("sdwordCounter", 0x00023658, 0, "I32"),
+                ("channel1", 0x00023630, 0, "F64"),
+                ("channel2", 0x00023638, 0, "F64"),
+                ("channel3", 0x00023640, 0, "F64"),
             ],
         ),
     ]
@@ -117,8 +117,8 @@ 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", 2)  # Record to ".xmraw" file.
 
 with ap.run(policy=daq_parser) as x:
     x.connect()
@@ -127,12 +127,14 @@ with ap.run(policy=daq_parser) as x:
 
     x.cond_unlock("DAQ")  # DAQ resource is locked in many cases.
 
+    DAQ_LISTS[1].event_num = 0
+
     print("setup DAQ lists.")
     daq_parser.setup()  # Execute setup procedures.
     print("start DAQ lists.")
     daq_parser.start()  # Start DAQ lists.
 
-    time.sleep(15.0 * 60.0)  # Run for 15 minutes.
+    time.sleep(5.0 * 60.0)  # Run for 15 minutes.
 
     print("Stop DAQ....")
     daq_parser.stop()  # Stop DAQ lists.

pyxcp/transport/base.py

@@ -5,11 +5,10 @@ from collections import deque
 from typing import Any, Dict, Optional, Set, Type
 
 import pyxcp.types as types
-
-from ..cpp_ext import Timestamp, TimestampType
-from ..recorder import XcpLogFileWriter
-from ..timing import Timing
-from ..utils import (
+from pyxcp.cpp_ext.cpp_ext import Timestamp, TimestampType
+from pyxcp.recorder import XcpLogFileWriter
+from pyxcp.timing import Timing
+from pyxcp.utils import (
     CurrentDatetime,
     flatten,
     hexDump,

pyxcp/utils.py

@@ -9,7 +9,7 @@ from time import perf_counter, sleep
 import chardet
 import pytz
 
-from pyxcp.cpp_ext import TimestampInfo
+from pyxcp.cpp_ext.cpp_ext import TimestampInfo
 
 
 def hexDump(arr):

{pyxcp-0.22.12.dist-info → pyxcp-0.22.14.dist-info}/METADATA

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

{pyxcp-0.22.12.dist-info → pyxcp-0.22.14.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=rzqutj_NIktuafZn4ti6vl4JGdf6GvLUr3VGJhfN7Q4,548
+pyxcp/__init__.py,sha256=tYM6KlojPL5qI0GN-hr_xzNuOsI1N7JZoDpSYHeGboA,548
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=EJYwe3Z3H24vyWAa6lUgcdKnQY8pwFxjyCN6ZU1ST8w,1509
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=NCUnCUEEgRbZYSLGtUGwL2e7zJ8hrp0SbmLHGv8uY58,612
@@ -21,26 +21,26 @@ pyxcp/cmdline.py,sha256=uSbCtKtQT0JQxMhcoUUx_UJ1nMUILMWckEQGe_tNxXk,1496
 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/__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=78rV894PWY7xDOwuC8vmTdhE8g76hlCzZa_o0i-hOnk,278016
-pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=zkRiyCw9-TfVZr1WS2G3SJDu5z0PTWRBV3F7hZMUkko,278016
-pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=7Pk0o1wc6ek4jXYhiLkJAie3iO08xy1hROZ-nmpzOFY,259584
-pyxcp/cpp_ext/daqlist.hpp,sha256=sgqodW4vnN82s05mFyXQnpQox4KR3VDhP5FB_VhsmQc,7075
+pyxcp/cpp_ext/cpp_ext.cp310-win_amd64.pyd,sha256=wwDDfgOfZq-ocIm_mKHbs4blAVW6LVWd5C6yFQt8YLY,279040
+pyxcp/cpp_ext/cpp_ext.cp38-win_amd64.pyd,sha256=z1mZf9v-3uiREFpOpRSfl_dJV2Fjv8BluHBavSgIOm8,279040
+pyxcp/cpp_ext/cpp_ext.cp39-win_amd64.pyd,sha256=M3f457y9A-TDL6L281KxNjyNy0_zmZqyz69ZR8tGOm8,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/helper.hpp,sha256=iAaqORQvZwnSX6gvbu5SJJp2MPmbnsM6d-t2L6KMAA4,7543
+pyxcp/cpp_ext/extension_wrapper.cpp,sha256=-r1YYgJD4dJiiMeA0HEmIQQfsXrzDozLonCrbpKUXiA,4544
+pyxcp/cpp_ext/helper.hpp,sha256=ONAsVupIqqmNDp8bgGWS0TfSYeCFkk3kwwZbbqsh0HQ,7813
 pyxcp/cpp_ext/mcobject.hpp,sha256=A5GKcfjYMcfm3hfTQfFuS4JYNFTvfmzAcMXCe01GOs4,6429
 pyxcp/cpp_ext/tsqueue.hpp,sha256=FWMemzXNgV5dQ7gYmTCzC0QYfgl0VI9JCybYelBcCHU,1026
-pyxcp/daq_stim/__init__.py,sha256=W6h4havK8wNj5pQvxtSYxMmQVVYj8nqKHopPgckSYss,9264
-pyxcp/daq_stim/optimize/__init__.py,sha256=E4HzY8P0aeegNgu71hUcbL-yR6Fzg5PGe8PSiicB7Po,2512
-pyxcp/daq_stim/optimize/binpacking.py,sha256=zTNjpt91MnGW5ha9Z07hQtuoJ7tspyRwRlLYbE6GMGs,1249
+pyxcp/daq_stim/__init__.py,sha256=fvPtKdFcaSI_90jHVilQC1JWGFK_wWPpZyzOqD9hxXo,9272
+pyxcp/daq_stim/optimize/__init__.py,sha256=FUWK0GkNpNT-sUlhibp7xa2aSYpm6Flh5yA2w2IOJqg,2520
+pyxcp/daq_stim/optimize/binpacking.py,sha256=Iltho5diKlJG-ltbmx053U2vOFRlCISolXK61T14l_I,1257
 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=YskLVIiDKU5XEAMvho5NUyka9ECm08qCok8ub6jyWKA,186880
-pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=xgMR2ABH1WH58MMIBkF8KJsZr4kDLkeG-OryTsSJJf4,186880
-pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=XFhdTQcwx6ztvIjUY_IcpWvW5-HQl-2DpWHrwoszIsY,181248
+pyxcp/daq_stim/stim.cp310-win_amd64.pyd,sha256=c9ycu1VFq7Ub01riRdryFMHYBTGdJbGJDWrkE9eh_LA,186880
+pyxcp/daq_stim/stim.cp38-win_amd64.pyd,sha256=k8u4b0nn-e9BNJTlkKNqJ4PuOVcYddhE-b8G0G7NAxM,186880
+pyxcp/daq_stim/stim.cp39-win_amd64.pyd,sha256=gtDGh1mEN2t0s_a55dumew8sMvIHqRZ5SpDH-cRshBg,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
@@ -60,7 +60,7 @@ pyxcp/examples/ex_csv.py,sha256=GNWQ3IatXj3Kg5MUX6p8tzJRUppGreON9dkrNiqdTtk,2461
 pyxcp/examples/ex_excel.py,sha256=VpoqRTv-rHz-MnaFKt5f7MqDrK9OLYyRJvVWzCFsayc,2828
 pyxcp/examples/ex_mdf.py,sha256=zfivlNkbbsfvwqsISttaoQk1R888r7UUtwSqocE60sU,3759
 pyxcp/examples/ex_sqlite.py,sha256=ludD0EIziBhBNnC3MOrQTGs06cl7iNyL2yefwe53zNc,4268
-pyxcp/examples/run_daq.py,sha256=l8PYfRZRKNuDrTwmOC_rc2aSPDJrxcLQ4RWmfPRUjRI,4947
+pyxcp/examples/run_daq.py,sha256=kpy5aFKOFaQnwWmyE_--54NuDeaLEISQX8CKmuQEpHc,5007
 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
@@ -87,9 +87,9 @@ 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=mhP27o0y4AJzUgtmIer_DgyQYtcrKMTcbN8ZwVnydPE,377856
-pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=EM3_3v-MOkrbYNTo3bvbpgKiRalJEN6EnMm39WXWCTY,377856
-pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=ClhUHYx3TOjsckTysXn82P8MYLtT3ghSSWVfGCE5AtE,363520
+pyxcp/recorder/rekorder.cp310-win_amd64.pyd,sha256=qrYm8MtmatIKuzB6y0RTL6NeFoCcqzYjFu24-W0PQYU,377856
+pyxcp/recorder/rekorder.cp38-win_amd64.pyd,sha256=FeUmohcBOPSZXMobNoSFhi-q38W6KU1WDpe2oy8YOJ4,377856
+pyxcp/recorder/rekorder.cp39-win_amd64.pyd,sha256=B40D7zkKsiki6dqhGZKWHaT4cH8IyquqqHRJw1SOtmk,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
@@ -116,7 +116,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=EWevuuTht424_tgYnybU3Xh_jFAdBjdCcMTyU7u_gL4,16288
+pyxcp/transport/base.py,sha256=Gf2LoKrzYpm-6kSCE43TXqNiZ9daH3BPfH7Y7cFs548,16310
 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,11 +124,11 @@ 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/utils.py,sha256=unlg0CoNwcWYfd-BE0hZJ93uhlAoW_nryv9tS_R3C44,2969
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=7Gnhvr79geMeqqGVIJPxODXGwABdNDinnqzhpooN5TE,2306
-pyxcp-0.22.12.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
-pyxcp-0.22.12.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.22.12.dist-info/METADATA,sha256=H6p5xGHQkEYQ9CciMWIFwsL0UQ06L1Bj-bHfD-Dx_x0,4076
-pyxcp-0.22.12.dist-info/WHEEL,sha256=m3IvSLcO9dr-GyYVTyaKikpz8RWQ7IicWuXKArHYOZE,98
-pyxcp-0.22.12.dist-info/RECORD,,
+pyxcp-0.22.14.dist-info/entry_points.txt,sha256=2JbL-pWn9UxpBrS64aWiFFkq9x2A7y-dkrxYlfQqIJU,307
+pyxcp-0.22.14.dist-info/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.22.14.dist-info/METADATA,sha256=0yZfGPr1WQeKaY7jgGC_un_MK8xjrYtwAXTG7ATlJx4,4076
+pyxcp-0.22.14.dist-info/WHEEL,sha256=m3IvSLcO9dr-GyYVTyaKikpz8RWQ7IicWuXKArHYOZE,98
+pyxcp-0.22.14.dist-info/RECORD,,