pyxcp 0.21.10__cp311-cp311-win32.whl → 0.22.1__cp311-cp311-win32.whl

CMakeLists.txt

@@ -0,0 +1,117 @@
+
+cmake_minimum_required(VERSION 3.7...3.29)
+project(pyxcp_extensions LANGUAGES C CXX)
+
+find_package(Python COMPONENTS Interpreter Development)
+find_package(pybind11 CONFIG)
+
+SET(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 23)
+
+message( STATUS "Found pybind11 v${pybind11_VERSION} ${pybind11_VERSION_TYPE}: ${pybind11_INCLUDE_DIRS}")
+
+set(CMAKE_LIBRARY_OUTPUT_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/dist")
+
+
+SET(GCC_N_CLANG_BASE_OPTIONS "-std=c++23 -Wall -Wextra -Wpedantic -Warray-bounds -mtune=native -fexceptions")
+
+SET(MSVC_BASE_OPTIONS "/W3 /permissive- /EHsc /bigobj /Zc:__cplusplus /std:c++latest")
+
+
+
+if (CMAKE_BUILD_TYPE STREQUAL "Debug")
+	if (MSVC)
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS}  /Od /fsanitize=address /Zi")
+	else()
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -Og -g3 -ggdb --fno-omit-frame-pointer -fsanitize=address -fsanitize=undefined -fsanitize=bounds")	# -fsanitize=hwaddress
+	endif()
+else ()
+	if (MSVC)
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} /Ox")
+	else()
+		SET(MSVC_BASE_OPTIONS "${MSVC_BASE_OPTIONS} -O3 --fomit-frame-pointer")
+	endif()
+ endif ()
+
+
+if (CMAKE_SYSTEM_NAME STREQUAL  "Darwin")
+    set(ENV{MACOSX_DEPLOYMENT_TARGET}  "11.0")
+	SET(GCC_N_CLANG_EXTRA_OPTIONS "-stdlib=libc++")
+	message("Platform is Darwin")
+elseif (CMAKE_SYSTEM_NAME STREQUAL  "Windows")
+	message("Platform is WINDOWS")
+	SET(MSVC_EXTRA_OPTIONS "")
+elseif (CMAKE_SYSTEM_NAME STREQUAL  "Linux")
+	SET(GCC_N_CLANG_EXTRA_OPTIONS "-fvisibility=hidden -g0") # -fcoroutines
+	message("Platform is LINUX")
+endif()
+
+
+IF (CMAKE_C_COMPILER_ID STREQUAL "GNU")
+
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "Clang")
+
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+
+ELSE ()
+
+ENDIF ()
+
+IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
+
+ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+
+ELSEIF (CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
+
+ELSE ()
+
+
+ENDIF ()
+
+message("Compiling C with: " ${CMAKE_C_COMPILER_ID})
+message("Compiling Cpp with: " ${CMAKE_CXX_COMPILER_ID})
+
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
+set(EXTENSION_INCS ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/cpp_ext)
+
+pybind11_add_module(rekorder pyxcp/recorder/wrap.cpp pyxcp/recorder/lz4.c pyxcp/recorder/lz4hc.c)
+pybind11_add_module(cpp_ext pyxcp/cpp_ext/extension_wrapper.cpp)
+pybind11_add_module(stim pyxcp/daq_stim/stim_wrapper.cpp pyxcp/daq_stim/stim.cpp pyxcp/daq_stim/scheduler.cpp)
+
+target_include_directories(rekorder PRIVATE ${EXTENSION_INCS} ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/recorder)
+target_include_directories(cpp_ext PRIVATE ${EXTENSION_INCS})
+target_include_directories(stim PRIVATE ${EXTENSION_INCS} ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/daq_stim)
+
+target_compile_options(rekorder PUBLIC "-DEXTENSION_NAME=pyxcp.recorder.rekorder")
+target_compile_options(cpp_ext PUBLIC "-DEXTENSION_NAME=pyxcp.cpp_ext.cpp_ext")
+target_compile_options(stim PUBLIC "-DEXTENSION_NAME=pyxcp.daq_stim.stim")
+
+add_executable(asamkeydll ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/asamkeydll.c)
+# set_target_properties(MyTarget PROPERTIES COMPILE_FLAGS "-m32" LINK_FLAGS "-m32")
+
+if (CMAKE_SIZEOF_VOID_P EQUAL 8)
+    # CMAKE_SYSTEM_NAME STREQUAL  "Windows"
+endif()
+
+IF (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${GCC_N_CLANG_BASE_OPTIONS} ${GCC_N_CLANG_EXTRA_OPTIONS}")
+	target_link_options(cpp_ext PUBLIC -flto=auto)
+	target_link_options(stim PUBLIC -flto=auto)
+	target_link_options(rekorder PUBLIC -flto=auto)
+ELSEIF (CMAKE_C_COMPILER_ID MATCHES "MSVC")
+	SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS} ${MSVC_BASE_OPTIONS} ${MSVC_EXTRA_OPTIONS}")
+ENDIF()
+
+IF (CMAKE_SYSTEM_NAME STREQUAL  "Linux" AND CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+	SET(CMAKE_CXX_FLAGS  "${CMAKE_CXX_FLAGS}" -fuse-ld=lld)
+ENDIF()
+
+# target_include_directories(preprocessor PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/pya2l/extensions>)
+# target_link_libraries(preprocessor pybind11::headers)
+# set_target_properties(preprocessor PROPERTIES INTERPROCEDURAL_OPTIMIZATION ON CXX_VISIBILITY_PRESET ON VISIBILITY_INLINES_HIDDEN ON)
+
+install(TARGETS rekorder LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/recorder)
+install(TARGETS cpp_ext LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/cpp_ext)
+install(TARGETS stim LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/daq_stim)
+# install(TARGETS asamkeydll LIBRARY DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/pyxcp/)

pyxcp/__init__.py

@@ -1,28 +1,20 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
-"""Universal Calibration Protocol for Python"""
-import sys
+"""Universal Calibration Protocol for Python."""
 
-if sys.platform == "win32" and sys.version_info[:2] < (3, 11):
-    # patch the time module with the high resolution alternatives
-    try:
-        from win_precise_time import sleep as wpsleep
-        from win_precise_time import time as wptime
+from rich import pretty
+from rich.console import Console
+from rich.traceback import install as tb_install
 
-        import time
 
-        time.sleep = wpsleep
-        time.time = wptime
+pretty.install()
 
-    except ImportError:
-        pass
+from .master import Master  # noqa: F401, E402
+from .transport import Can, Eth, SxI, Usb  # noqa: F401, E402
 
 
-from .master import Master
-from .transport import Can
-from .transport import Eth
-from .transport import SxI
-from .transport import Usb
+console = Console()
+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.21.10"
+# if you update this manually, do not forget to update
+# .bumpversion.cfg and pyproject.toml.
+__version__ = "0.22.1"

pyxcp/aml/EtasCANMonitoring.a2l

@@ -1,83 +1,82 @@
-ASAP2_VERSION 1 30  
-/begin PROJECT  
-  aProjectName 
-  "description of project"  
-   
-  /begin HEADER  
-     "project"  
-     VERSION "1.0"   
-     PROJECT_NO "1.0"  
-  /end HEADER  
-
-  /begin MODULE  
-     aModuleName  
-     "description of module"  
-
-     /begin MOD_PAR  
-        ""  
-     /end MOD_PAR  
-
-     /begin IF_DATA CAN_MONITORING  
-        /begin  TP_BLOB  
-           500 
-       /end  TP_BLOB 
-     /end IF_DATA 
-
-     /begin MEASUREMENT  
-        aMeasurementName 
-        "description of measurement"  
-        ULONG 
-        aConversionName 
-        0  
-        0.0 
-        0  
-        1000         
-        /begin IF_DATA CAN_MONITORING  
-           /begin KP_BLOB   
-              0x0 32 
-           /end KP_BLOB  
-        /end IF_DATA  
-        FORMAT ""   
-        BYTE_ORDER MSB_LAST  
-        BIT_MASK 0xFFFFFFFF  
-     /end MEASUREMENT  
-
-     /begin COMPU_METHOD  
-        aConversionName  
-        "description of conversion"  
-        RAT_FUNC  
-        "%f5.2"  
-        "" 
-        COEFFS 0 1.0 0.0 0 0 1  
-     /end COMPU_METHOD  
-
-
-
-
-
-
-
-
-    /begin FRAME  
-        aFrameName 
-        "description of frame"  
-        0  
-        0  
-        /begin IF_DATA CAN_MONITORING  
-           QP_BLOB 0x0200 0 8 
-        /end IF_DATA  
-        FRAME_MEASUREMENT aMeasurementName   
-     /end FRAME 
-
-     /begin FUNCTION  
-        aFunctionName 
-        "description of function"  
-        /begin OUT_MEASUREMENT  
-           aMeasurementName 
-        /end OUT_MEASUREMENT  
-     /end FUNCTION  
-
-  /end MODULE  
-
-/end PROJECT  
-
+ASAP2_VERSION 1 30
+/begin PROJECT
+  aProjectName
+  "description of project"
+
+  /begin HEADER
+     "project"
+     VERSION "1.0"
+     PROJECT_NO "1.0"
+  /end HEADER
+
+  /begin MODULE
+     aModuleName
+     "description of module"
+
+     /begin MOD_PAR
+        ""
+     /end MOD_PAR
+
+     /begin IF_DATA CAN_MONITORING
+        /begin  TP_BLOB
+           500
+       /end  TP_BLOB
+     /end IF_DATA
+
+     /begin MEASUREMENT
+        aMeasurementName
+        "description of measurement"
+        ULONG
+        aConversionName
+        0
+        0.0
+        0
+        1000
+        /begin IF_DATA CAN_MONITORING
+           /begin KP_BLOB
+              0x0 32
+           /end KP_BLOB
+        /end IF_DATA
+        FORMAT ""
+        BYTE_ORDER MSB_LAST
+        BIT_MASK 0xFFFFFFFF
+     /end MEASUREMENT
+
+     /begin COMPU_METHOD
+        aConversionName
+        "description of conversion"
+        RAT_FUNC
+        "%f5.2"
+        ""
+        COEFFS 0 1.0 0.0 0 0 1
+     /end COMPU_METHOD
+
+
+
+
+
+
+
+
+    /begin FRAME
+        aFrameName
+        "description of frame"
+        0
+        0
+        /begin IF_DATA CAN_MONITORING
+           QP_BLOB 0x0200 0 8
+        /end IF_DATA
+        FRAME_MEASUREMENT aMeasurementName
+     /end FRAME
+
+     /begin FUNCTION
+        aFunctionName
+        "description of function"
+        /begin OUT_MEASUREMENT
+           aMeasurementName
+        /end OUT_MEASUREMENT
+     /end FUNCTION
+
+  /end MODULE
+
+/end PROJECT

pyxcp/aml/XCP_Common.aml

@@ -406,4 +406,3 @@ taggedstruct Common_Parameters {
     block "PGM" struct Pgm;
     block "DAQ_EVENT" taggedunion Daq_Event;
 }; /******************** end of Common Parameters *****************************/
-

pyxcp/aml/XCPonUSB.aml

@@ -103,4 +103,4 @@ struct USB_Parameters {
     }; /* end of optional */
 };
 /************************* end of USB ***********************************/
-/end A2ML
+/end A2ML

pyxcp/aml/ifdata_CAN.a2l

@@ -18,4 +18,3 @@ begin XCP_ON_CAN
         FIXED 0x330
     /end DAQ_LIST_CAN_ID
 /end XCP_ON_CAN
-

pyxcp/aml/ifdata_Eth.a2l

@@ -9,4 +9,3 @@
 0x5555 /* PORT */
 "127.0.0.1" /* ADDRESS */
 /end XCP_ON_UDP_IP
-

pyxcp/aml/ifdata_Flx.a2l

@@ -92,4 +92,3 @@ STIM VARIABLE
 /end XCP_PACKET
 /end POOL_BUFFER
 /end XCP_ON_FLX
-

pyxcp/aml/ifdata_SxI.a2l

@@ -11,4 +11,3 @@
     HEADER_LEN_CTR_WORD
     NO_CHECKSUM
 /end XCP_ON_SxI
-

pyxcp/aml/ifdata_USB.a2l

@@ -79,4 +79,3 @@
         FIXED_OUT 0x02 /* uses Endpoint 2 OUT. */
     /end DAQ_LIST_USB_ENDPOINT
 /end XCP_ON_USB
-

pyxcp/asam/types.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 import struct
 
+
 INTEL = "<"
 MOTOROLA = ">"
 
@@ -15,7 +15,7 @@ MOTOROLA = ">"
 """
 
 
-class AsamBaseType(object):
+class AsamBaseType:
     """Base class for ASAM codecs.
 
     Note
@@ -51,7 +51,7 @@ class AsamBaseType(object):
         bytes
           Encoded value.
         """
-        return struct.pack("{}{}".format(self.byteorder, self.FMT), value)
+        return struct.pack(f"{self.byteorder}{self.FMT}", value)
 
     def decode(self, value):
         """Decode a value.
@@ -68,7 +68,7 @@ class AsamBaseType(object):
         data-type
           data-type is determined by derived class.
         """
-        return struct.unpack("{}{}".format(self.byteorder, self.FMT), bytes(value))[0]
+        return struct.unpack(f"{self.byteorder}{self.FMT}", bytes(value))[0]
 
 
 class A_Uint8(AsamBaseType):

pyxcp/asamkeydll.c

@@ -110,7 +110,6 @@ int main(int argc, char ** argv)
     }
 
     res = GetKey((char *)&dllname, privilege, seedlen, (BYTE *)&seedBuffer, &keylen, (BYTE *)&keyBuffer);
-    printf("%lu\n", res);
     if (res == 0) {
         hexlify(keyBuffer, keylen);
     }

pyxcp/checksum.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """Checksum calculation for memory ranges
 
 .. [1] XCP Specification, BUILD_CHECKSUM service.

pyxcp/cmdline.py

@@ -1,68 +1,50 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
 """
 Parse (transport-layer specific) command line parameters
 and create a XCP master instance.
 """
-import argparse
 
-from pyxcp.config import readConfiguration
+import warnings
+from dataclasses import dataclass
+from typing import List
+
+from pyxcp.config import create_application
 from pyxcp.master import Master
-from pyxcp.transport.can import registered_drivers
-from pyxcp.transport.can import try_to_install_system_supplied_drivers
 
-try_to_install_system_supplied_drivers()
 
-CAN_DRIVERS = registered_drivers()
+warnings.simplefilter("always")
 
 
-class ArgumentParser:
-    """
+@dataclass
+class Option:
+    short_opt: str
+    long_opt: str = ""
+    dest: str = ""
+    help: str = ""
+    type: str = ""
+    default: str = ""
 
-    Parameter
-    ---------
-    callout: callable
-        Process user-supplied arguments.
-    """
 
-    def __init__(self, callout=None, *args, **kws):
-        self.callout = callout
-        kws.update(formatter_class=argparse.RawDescriptionHelpFormatter, add_help=True)
-        self._parser = argparse.ArgumentParser(*args, **kws)
-        self._parser.add_argument(
-            "-c",
-            "--config-file",
-            type=argparse.FileType("r"),
-            dest="conf",
-            help="File to read (extended) parameters from.",
-        )
-        self._parser.add_argument(
-            "-l",
-            "--loglevel",
-            choices=["ERROR", "WARN", "INFO", "DEBUG"],
-            default="INFO",
-        )
-        self._parser.epilog = "To get specific help on transport layers\nuse <layer> -h, e.g. {} eth -h".format(self._parser.prog)
-        self._args = []
+class FakeParser:
 
-    @property
-    def args(self):
-        return self._args
+    options: List[Option] = []
 
-    def run(self, policy=None):
-        """"""
-        self._args = self.parser.parse_args()
-        args = self.args
-        if args.conf is None:
-            raise RuntimeError("Configuration file must be specified! (option: -c <file>)")
-        config = readConfiguration(args.conf)
-        config["LOGLEVEL"] = args.loglevel
-        if "TRANSPORT" not in config:
-            raise AttributeError("TRANSPORT must be specified in config!")
-        transport = config["TRANSPORT"].lower()
-        master = Master(transport, config=config, policy=policy)
-        if self.callout:
-            self.callout(master, args)
+    def add_argument(self, short_opt: str, long_opt: str = "", dest: str = "", help: str = "", type: str = "", default: str = ""):
+        warnings.warn("Argument parser extension is currently not supported.", DeprecationWarning, 2)
+        self.options.append(Option(short_opt, long_opt, dest, help, type, default))
+
+
+class ArgumentParser:
+    def __init__(self, callout=None, *args, **kws):
+        self._parser = FakeParser()
+        if callout is not None:
+            warnings.warn("callout  argument is currently not supported.", DeprecationWarning, 2)
+
+    def run(self, policy=None, transport_layer_interface=None):
+        application = create_application(self.parser.options)
+        master = Master(
+            application.transport.layer, config=application, policy=policy, transport_layer_interface=transport_layer_interface
+        )
         return master
 
     @property