Skip to content

Commit 7aa164c

Browse files
author
Aaron Fulton
committed
Simplified slcan serial reading
1 parent a82c91d commit 7aa164c

1 file changed

Lines changed: 2 additions & 7 deletions

File tree

can/interfaces/slcan.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -219,15 +219,10 @@ def _read(self, timeout: float | None) -> str | None:
219219
# Due to accessing `serialPortOrig.in_waiting` too often will reduce the performance.
220220
# We read the `serialPortOrig.in_waiting` only once here.
221221
size = self.serialPortOrig.in_waiting or 1
222-
if in_waiting > 0:
223-
self._buffer.extend(self.serialPortOrig.read(in_waiting))
224-
else:
225-
byte = self.serialPortOrig.read(1)
226-
if byte:
227-
self._buffer.extend(byte)
222+
self._buffer.extend(self.serialPortOrig.read(size))
228223

229224
for i, byte in enumerate(self._buffer):
230-
if self._buffer[i] in (self._OK[0], self._ERROR[0]):
225+
if byte in (self._OK[0], self._ERROR[0]):
231226
string = self._buffer[: i + 1].decode()
232227
del self._buffer[: i + 1]
233228
return string

0 commit comments

Comments
 (0)