andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-08-23 19:34:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

mcu: allow disable send retries

Browse Source 
Signed-off-by: Timofey Titovets <nefelim4ag@gmail.com>
This commit is contained in:
Timofey Titovets 2025-07-03 21:39:49 +02:00 committed by KevinOConnor
parent 119d007058
commit 37ddab223f
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
klippy/mcu.py
View File

@ -31,11 +31,13 @@ class RetryAsyncCommand:
if self.need_response and params['#sent_time'] >= self.min_query_time: if self.need_response and params['#sent_time'] >= self.min_query_time:
self.need_response = False self.need_response = False
self.reactor.async_complete(self.completion, params) self.reactor.async_complete(self.completion, params)
def get_response(self, cmds, cmd_queue, minclock=0, reqclock=0): def get_response(self, cmds, cmd_queue, minclock=0, reqclock=0, retry=True):
cmd, = cmds cmd, = cmds
self.serial.raw_send_wait_ack(cmd, minclock, reqclock, cmd_queue) self.serial.raw_send_wait_ack(cmd, minclock, reqclock, cmd_queue)
self.min_query_time = 0. self.min_query_time = 0.
first_query_time = query_time = self.reactor.monotonic() first_query_time = query_time = self.reactor.monotonic()
if not retry:
self.TIMEOUT_TIME=.0
while 1: while 1:
params = self.completion.wait(query_time + self.RETRY_TIME) params = self.completion.wait(query_time + self.RETRY_TIME)
if params is not None: if params is not None:
@ -64,19 +66,21 @@ class CommandQueryWrapper:
if cmd_queue is None: if cmd_queue is None:
cmd_queue = serial.get_default_command_queue() cmd_queue = serial.get_default_command_queue()
self._cmd_queue = cmd_queue self._cmd_queue = cmd_queue
def _do_send(self, cmds, minclock, reqclock): def _do_send(self, cmds, minclock, reqclock, retry):
xh = self._xmit_helper(self._serial, self._response, self._oid) xh = self._xmit_helper(self._serial, self._response, self._oid)
reqclock = max(minclock, reqclock) reqclock = max(minclock, reqclock)
try: try:
return xh.get_response(cmds, self._cmd_queue, minclock, reqclock) return xh.get_response(cmds, self._cmd_queue, minclock, reqclock,
retry)
except serialhdl.error as e: except serialhdl.error as e:
raise self._error(str(e)) raise self._error(str(e))
def send(self, data=(), minclock=0, reqclock=0): def send(self, data=(), minclock=0, reqclock=0, retry=True):
return self._do_send([self._cmd.encode(data)], minclock, reqclock) return self._do_send([self._cmd.encode(data)], minclock, reqclock,
retry)
def send_with_preface(self, preface_cmd, preface_data=(), data=(), def send_with_preface(self, preface_cmd, preface_data=(), data=(),
minclock=0, reqclock=0): minclock=0, reqclock=0, retry=True):
cmds = [preface_cmd._cmd.encode(preface_data), self._cmd.encode(data)] cmds = [preface_cmd._cmd.encode(preface_data), self._cmd.encode(data)]
return self._do_send(cmds, minclock, reqclock) return self._do_send(cmds, minclock, reqclock, retry)
# Wrapper around command sending # Wrapper around command sending
class CommandWrapper: class CommandWrapper:

5
klippy/serialhdl.py
View File

@ -310,9 +310,12 @@ class SerialRetryCommand:
self.serial.register_response(self.handle_callback, name, oid) self.serial.register_response(self.handle_callback, name, oid)
def handle_callback(self, params): def handle_callback(self, params):
self.last_params = params self.last_params = params
def get_response(self, cmds, cmd_queue, minclock=0, reqclock=0): def get_response(self, cmds, cmd_queue, minclock=0, reqclock=0,
retry=True):
retries = 5 retries = 5
retry_delay = .010 retry_delay = .010
if not retry:
retries = 0
while 1: while 1:
for cmd in cmds[:-1]: for cmd in cmds[:-1]:
self.serial.raw_send(cmd, minclock, reqclock, cmd_queue) self.serial.raw_send(cmd, minclock, reqclock, cmd_queue)