python-can-csscan-serial 2.4.0__py3-none-any.whl → 2.4.1__py3-none-any.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -12,7 +12,6 @@ from typing import Any, List, Optional, Tuple
12
12
 
13
13
 
14
14
  class CSSCANSerial(can.BusABC):
15
-
16
15
  _VID_CLX000 = 0x1CBE
17
16
  _VID_CANmod = 0x04D8
18
17
 
@@ -57,7 +56,7 @@ class CSSCANSerial(can.BusABC):
57
56
  self._parse()
58
57
 
59
58
  if len(self._events) > 0:
60
- result = self._events.pop()
59
+ result = self._events.popleft()
61
60
 
62
61
  return result, False
63
62
 
@@ -78,9 +77,9 @@ class CSSCANSerial(can.BusABC):
78
77
  # Check for VID for CLX000, CANmod
79
78
  if port.vid not in [cls._VID_CLX000, cls._VID_CANmod]:
80
79
  continue
81
-
80
+
82
81
  # Check for PID for CLX000, CANmod
83
- if port.pid not in[cls._PID_CLX000, cls._PID_CANmod]:
82
+ if port.pid not in [cls._PID_CLX000, cls._PID_CANmod]:
84
83
  continue
85
84
 
86
85
  current = {
@@ -112,7 +111,7 @@ class CSSCANSerial(can.BusABC):
112
111
  payload.extend(struct.pack("!I", id))
113
112
 
114
113
  # Encode DLC
115
- payload.append(msg.dlc)
114
+ payload.append(self.nob_to_dlc(len(msg.data)))
116
115
 
117
116
  # Encode data
118
117
  payload.extend(msg.data)
@@ -145,7 +144,7 @@ class CSSCANSerial(can.BusABC):
145
144
  if self._channel is not None:
146
145
  self._channel.close()
147
146
  self._channel = None
148
-
147
+
149
148
  return
150
149
 
151
150
  def _parse(self):
@@ -166,7 +165,7 @@ class CSSCANSerial(can.BusABC):
166
165
  except ValueError:
167
166
  # No end flag (yet)
168
167
  break
169
-
168
+
170
169
  # Skip all bytes up to the start of frame
171
170
  for _ in range(start_of_frame):
172
171
  self._data.popleft()
@@ -256,6 +255,25 @@ class CSSCANSerial(can.BusABC):
256
255
 
257
256
  return length
258
257
 
258
+ @staticmethod
259
+ def nob_to_dlc(nob):
260
+ if 0 <= nob <= 8:
261
+ return nob
262
+ elif 8 < nob <= 12:
263
+ return 9
264
+ elif 12 < nob <= 16:
265
+ return 10
266
+ elif 16 < nob <= 20:
267
+ return 11
268
+ elif 20 < nob <= 24:
269
+ return 12
270
+ elif 24 < nob <= 32:
271
+ return 13
272
+ elif 32 < nob <= 48:
273
+ return 14
274
+ elif 48 < nob <= 64:
275
+ return 15
276
+
259
277
  @staticmethod
260
278
  def calculate_crc(data: bytes) -> int:
261
279
  initial = 0x0000
@@ -275,4 +293,5 @@ class CSSCANSerial(can.BusABC):
275
293
  crc >>= 1
276
294
 
277
295
  return crc ^ final
296
+
278
297
  pass
@@ -1,6 +1,6 @@
1
- Metadata-Version: 2.1
1
+ Metadata-Version: 2.3
2
2
  Name: python-can-csscan-serial
3
- Version: 2.4.0
3
+ Version: 2.4.1
4
4
  Summary: Interact with CSS Electronics USB devices through Python
5
5
  Project-URL: Homepage, https://canlogger.csselectronics.com/tools-docs/csscan_serial/python_csscan/
6
6
  Author: CSS Electronics
@@ -0,0 +1,7 @@
1
+ python_can_csscan_serial/CSSCANSerial.py,sha256=KHlsT6ycfZ2BjI15A9iJP41X2hoylBj99SYNnaVeuaI,9573
2
+ python_can_csscan_serial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
+ python_can_csscan_serial-2.4.1.dist-info/METADATA,sha256=L9zCL5t8YVL2GozfCkY7y5Qw4trv62j1uY8xM_6bpRA,924
4
+ python_can_csscan_serial-2.4.1.dist-info/WHEEL,sha256=zEMcRr9Kr03x1ozGwg5v9NQBKn3kndp6LSoSlVg-jhU,87
5
+ python_can_csscan_serial-2.4.1.dist-info/entry_points.txt,sha256=1FnKqCf9HuERSJK6nEw2H4gO2TYcVSnW7h9RX8gqdQ0,83
6
+ python_can_csscan_serial-2.4.1.dist-info/licenses/LICENSE,sha256=5PR6baFF-VyANXuj_nFw8Cr4rKZbjojX3-I12Nk3oas,1091
7
+ python_can_csscan_serial-2.4.1.dist-info/RECORD,,
@@ -1,4 +1,4 @@
1
1
  Wheel-Version: 1.0
2
- Generator: hatchling 1.21.1
2
+ Generator: hatchling 1.24.2
3
3
  Root-Is-Purelib: true
4
4
  Tag: py3-none-any
@@ -1,7 +0,0 @@
1
- python_can_csscan_serial/CSSCANSerial.py,sha256=ze9eFOxMJSGXpvZ22H8J705pT3QVoWa4cMtjGsVHOh4,9118
2
- python_can_csscan_serial/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
3
- python_can_csscan_serial-2.4.0.dist-info/METADATA,sha256=WgVztPVKgCGlshsqy7qtp3rBvcagC3lv3tw510w1Q7Q,924
4
- python_can_csscan_serial-2.4.0.dist-info/WHEEL,sha256=TJPnKdtrSue7xZ_AVGkp9YXcvDrobsjBds1du3Nx6dc,87
5
- python_can_csscan_serial-2.4.0.dist-info/entry_points.txt,sha256=1FnKqCf9HuERSJK6nEw2H4gO2TYcVSnW7h9RX8gqdQ0,83
6
- python_can_csscan_serial-2.4.0.dist-info/licenses/LICENSE,sha256=5PR6baFF-VyANXuj_nFw8Cr4rKZbjojX3-I12Nk3oas,1091
7
- python_can_csscan_serial-2.4.0.dist-info/RECORD,,