From 9cb99754c035b90206ef0a02660f674fc9517e9b Mon Sep 17 00:00:00 2001 From: Maksim Bolgov Date: Tue, 29 Sep 2026 19:41:22 +0300 Subject: [PATCH] mcu: Report a normal CommandError if CommandWrapper fails Signed-off-by: Maksim Bolgov Signed-off-by: Kevin O'Connor --- klippy/mcu.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/klippy/mcu.py b/klippy/mcu.py index 5d7c37006..8833a3b97 100644 --- a/klippy/mcu.py +++ b/klippy/mcu.py @@ -110,6 +110,7 @@ class CommandQueryWrapper: class CommandWrapper: def __init__(self, conn_helper, msgformat, cmd_queue=None): self._serial = serial = conn_helper.get_serial() + self._error = conn_helper.get_mcu().get_printer().command_error msgparser = serial.get_msgparser() self._cmd = msgparser.lookup_command(msgformat) if cmd_queue is None: @@ -124,7 +125,11 @@ class CommandWrapper: self._serial.raw_send(cmd, minclock, reqclock, self._cmd_queue) def send_wait_ack(self, data=(), minclock=0, reqclock=0): cmd = self._cmd.encode(data) - self._serial.raw_send_wait_ack(cmd, minclock, reqclock, self._cmd_queue) + try: + self._serial.raw_send_wait_ack(cmd, minclock, reqclock, + self._cmd_queue) + except serialhdl.error as e: + raise self._error(str(e)) def get_command_tag(self): return self._msgtag