3diy
/
klipper
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

serialhdl: Detect timeout in SerialReader.send_with_response() 

Raise an error if the response is never received.

Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2017-03-08 21:24:27 -05:00
parent bcaf818c0e
commit 21c4dea0e6
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
klippy/serialhdl.py
View File

@ -8,6 +8,9 @@ import serial
import msgproto, chelper, util import msgproto, chelper, util
class error(Exception):
pass
class SerialReader: class SerialReader:
BITS_PER_BYTE = 10. BITS_PER_BYTE = 10.
def __init__(self, reactor, serialport, baud): def __init__(self, reactor, serialport, baud):
@ -230,6 +233,7 @@ class SerialReader:
# Class to retry sending of a query command until a given response is received # Class to retry sending of a query command until a given response is received
class SerialRetryCommand: class SerialRetryCommand:
TIMEOUT_TIME = 5.0
RETRY_TIME = 0.500 RETRY_TIME = 0.500
def __init__(self, serial, cmd, name): def __init__(self, serial, cmd, name):
self.serial = serial self.serial = serial
@ -240,6 +244,9 @@ class SerialRetryCommand:
self.serial.register_callback(self.handle_callback, self.name) self.serial.register_callback(self.handle_callback, self.name)
self.send_timer = self.serial.reactor.register_timer( self.send_timer = self.serial.reactor.register_timer(
self.send_event, self.serial.reactor.NOW) self.send_event, self.serial.reactor.NOW)
def unregister(self):
self.serial.unregister_callback(self.name)
self.serial.reactor.unregister_timer(self.send_timer)
def send_event(self, eventtime): def send_event(self, eventtime):
if self.response is not None: if self.response is not None:
return self.serial.reactor.NEVER return self.serial.reactor.NEVER
@ -253,8 +260,10 @@ class SerialRetryCommand:
eventtime = self.serial.reactor.monotonic() eventtime = self.serial.reactor.monotonic()
while self.response is None: while self.response is None:
eventtime = self.serial.reactor.pause(eventtime + 0.05) eventtime = self.serial.reactor.pause(eventtime + 0.05)
self.serial.unregister_callback(self.name) if eventtime > self.min_query_time + self.TIMEOUT_TIME:
self.serial.reactor.unregister_timer(self.send_timer) self.unregister()
raise error("Timeout on wait for '%s' response" % (self.name,))
self.unregister()
return self.response return self.response
# Code to start communication and download message type dictionary # Code to start communication and download message type dictionary