pyxcp 0.21.6__cp39-cp39-macosx_10_9_x86_64.whl → 0.21.9__cp39-cp39-macosx_10_9_x86_64.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,9 @@
 rekorder.cpython-39-darwin.so,sha256=uW3Z92dDRzAN0SleWgd9UPBYMD2iE_1hcr7O842YL_o,319360
+pyxcp-0.21.9.dist-info/RECORD,,
+pyxcp-0.21.9.dist-info/WHEEL,sha256=n3FnKqnoEoBrDnlgv6JYwhAIfxqO8pwutUo8W22lbFc,104
+pyxcp-0.21.9.dist-info/entry_points.txt,sha256=wL4Cgx0wIAbuEr93nPewLCL-6DCSunxxTkui-bibme8,219
+pyxcp-0.21.9.dist-info/METADATA,sha256=9SEGwDGqBqsFd_2HpxNHjbV6C4I4iwgJx1XhjQmFtGE,3861
+pyxcp-0.21.9.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652
 pyxcp/dllif.py,sha256=o7t_M_n6XwE63ng97DV8t8BJkGmFHtj7Esdhi7qH4DQ,3023
 pyxcp/checksum.py,sha256=nsEosSKtU1b8L14sm9HyxvUNUMc07hnCR6oK_bH6-Ew,10837
 pyxcp/asamkeydll.sh,sha256=iema12sub6qNE0xAuzwGtx0FmkdaaOKoXalhrtWVaa8,57
@@ -6,7 +11,7 @@ pyxcp/config.py,sha256=dJ5WfX4Stlz2bvUA-mO-ez6jruFi27C9r7TDj1Vkc4g,1423
 pyxcp/asamkeydll.c,sha256=PnfD6UbMWz3cszGpJDHBrSPizjlg8RrV_nrCqC9xPOw,2862
 pyxcp/constants.py,sha256=Ifs1cxpRoctEU0BKAo5yDXqBtTWpTNIKzcV8YbrgNCA,1258
 pyxcp/cmdline.py,sha256=IvI946DR7CoCDutAaIrFTdTlCBSQ-ib_qlxBLWIK4dc,2117
-pyxcp/__init__.py,sha256=wOQPWhc0HtuEoBi-OorkwLqVIJnMnZhKlKE5AiDX3U0,699
+pyxcp/__init__.py,sha256=G1c0D5IBEmXIA1uot58ENy_8_SkGkWQFBrfXLJjKwNs,718
 pyxcp/types.py,sha256=fwAH5XAOPAiHo4EW2JgR9P1GdNTTPGzDrPLGeNeWhjI,24006
 pyxcp/logger.py,sha256=Zl9TolTcbvUjpRs8Chx8rK8TGHiHAq9-TC3fWQRnxgY,1924
 pyxcp/timing.py,sha256=dK89nGWV1sUVCd5FVkNCTDjoyuP8qK4Ggo9GgFGe_s0,1670
@@ -17,8 +22,8 @@ pyxcp/asam/types.py,sha256=VHPeIfOAXMXV67kZsDXUtMaTLZEjXrdt1V7WrznsUpQ,2361
 pyxcp/transport/eth.py,sha256=tUYC46wPPX6eYjWfNXrcmA38Uf3V7BBQMyI0QU9dX28,7702
 pyxcp/transport/sxi.py,sha256=frPYgKBdS6xUF8ZKIc0InxucDl12W0PkQxs--LteyTE,2496
 pyxcp/transport/__init__.py,sha256=Ip3jrH0gqXyA0JvK_r4kFV12raRZvummCczKAO7Xlb8,297
-pyxcp/transport/usb_transport.py,sha256=qO_tIb2BQ_ZDblqe_BKvCF4f6K-gARIYz4ReVMkaR1w,7068
-pyxcp/transport/can.py,sha256=yTAwKSp2yG6Zsh2TzXsqqpFL60bBfr3dSJ-puUNITWM,12226
+pyxcp/transport/usb_transport.py,sha256=aPXovvFJwMofIzFZTKhc0RHDwRPk6m0D4qDRbmDeYSA,7657
+pyxcp/transport/can.py,sha256=snTFVHUz8wQsQUpYC2gFBMxZDyC8Dt-mbfB-w8Eokkw,12237
 pyxcp/transport/base.py,sha256=L20LZ9-n8P-GwbKYScIyFAvQeyxX14fADIjJuqVpAg4,14368
 pyxcp/transport/candriver/pc_serial.py,sha256=O10fcNFJw8v6NHH2Hm9zwSwwKQdAB7cRSOpKZ1ASgrI,689
 pyxcp/transport/candriver/pc_iscan.py,sha256=iX3sI0-2ydBSj-fjhqh86OxeHUEGIy_WPidnW1Qqkic,571
@@ -95,7 +100,7 @@ pyxcp/aml/XCPonUSB.aml,sha256=1xNuM0fsDQi712hkzhBPveJcx1m318tC28bZEfnKpXU,4846
 pyxcp/aml/ifdata_SxI.a2l,sha256=ElFw9n43E4wSNVVvOiuq9TDv_zsAwSVSh4SnW8P7pCo,304
 pyxcp/aml/XCPonFlx.aml,sha256=z58FMu6ZF4hVun8WBCuxvDrq6FZ_gj3tZM15G7E8Uvw,4647
 pyxcp/master/__init__.py,sha256=14ZrFHp9wc_lizE47yl0Yr-NZ3PT2PEFPWWAaXvna34,319
-pyxcp/master/master.py,sha256=XI44Iyzm0h4FTwqavqf9RefF5ZnCDl8Sc-fQO8swEb4,69923
+pyxcp/master/master.py,sha256=W45K7qTf5mBfEA1x1CBPJ6CzU2-Scqds1oOowKWDrN0,70728
 pyxcp/master/errorhandler.py,sha256=rVtCpvkxWLZtAYpjvs3SygQuLGp4lyIIxzFcYjAhsCo,13219
 pyxcp/examples/xcp_read_benchmark.py,sha256=8nlFK7ZssAuwp2nyPdI8s5MDVObP4PKRZJ--hRouNDU,839
 pyxcp/examples/conf_eth.toml,sha256=zONw4kMsNH-uQYd8V3AlNH21sAlJ9wY7RY0DuSGJiiA,109
@@ -140,8 +145,3 @@ pyxcp/recorder/lz4.c,sha256=zpWRavGVvyz-7RsD9NugePXene2bQgDvu1f26SbdkSg,114204
 pyxcp/recorder/build_gcc.sh,sha256=uvMhL4faEJmhG_8rzSOxEBRRqrACC0kmZgaERN8GkUs,209
 pyxcp/vector/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyxcp/vector/map.py,sha256=7CsFSHBjorSw86jHk8bA-Lp1zaQTVeAVxx3JVt7tK1s,2285
-pyxcp-0.21.6.dist-info/RECORD,,
-pyxcp-0.21.6.dist-info/WHEEL,sha256=n3FnKqnoEoBrDnlgv6JYwhAIfxqO8pwutUo8W22lbFc,104
-pyxcp-0.21.6.dist-info/entry_points.txt,sha256=wL4Cgx0wIAbuEr93nPewLCL-6DCSunxxTkui-bibme8,219
-pyxcp-0.21.6.dist-info/METADATA,sha256=wnrJ_7sGy-beWOXX_2budDF1d_jvN1OBvhCPN1trNzA,3861
-pyxcp-0.21.6.dist-info/licenses/LICENSE,sha256=46mU2C5kSwOnkqkw9XQAJlhBL2JAf1_uCD8lVcXyMRg,7652