Skip to content

Dzollo/pyserial timeout remove #821

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

Merged
merged 2 commits into from
Jul 27, 2020
Merged

Dzollo/pyserial timeout remove #821

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c82a33
Remove short pyserial timeout.
denniszollo Jul 15, 2020
0b6e694
Use basedriver.close(). call close on disconnect of CDC driver.
denniszollo Jul 15, 2020
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
3 changes: 3 additions & 0 deletions python/sbp/client/drivers/cdc_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,12 +39,14 @@ def _read(self, size):
print()
print("Piksi disconnected")
print()
self.close()
raise IOError
return return_val
except OSError:
print()
print("Piksi disconnected")
print()
self.close()
raise IOError

def _write(self, s):
Expand All @@ -62,6 +64,7 @@ def _write(self, s):
print()
print("Piksi disconnected")
print()
self.close()
raise IOError

def close(self):
Expand Down
6 changes: 3 additions & 3 deletions python/sbp/client/drivers/pyserial_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def __init__(self, port, baud=115200, rtscts=False):
try:
handle = serial.serial_for_url(port)
handle.baudrate = baud
handle.timeout = 1
handle.timeout = None
handle.rtscts = rtscts
super(PySerialDriver, self).__init__(handle)
except (OSError, serial.SerialException) as e:
Expand Down Expand Up @@ -81,7 +81,7 @@ def _read(self, size):
print()
print("Piksi disconnected")
print()
self.handle.close()
self.close()
raise IOError

def _write(self, s):
Expand All @@ -104,7 +104,7 @@ def _write(self, s):
print()
print("Piksi disconnected")
print()
self.handle.close()
self.close()
raise IOError

def __enter__(self):
Expand Down