pyxcp 0.21.6__cp311-cp311-win_amd64.whl → 0.21.9__cp311-cp311-win_amd64.whl

pyxcp/__init__.py

@@ -24,5 +24,5 @@ from .transport import Eth
 from .transport import SxI
 from .transport import Usb
 
-# if you update this manually, do not forget to update .bumpversion.cfg
-__version__ = "0.21.6"
+# if you update this manually, do not forget to update .bumpversion.cfg and pyproject.toml
+__version__ = "0.21.9"

pyxcp/master/master.py

@@ -218,17 +218,20 @@ class Master:
         self.DWORD_unpack = makeDWordUnpacker(byteOrderPrefix)
         self.DLONG_pack = makeDLongPacker(byteOrderPrefix)
         self.DLONG_unpack = makeDLongUnpacker(byteOrderPrefix)
-
+        self.slaveProperties.bytesPerElement = None  # Download/Upload commands are using element- not byte-count.
         if self.slaveProperties.addressGranularity == types.AddressGranularity.BYTE:
             self.AG_pack = struct.Struct("<B").pack
             self.AG_unpack = struct.Struct("<B").unpack
+            self.slaveProperties.bytesPerElement = 1
         elif self.slaveProperties.addressGranularity == types.AddressGranularity.WORD:
             self.AG_pack = self.WORD_pack
             self.AG_unpack = self.WORD_unpack
+            self.slaveProperties.bytesPerElement = 2
         elif self.slaveProperties.addressGranularity == types.AddressGranularity.DWORD:
             self.AG_pack = self.DWORD_pack
             self.AG_unpack = self.DWORD_unpack
-        # self.connected = True
+            self.slaveProperties.bytesPerElement = 4
+            # self.connected = True
         return result
 
     @wrapped
@@ -431,6 +434,7 @@ class Master:
         Parameters
         ----------
         length : int
+            Number of elements (address granularity).
 
         Note
         ----
@@ -440,24 +444,23 @@ class Master:
         -------
         bytes
         """
-
+        byte_count = length * self.slaveProperties.bytesPerElement
         response = self.transport.request(types.Command.UPLOAD, length)
-        if length > (self.slaveProperties.maxCto - 1):
-            block_response = self.transport.block_receive(length_required=(length - len(response)))
+        if byte_count > (self.slaveProperties.maxCto - 1):
+            block_response = self.transport.block_receive(length_required=(byte_count - len(response)))
             response += block_response
         elif self.transport_name == "can":
             # larger sizes will send in multiple CAN messages
             # each valid message will start with 0xFF followed by the upload bytes
             # the last message might be padded to the required DLC
-            rem = length - len(response)
+            rem = byte_count - len(response)
             while rem:
                 if len(self.transport.resQueue):
                     data = self.transport.resQueue.popleft()
                     response += data[1 : rem + 1]
-                    rem = length - len(response)
+                    rem = byte_count - len(response)
                 else:
                     sleep(SHORT_SLEEP)
-
         return response
 
     @wrapped
@@ -467,6 +470,8 @@ class Master:
 
         Parameters
         ----------
+        length : int
+            Number of elements (address granularity).
         address : int
         addressExt : int
 
@@ -475,7 +480,12 @@ class Master:
         bytes
         """
         addr = self.DWORD_pack(address)
-        return self.transport.request(types.Command.SHORT_UPLOAD, length, 0, addressExt, *addr)
+        byte_count = length * self.slaveProperties.bytesPerElement
+        max_byte_count = self.slaveProperties.maxCto - 1
+        if byte_count > max_byte_count:
+            self.logger.warn(f"SHORT_UPLOAD: {byte_count} bytes exceeds the maximum value of {max_byte_count}.")
+        response = self.transport.request(types.Command.SHORT_UPLOAD, length, 0, addressExt, *addr)
+        return response[:byte_count]
 
     @wrapped
     def buildChecksum(self, blocksize: int):

pyxcp/transport/can.py

@@ -321,7 +321,7 @@ class Can(BaseTransport):
         self.processResponse(
             payload,
             len(payload),
-            counter=self.counterReceived + 1,
+            counter=(self.counterReceived + 1) & 0xffff,
             recv_timestamp=recv_timestamp,
         )
 

pyxcp/transport/usb_transport.py

@@ -8,6 +8,9 @@ from time import perf_counter
 from time import sleep
 from time import time
 
+import usb.backend.libusb1 as libusb1
+import usb.backend.libusb0 as libusb0
+import usb.backend.openusb as openusb
 import usb.core
 import usb.util
 
@@ -29,6 +32,7 @@ class Usb(BaseTransport):
         "reply_endpoint_number": (int, True, 1),
         "vendor_id": (int, False, 0),
         "product_id": (int, False, 0),
+        "library": (str, False, "")  # absolute path to USB shared library
     }
     HEADER = struct.Struct("<2H")
     HEADER_SIZE = HEADER.size
@@ -43,6 +47,7 @@ class Usb(BaseTransport):
         self.interface_number = self.config.get("interface_number")
         self.command_endpoint_number = self.config.get("command_endpoint_number")
         self.reply_endpoint_number = self.config.get("reply_endpoint_number")
+        self.library = self.config.get("library")
         self.device = None
 
         self.status = 0
@@ -55,15 +60,25 @@ class Usb(BaseTransport):
         self._packets = deque()
 
     def connect(self):
+        if self.library:
+            for backend_provider in (libusb1, libusb0, openusb):
+                backend = backend_provider.get_backend(find_library=lambda x: self.library)
+                if backend:
+                    break
+        else:
+            backend = None
+
         if self.vendor_id and self.product_id:
             kwargs = {
                 "find_all": True,
                 "idVendor": self.vendor_id,
                 "idProduct": self.product_id,
+                "backend": backend,
             }
         else:
             kwargs = {
                 "find_all": True,
+                "backend": backend,
             }
 
         for device in usb.core.find(**kwargs):

{pyxcp-0.21.6.dist-info → pyxcp-0.21.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyxcp
-Version: 0.21.6
+Version: 0.21.9
 Summary: Universal Calibration Protocol for Python
 Keywords: automotive,ecu,xcp,asam,autosar
 Author: Christoph Schueler

{pyxcp-0.21.6.dist-info → pyxcp-0.21.9.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyxcp/__init__.py,sha256=4l-w2zNdkVviaSUSTwh61dbvVE6HKKtVUKt3JQ5K_jQ,727
+pyxcp/__init__.py,sha256=ZX9y5UF2dvHjSpwztOnczBmD28aII5Qu6Xts6pWZxuA,746
 pyxcp/aml/EtasCANMonitoring.a2l,sha256=hEHpb3GpuFDvU6GpAiuV028mu7MUXtfE7wslPA0GlZg,1640
 pyxcp/aml/EtasCANMonitoring.aml,sha256=xl0DdyeiIaLW0mmmJNAyJS0CQdOLSxt9dxfgrdSlU8Y,2405
 pyxcp/aml/ifdata_CAN.a2l,sha256=mQFDM6y9qyxUORYR1L0m8fMJ7S1oGheuD8ouEeYxEnI,614
@@ -72,7 +72,7 @@ pyxcp/examples/xcphello_recorder.py,sha256=RbnuMzk67zszp3t0PAEcpXzuZELHYq-3VovZl
 pyxcp/logger.py,sha256=-g6VIWsu7uyPilZHz41qWUTha1B1a0ZTGJwckMxaTjI,1991
 pyxcp/master/__init__.py,sha256=sZOjpI4cZS_kuTXYGQ3R6FL96w0bNbWTtNzSZAtngUw,329
 pyxcp/master/errorhandler.py,sha256=eCO3RWqfv5CTV84HBw6i26NSmU0L6LGZzq5EsmgSu_s,13622
-pyxcp/master/master.py,sha256=4FJk3QNXP-5wsUTFuEOp09Dk2HfEyZtdFplIo_oLvDc,71861
+pyxcp/master/master.py,sha256=GNw_EH2zGCu9qjmiut8eXrqyr9egRS2lGVk2H34e9n0,72676
 pyxcp/recorder/__init__.py,sha256=hdIkTKrGePj8-7A5UpvNIaZnY44ayh4fP-0gfzm14a8,2260
 pyxcp/recorder/build_clang.cmd,sha256=JvFngSnb28XcBGXxC6MGrcOCGYfahOIvHpgRpqbA6HQ,175
 pyxcp/recorder/build_clang.sh,sha256=zmU3nZxaNH1pxGWMyQ-S541TuVqxS00p3iPR9NUP4Ec,181
@@ -107,7 +107,7 @@ pyxcp/tests/test_utils.py,sha256=qmsJfyYhDBtdx60U1SwZakETgdmB27KpMVipVIwSDz8,974
 pyxcp/timing.py,sha256=ZO320bMqtAbFPkQc8JnGV9FGxDYEyN4Co6kRTyIkRVA,1732
 pyxcp/transport/__init__.py,sha256=GnoxnBa7MTIR-4pdfODsfDJepNv5G8sYsU_pAq8wCLQ,307
 pyxcp/transport/base.py,sha256=dKcVCa6Xkw7BvuUcryfitCVa_Oo8lkqlAB15BZcEt6I,14786
-pyxcp/transport/can.py,sha256=wYswrln4dbawQfWuB7uPoh-5thR3-SPSrZNZWWVnfSs,12642
+pyxcp/transport/can.py,sha256=FauEdOBqMybE2ubr4wwonSAvoo9AZwDQsl6W1BAiF_w,12653
 pyxcp/transport/candriver/__init__.py,sha256=2un8k8GFsH9dCD4_ZThEPCMZq_JL335e0Wzkk034rmo,48
 pyxcp/transport/candriver/pc_canalystii.py,sha256=zHeWKG3UUklW6unVfWldkgKBEREFUTKMpEqpPsahmZY,740
 pyxcp/transport/candriver/pc_etas.py,sha256=S4rMqquhz09GL6-Lrei9awzqMUabidyuSowwh_Uop4o,627
@@ -134,14 +134,14 @@ pyxcp/transport/cxx_ext/tests/test_pool.cpp,sha256=vztxjVtzXXoTKWt4KHoiTN-UpjGMH
 pyxcp/transport/cxx_ext/tests/test_timestamp.cpp,sha256=6V_rZJR9rtQgIO-CFdFIWSx7iAUga2C9BRr5TBJXgNc,540
 pyxcp/transport/eth.py,sha256=PoCafj5BF1Ir0SLEvscZivXTEihGJPo7EAgYq5WHvok,7923
 pyxcp/transport/sxi.py,sha256=VVqiXD800GociBryMtXma9l2QspQpwECE1eNy4Cq4us,2583
-pyxcp/transport/usb_transport.py,sha256=ho8-i3mbVtBAp6uRdTytO0-EQpifZHHbKY-2CwRcw54,7284
+pyxcp/transport/usb_transport.py,sha256=hK4FTl1DM7xDoNjcBXoMeb-YZfk2SP3BihlbJM6mL2w,7888
 pyxcp/types.py,sha256=uV-f4XlG1IjqeIT8PGUnb5CwEBcX10JQ7aDt3gWJrwk,24950
 pyxcp/utils.py,sha256=b7zNSMLOYhgKBHXQSDbSfGYzhgXlje_xsJK0LztdNTk,1960
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=5FPdKgvP5CKuas2R5PIsxUvip-bVp7kwrEcQAZjZcAw,2369
-rekorder.cp311-win_amd64.pyd,sha256=DEV3PqvQ9aYgRaTAJsWQ9aJ05TMQynriU9zTi3TawrA,165376
-pyxcp-0.21.6.dist-info/entry_points.txt,sha256=wL4Cgx0wIAbuEr93nPewLCL-6DCSunxxTkui-bibme8,219
-pyxcp-0.21.6.dist-info/WHEEL,sha256=XA5Mwl9q6s2PpmJwd6j2Kq2ARGWcwWdsXkRtTZwPLFk,97
-pyxcp-0.21.6.dist-info/METADATA,sha256=wnrJ_7sGy-beWOXX_2budDF1d_jvN1OBvhCPN1trNzA,3861
-pyxcp-0.21.6.dist-info/licenses/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
-pyxcp-0.21.6.dist-info/RECORD,,
+rekorder.cp311-win_amd64.pyd,sha256=XLHjCkCBtVkbckWYOH3c8rtY0u7X3sf6Bx_NpuPxZKM,166400
+pyxcp-0.21.9.dist-info/entry_points.txt,sha256=wL4Cgx0wIAbuEr93nPewLCL-6DCSunxxTkui-bibme8,219
+pyxcp-0.21.9.dist-info/WHEEL,sha256=XA5Mwl9q6s2PpmJwd6j2Kq2ARGWcwWdsXkRtTZwPLFk,97
+pyxcp-0.21.9.dist-info/METADATA,sha256=9SEGwDGqBqsFd_2HpxNHjbV6C4I4iwgJx1XhjQmFtGE,3861
+pyxcp-0.21.9.dist-info/licenses/LICENSE,sha256=fTqV5eBpeAZO0_jit8j4Ref9ikBSlHJ8xwj5TLg7gFk,7817
+pyxcp-0.21.9.dist-info/RECORD,,