Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-09-21 23:44:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10 from RoCkaZ/master

Browse Source 
Only set new timeout if it is different from the old one
This commit is contained in:
samuelsadok
2020-06-02 19:19:59 +02:00
committed by Samuel Sadok
parent 4f47ab6a06
commit 1d29893e8b
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/fibre/python/fibre/serial_transport.py
+11 -4
View File
@@ -17,7 +17,8 @@ DEFAULT_BAUDRATE = 115200
class SerialStreamTransport(fibre.protocol.StreamSource, fibre.protocol.StreamSink):
def __init__(self, port, baud):
self._dev = serial.Serial(port, baud, timeout=1)
self._timeout = 1
self._dev = serial.Serial(port, baud, timeout=self._timeout)
def process_bytes(self, bytes):
self._dev.write(bytes)
@@ -29,10 +30,16 @@ class SerialStreamTransport(fibre.protocol.StreamSource, fibre.protocol.StreamSi
function blocks forever. A deadline before the current time corresponds
to non-blocking mode.
"""
if deadline is None:
# Only set new timeout value if it is reasonably different from the old one (e.g. 20% as below)
# Otherwise it adds significant overhead (at least under Win10) as the port is reset with every reconfiguration
if deadline is None and self._timeout is not None:
self._timeout = None
self._dev.timeout = None
else:
self._dev.timeout = max(deadline - time.monotonic(), 0)
elif deadline is not None:
new_timeout = max(deadline - time.monotonic(), 0)
if abs(new_timeout - self._timeout) > self._timeout * 0.2:
self._timeout = new_timeout
self._dev.timeout = new_timeout
return self._dev.read(n_bytes)
def get_bytes_or_fail(self, n_bytes, deadline):