diff options
| author | Kevin O'Connor <kevin@koconnor.net> | 2017-03-22 22:26:23 -0400 |
|---|---|---|
| committer | Kevin O'Connor <kevin@koconnor.net> | 2017-03-24 11:13:55 -0400 |
| commit | 1fbb36fa87e30298f858f96dd41ed7a147745acd (patch) | |
| tree | 444de79571eb5f5d850e49ff3d3adc8840ea4109 /klippy | |
| parent | 3cafcc2bc73f945760db6b2cf7feec00e63fc6a5 (diff) | |
| download | kutter-1fbb36fa87e30298f858f96dd41ed7a147745acd.tar.gz kutter-1fbb36fa87e30298f858f96dd41ed7a147745acd.tar.xz kutter-1fbb36fa87e30298f858f96dd41ed7a147745acd.zip | |
serialhdl: Make sure to calculate est_clock before connect() finishes
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy')
| -rw-r--r-- | klippy/serialhdl.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/klippy/serialhdl.py b/klippy/serialhdl.py index ae7df4ee..ef344381 100644 --- a/klippy/serialhdl.py +++ b/klippy/serialhdl.py @@ -96,15 +96,21 @@ class SerialReader: baud_adjust = self.BITS_PER_BYTE / mcu_baud self.ffi_lib.serialqueue_set_baud_adjust( self.serialqueue, baud_adjust) + # Enable periodic get_status timer + get_status = msgparser.lookup_command('get_status') + self.status_cmd = get_status.encode() + self.reactor.update_timer(self.status_timer, self.reactor.NOW) # Load initial last_ack_clock/last_ack_time uptime_msg = msgparser.create_command('get_uptime') params = self.send_with_response(uptime_msg, 'uptime') self.last_ack_clock = (params['high'] << 32) | params['clock'] self.last_ack_time = params['#receive_time'] - # Enable periodic get_status timer - get_status = msgparser.lookup_command('get_status') - self.status_cmd = get_status.encode() - self.reactor.update_timer(self.status_timer, self.reactor.NOW) + # Make sure est_clock is calculated + starttime = eventtime = self.reactor.monotonic() + while not self.est_clock: + if eventtime > starttime + 5.: + raise error("timeout on est_clock calculation") + eventtime = self.reactor.pause(eventtime + 0.010) def connect_file(self, debugoutput, dictionary, pace=False): self.ser = debugoutput self.msgparser.process_identify(dictionary, decompress=False) |