aboutsummaryrefslogtreecommitdiffstats
path: root/klippy/mcu.py
diff options
context:
space:
mode:
authorKevin O'Connor <kevin@koconnor.net>2020-10-23 13:08:46 -0400
committerKevin O'Connor <kevin@koconnor.net>2020-10-29 12:00:28 -0400
commit79877acb14c01720130c469a25e86f0d06c539f3 (patch)
treea5af06358ab435e1a014eb2f3baf455a71fbb2ed /klippy/mcu.py
parent5f96f8a29b3e5d49b69c41b51a8dcc218d6be1a5 (diff)
downloadkutter-79877acb14c01720130c469a25e86f0d06c539f3.tar.gz
kutter-79877acb14c01720130c469a25e86f0d06c539f3.tar.xz
kutter-79877acb14c01720130c469a25e86f0d06c539f3.zip
mcu: Add support for setting reqclock in CommandQueryWrapper.send()
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
Diffstat (limited to 'klippy/mcu.py')
-rw-r--r--klippy/mcu.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/klippy/mcu.py b/klippy/mcu.py
index a6246fb8..1d661050 100644
--- a/klippy/mcu.py
+++ b/klippy/mcu.py
@@ -339,8 +339,8 @@ class RetryAsyncCommand:
if params['#sent_time'] >= self.min_query_time:
self.min_query_time = self.reactor.NEVER
self.reactor.async_complete(self.completion, params)
- def get_response(self, cmd, cmd_queue, minclock=0):
- self.serial.raw_send_wait_ack(cmd, minclock, minclock, cmd_queue)
+ def get_response(self, cmd, cmd_queue, minclock=0, reqclock=0):
+ self.serial.raw_send_wait_ack(cmd, minclock, reqclock, cmd_queue)
first_query_time = query_time = self.reactor.monotonic()
while 1:
params = self.completion.wait(query_time + self.RETRY_TIME)
@@ -368,11 +368,12 @@ class CommandQueryWrapper:
if cmd_queue is None:
cmd_queue = serial.get_default_command_queue()
self._cmd_queue = cmd_queue
- def send(self, data=(), minclock=0):
+ def send(self, data=(), minclock=0, reqclock=0):
cmd = self._cmd.encode(data)
xh = self._xmit_helper(self._serial, self._response, self._oid)
+ reqclock = max(minclock, reqclock)
try:
- return xh.get_response(cmd, self._cmd_queue, minclock=minclock)
+ return xh.get_response(cmd, self._cmd_queue, minclock, reqclock)
except serialhdl.error as e:
raise error(str(e))