pyxcp 0.22.10__tar.gz → 0.22.11__tar.gz

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

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

{pyxcp-0.22.10 → pyxcp-0.22.11}/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.11"
 readme = "README.md"
 description = "Universal Calibration Protocol for Python"
 keywords = ["automotive", "ecu", "xcp", "asam", "autosar"]

{pyxcp-0.22.10 → pyxcp-0.22.11}/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.11"

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

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

pyxcp-0.22.11/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.11/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()