Skip to content

Changed slcan serial read routine to be faster and to manage the buffer more carefully #2028

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aaronfultonnz wants to merge 1 commit into
base: main
Choose a base branch
from
+11 −10
Open

Changed slcan serial read routine to be faster and to manage the buffer more carefully #2028

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions can/interfaces/slcan.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,16 +219,17 @@ def _read(self, timeout: float | None) -> str | None:
# Due to accessing `serialPortOrig.in_waiting` too often will reduce the performance.
# We read the `serialPortOrig.in_waiting` only once here.
in_waiting = self.serialPortOrig.in_waiting
for _ in range(max(1, in_waiting)):
new_byte = self.serialPortOrig.read(1)
if new_byte:
self._buffer.extend(new_byte)
else:
break

if new_byte in (self._ERROR, self._OK):
string = self._buffer.decode()
self._buffer.clear()
if in_waiting > 0:
self._buffer.extend(self.serialPortOrig.read(in_waiting))
else:
byte = self.serialPortOrig.read(1)
if byte:
self._buffer.extend(byte)

for i in range(len(self._buffer)):
if self._buffer[i] in (self._OK[0], self._ERROR[0]):
string = self._buffer[: i + 1].decode()
del self._buffer[: i + 1]
return string

if _timeout.expired():
Expand Down