Druk-3D/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-11-02 11:25:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

gcode: Move shutdown debugging to "klippy:analyze_shutdown" event

Browse Source 
Signed-off-by: Kevin O'Connor <kevin@koconnor.net>
This commit is contained in:
Kevin O'Connor
2025-10-08 14:06:12 -04:00
parent c64c5e891c
commit 6f5ab8d0e8
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
klippy/gcode.py
View File

@@ -369,8 +369,6 @@ class GCodeDispatch:
class GCodeIO: class GCodeIO:
def __init__(self, printer): def __init__(self, printer):
self.printer = 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 = printer.lookup_object('gcode')
self.gcode_mutex = self.gcode.get_mutex() self.gcode_mutex = self.gcode.get_mutex()
self.fd = printer.get_start_args().get("gcode_fd") self.fd = printer.get_start_args().get("gcode_fd")
@@ -388,12 +386,17 @@ class GCodeIO:
self.pending_commands = [] self.pending_commands = []
self.bytes_read = 0 self.bytes_read = 0
self.input_log = collections.deque([], 50) 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): def _handle_ready(self):
self.is_printer_ready = True self.is_printer_ready = True
if self.is_fileinput and self.fd_handle is None: if self.is_fileinput and self.fd_handle is None:
self.fd_handle = self.reactor.register_fd(self.fd, self.fd_handle = self.reactor.register_fd(self.fd,
self._process_data) self._process_data)
def _dump_debug(self): def _handle_analyze_shutdown(self, msg, details):
out = [] out = []
out.append("Dumping gcode input %d blocks" % (len(self.input_log),)) out.append("Dumping gcode input %d blocks" % (len(self.input_log),))
for eventtime, data in self.input_log: for eventtime, data in self.input_log:
@@ -403,7 +406,6 @@ class GCodeIO:
if not self.is_printer_ready: if not self.is_printer_ready:
return return
self.is_printer_ready = False self.is_printer_ready = False
self._dump_debug()
if self.is_fileinput: if self.is_fileinput:
self.printer.request_exit('error_exit') self.printer.request_exit('error_exit')
m112_r = re.compile(r'^(?:[nN][0-9]+)?\s*[mM]112(?:\s|$)') m112_r = re.compile(r'^(?:[nN][0-9]+)?\s*[mM]112(?:\s|$)')