From 6f5ab8d0e81cfca1b8d7e0db671ab65182a15481 Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Wed, 8 Oct 2025 14:06:12 -0400 Subject: [PATCH] gcode: Move shutdown debugging to "klippy:analyze_shutdown" event Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/klippy/gcode.py b/klippy/gcode.py index 1c50695d2..93ef38a1e 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -369,8 +369,6 @@ class GCodeDispatch: class GCodeIO: def __init__(self, printer): self.printer = printer - printer.register_event_handler("klippy:ready", self._handle_ready) - printer.register_event_handler("klippy:shutdown", self._handle_shutdown) self.gcode = printer.lookup_object('gcode') self.gcode_mutex = self.gcode.get_mutex() self.fd = printer.get_start_args().get("gcode_fd") @@ -388,12 +386,17 @@ class GCodeIO: self.pending_commands = [] self.bytes_read = 0 self.input_log = collections.deque([], 50) + # Register event handlers + printer.register_event_handler("klippy:ready", self._handle_ready) + printer.register_event_handler("klippy:shutdown", self._handle_shutdown) + printer.register_event_handler("klippy:analyze_shutdown", + self._handle_analyze_shutdown) def _handle_ready(self): self.is_printer_ready = True if self.is_fileinput and self.fd_handle is None: self.fd_handle = self.reactor.register_fd(self.fd, self._process_data) - def _dump_debug(self): + def _handle_analyze_shutdown(self, msg, details): out = [] out.append("Dumping gcode input %d blocks" % (len(self.input_log),)) for eventtime, data in self.input_log: @@ -403,7 +406,6 @@ class GCodeIO: if not self.is_printer_ready: return self.is_printer_ready = False - self._dump_debug() if self.is_fileinput: self.printer.request_exit('error_exit') m112_r = re.compile(r'^(?:[nN][0-9]+)?\s*[mM]112(?:\s|$)')