pyxcp 0.22.10__tar.gz → 0.22.12__tar.gz

{pyxcp-0.22.10 → pyxcp-0.22.12}/PKG-INFO

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

{pyxcp-0.22.10 → pyxcp-0.22.12}/build_ext.py

@@ -92,10 +92,20 @@ def banner(msg: str) -> None:
     print("=" * 80)
 
 
+def get_env_int(name: str, default: int = 0) -> int:
+    return int(os.environ.get(name, default))
+
+
+def get_env_bool(name: str, default: int = 0) -> bool:
+    return get_env_int(name, default)
+
+
 def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
     print("build_ext::build_extension()")
 
-    debug = bool(os.environ.get("DEBUG", 0)) or debug
+    use_temp_dir = use_temp_dir or get_env_bool("BUILD_TEMP")
+    debug = debug or get_env_bool("BUILD_DEBUG")
+
     cfg = "Debug" if debug else "Release"
     print(f" BUILD-TYPE: {cfg!r}")
 
@@ -144,4 +154,4 @@ def build_extension(debug: bool = False, use_temp_dir: bool = False) -> None:
 if __name__ == "__main__":
     includes = subprocess.getoutput("pybind11-config --cmakedir")  # nosec
     os.environ["pybind11_DIR"] = includes
-    build_extension(False)
+    build_extension()

{pyxcp-0.22.10 → pyxcp-0.22.12}/pyproject.toml

@@ -36,7 +36,7 @@ dynamic = ["license", "readme", "authors", "requires-python", "description", "cl
 [tool.poetry]
 authors = ["Christoph Schueler <cpu.gems@googlemail.com>"]
 name = "pyxcp"
-version = "0.22.10"
+version = "0.22.12"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.10 → pyxcp-0.22.12}/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.10"
+__version__ = "0.22.12"

{pyxcp-0.22.10 → pyxcp-0.22.12}/pyxcp/config/__init__.py

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

pyxcp-0.22.12/pyxcp/examples/ex_csv.py

@@ -0,0 +1,85 @@
+import argparse
+import logging
+import os
+import csv
+from array import array
+from dataclasses import dataclass, field
+from mmap import PAGESIZE
+from pathlib import Path
+from typing import Any, List
+
+from pyxcp.recorder import XcpLogFileDecoder
+from pyxcp.recorder.converter import MAP_TO_ARRAY
+
+
+MAP_TO_SQL = {
+    "U8": "INTEGER",
+    "I8": "INTEGER",
+    "U16": "INTEGER",
+    "I16": "INTEGER",
+    "U32": "INTEGER",
+    "I32": "INTEGER",
+    "U64": "INTEGER",
+    "I64": "INTEGER",
+    "F32": "FLOAT",
+    "F64": "FLOAT",
+    "F16": "FLOAT",
+    "BF16": "FLOAT",
+}
+
+logger = logging.getLogger("PyXCP")
+
+parser = argparse.ArgumentParser(description="Use .xmraw files in an Apache Arrow application.")
+parser.add_argument("xmraw_file", help=".xmraw file")
+args = parser.parse_args()
+
+
+@dataclass
+class Storage:
+    name: str
+    arrow_type: Any
+    arr: array
+
+
+@dataclass
+class StorageContainer:
+    name: str
+    arr: List[Storage] = field(default_factory=[])
+    ts0: List[int] = field(default_factory=lambda: array("Q"))
+    ts1: List[int] = field(default_factory=lambda: array("Q"))
+
+
+class Decoder(XcpLogFileDecoder):
+
+    def __init__(self, recording_file_name: str):
+        super().__init__(recording_file_name)
+
+    def initialize(self) -> None:
+        self.arrow_tables = []
+        self.csv_writers = []
+        for dl in self.daq_lists:
+            result = []
+            for name, type_str in dl.headers:
+                array_txpe = MAP_TO_ARRAY[type_str]
+                sql_type = MAP_TO_SQL[type_str]
+                sd = Storage(name, sql_type, array(array_txpe))
+                result.append(sd)
+            sc = StorageContainer(dl.name, result)
+            writer = csv.writer(open(f"{sc.name}.csv", "w", newline=""), dialect="excel")
+            headers = ["ts0", "ts1"] + [e.name for e in sc.arr]
+            writer.writerow(headers)
+            self.csv_writers.append(writer)
+            self.arrow_tables.append(sc)
+        print("\nInserting data...")
+
+    def finalize(self) -> None:
+        print("Done.")
+
+    def on_daq_list(self, daq_list_num: int, timestamp0: int, timestamp1: int, measurements: list) -> None:
+        sc = self.arrow_tables[daq_list_num]
+        writer = self.csv_writers[daq_list_num]
+        data = [timestamp0, timestamp1, *measurements]
+        writer.writerow(data)
+
+decoder = Decoder(args.xmraw_file)
+decoder.run()

pyxcp-0.22.12/pyxcp/examples/ex_excel.py

@@ -0,0 +1,95 @@
+import argparse
+import logging
+import os
+import xlsxwriter
+from array import array
+from dataclasses import dataclass, field
+from mmap import PAGESIZE
+from pathlib import Path
+from typing import Any, List
+
+from pyxcp.recorder import XcpLogFileDecoder
+from pyxcp.recorder.converter import MAP_TO_ARRAY
+
+
+MAP_TO_SQL = {
+    "U8": "INTEGER",
+    "I8": "INTEGER",
+    "U16": "INTEGER",
+    "I16": "INTEGER",
+    "U32": "INTEGER",
+    "I32": "INTEGER",
+    "U64": "INTEGER",
+    "I64": "INTEGER",
+    "F32": "FLOAT",
+    "F64": "FLOAT",
+    "F16": "FLOAT",
+    "BF16": "FLOAT",
+}
+
+logger = logging.getLogger("PyXCP")
+
+parser = argparse.ArgumentParser(description="Use .xmraw files in an Apache Arrow application.")
+parser.add_argument("xmraw_file", help=".xmraw file")
+args = parser.parse_args()
+
+
+@dataclass
+class Storage:
+    name: str
+    arrow_type: Any
+    arr: array
+
+
+@dataclass
+class StorageContainer:
+    name: str
+    arr: List[Storage] = field(default_factory=[])
+    ts0: List[int] = field(default_factory=lambda: array("Q"))
+    ts1: List[int] = field(default_factory=lambda: array("Q"))
+
+
+class Decoder(XcpLogFileDecoder):
+
+    def __init__(self, recording_file_name: str):
+        super().__init__(recording_file_name)
+        self.xls_file_name = Path(recording_file_name).with_suffix(".xlsx")
+        try:
+            os.unlink(self.xls_file_name)
+        except Exception as e:
+            print(e)
+
+    def initialize(self) -> None:
+        self.arrow_tables = []
+        self.xls_workbook = xlsxwriter.Workbook(self.xls_file_name)
+        self.xls_sheets = []
+        self.rows = []
+        for dl in self.daq_lists:
+            result = []
+            for name, type_str in dl.headers:
+                array_txpe = MAP_TO_ARRAY[type_str]
+                sql_type = MAP_TO_SQL[type_str]
+                sd = Storage(name, sql_type, array(array_txpe))
+                result.append(sd)
+            sc = StorageContainer(dl.name, result)
+            sheet = self.xls_workbook.add_worksheet(sc.name)
+            self.xls_sheets.append(sheet)
+            headers = ["ts0", "ts1"] + [e.name for e in sc.arr]
+            sheet.write_row(0, 0, headers)
+            self.rows.append(1)
+            self.arrow_tables.append(sc)
+        print("\nInserting data...")
+
+    def finalize(self) -> None:
+        self.xls_workbook.close()
+        print("Done.")
+
+    def on_daq_list(self, daq_list_num: int, timestamp0: int, timestamp1: int, measurements: list) -> None:
+        sheet = self.xls_sheets[daq_list_num]
+        row = self.rows[daq_list_num]
+        data = [timestamp0, timestamp1] + measurements
+        sheet.write_row(row, 0, data)
+        self.rows[daq_list_num] += 1
+
+decoder = Decoder(args.xmraw_file)
+decoder.run()

{pyxcp-0.22.10 → pyxcp-0.22.12}/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-0.22.10 → pyxcp-0.22.12}/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-0.22.10 → pyxcp-0.22.12}/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):