Mirrors_Framework/ODrive
1
0
Fork 0
mirror of https://github.com/odriverobotics/ODrive.git synced 2026-08-19 02:43:27 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #178 from Nate711/master

Browse Source 
Fix timeout error code for macOS
This commit is contained in:
Oskar Weigl
2018-06-20 14:57:56 -07:00
committed by GitHub
parent aa1a3c4907 2d7069d22c
commit aa32837500
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Firmware/fibre/python/fibre/usbbulk_transport.py
+6 -2
View File
@@ -102,11 +102,13 @@ class USBBulkTransport(fibre.protocol.PacketSource, fibre.protocol.PacketSink):
except usb.core.USBError as ex:
if ex.errno == 19 or ex.errno == 32: # "no such device", "pipe error"
raise fibre.protocol.ChannelBrokenException()
elif ex.errno == 110: # timeout
elif ex.errno is None or ex.errno == 60 or ex.errno == 110: # timeout
raise TimeoutError()
else:
self._logger.debug("error in usbbulk_transport.py, process_packet")
self._logger.debug(traceback.format_exc())
self._logger.debug("halt condition: {}".format(ex.errno))
self._logger.debug(str(ex))
# Try resetting halt/stall condition
try:
self.deinit()
@@ -129,11 +131,13 @@ class USBBulkTransport(fibre.protocol.PacketSource, fibre.protocol.PacketSink):
except usb.core.USBError as ex:
if ex.errno == 19 or ex.errno == 32: # "no such device", "pipe error"
raise fibre.protocol.ChannelBrokenException()
elif ex.errno is None or ex.errno == 110: # timeout
elif ex.errno is None or ex.errno == 60 or ex.errno == 110: # timeout
raise TimeoutError()
else:
self._logger.debug("error in usbbulk_transport.py, process_packet")
self._logger.debug(traceback.format_exc())
self._logger.debug("halt condition: {}".format(ex.errno))
self._logger.debug(str(ex))
# Try resetting halt/stall condition
try:
self.deinit()