andreil/klipper
1
0
Fork 0
mirror of https://github.com/andreili/klipper.git synced 2025-09-15 01:41:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

mcu: Disable waiting in send_wait_ack() if in debugging mode

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor 2025-08-22 16:53:34 -04:00
parent 159b71e51e
commit 3aadda6fb3
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
klippy/extras/bus.py
View File

@ -182,7 +182,6 @@ class MCU_I2C:
self.i2c_write_cmd = self.i2c_read_cmd = None self.i2c_write_cmd = self.i2c_read_cmd = None
printer = self.mcu.get_printer() printer = self.mcu.get_printer()
printer.register_event_handler("klippy:connect", self._handle_connect) printer.register_event_handler("klippy:connect", self._handle_connect)
self._debugoutput = printer.get_start_args().get('debugoutput')
# backward support i2c_write inside the init section # backward support i2c_write inside the init section
self._to_write = [] self._to_write = []
def _handle_connect(self): def _handle_connect(self):
@ -217,10 +216,6 @@ class MCU_I2C:
if self.i2c_write_cmd is None: if self.i2c_write_cmd is None:
self._to_write.append(data) self._to_write.append(data)
return return
if self._debugoutput is not None:
self.i2c_write_cmd.send([self.oid, data],
minclock=minclock, reqclock=reqclock)
return
self.i2c_write_cmd.send_wait_ack([self.oid, data], self.i2c_write_cmd.send_wait_ack([self.oid, data],
minclock=minclock, reqclock=reqclock) minclock=minclock, reqclock=reqclock)
def i2c_read(self, write, read_len, retry=True): def i2c_read(self, write, read_len, retry=True):

8
klippy/mcu.py
View File

@ -84,7 +84,7 @@ class CommandQueryWrapper:
# Wrapper around command sending # Wrapper around command sending
class CommandWrapper: class CommandWrapper:
def __init__(self, serial, msgformat, cmd_queue=None): def __init__(self, serial, msgformat, cmd_queue=None, debugoutput=False):
self._serial = serial self._serial = serial
msgparser = serial.get_msgparser() msgparser = serial.get_msgparser()
self._cmd = msgparser.lookup_command(msgformat) self._cmd = msgparser.lookup_command(msgformat)
@ -92,6 +92,9 @@ class CommandWrapper:
cmd_queue = serial.get_default_command_queue() cmd_queue = serial.get_default_command_queue()
self._cmd_queue = cmd_queue self._cmd_queue = cmd_queue
self._msgtag = msgparser.lookup_msgid(msgformat) & 0xffffffff self._msgtag = msgparser.lookup_msgid(msgformat) & 0xffffffff
if debugoutput:
# Can't use send_wait_ack when in debugging mode
self.send_wait_ack = self.send
def send(self, data=(), minclock=0, reqclock=0): def send(self, data=(), minclock=0, reqclock=0):
cmd = self._cmd.encode(data) cmd = self._cmd.encode(data)
self._serial.raw_send(cmd, minclock, reqclock, self._cmd_queue) self._serial.raw_send(cmd, minclock, reqclock, self._cmd_queue)
@ -888,7 +891,8 @@ class MCU:
def alloc_command_queue(self): def alloc_command_queue(self):
return self._serial.alloc_command_queue() return self._serial.alloc_command_queue()
def lookup_command(self, msgformat, cq=None): def lookup_command(self, msgformat, cq=None):
return CommandWrapper(self._serial, msgformat, cq) return CommandWrapper(self._serial, msgformat, cq,
debugoutput=self.is_fileoutput())
def lookup_query_command(self, msgformat, respformat, oid=None, def lookup_query_command(self, msgformat, respformat, oid=None,
cq=None, is_async=False): cq=None, is_async=False):
return CommandQueryWrapper(self._serial, msgformat, respformat, oid, return CommandQueryWrapper(self._serial, msgformat, respformat, oid,