From b2c78d71b05690c68e4e48e6bba0c7bdebf8814d Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 16 Aug 2020 15:39:30 -0400 Subject: gcode: Remove "action_" commands from get_status() calls Rename printer.gcode.action_emergency_stop() to action_emergency_stop(), printer.gcode.action_respond_info() to action_respond_info(), and printer.gcode.action_respond_error() to action_raise_error() in command templates. This simplifies the get_status() interface, as returning callable functions from that interface was confusing. Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index 8b2513a1..537c81db 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -167,15 +167,6 @@ class GCodeParser: self.move_with_transform = transform.move self.position_with_transform = transform.get_position return old_transform - def _action_emergency_stop(self, msg="action_emergency_stop"): - self.printer.invoke_shutdown("Shutdown due to %s" % (msg,)) - return "" - def _action_respond_info(self, msg): - self.respond_info(msg) - return "" - def _action_respond_error(self, msg): - self._respond_error(msg) - return "" def _get_gcode_position(self): p = [lp - bp for lp, bp in zip(self.last_position, self.base_position)] p[3] /= self.extrude_factor @@ -208,9 +199,6 @@ class GCodeParser: 'homing_ypos': self.homing_position[1], 'homing_zpos': self.homing_position[2], 'gcode_position': homing.Coord(*move_position), - 'action_respond_info': self._action_respond_info, - 'action_respond_error': self._action_respond_error, - 'action_emergency_stop': self._action_emergency_stop, } def dump_state(self): return ("gcode state: absolute_coord=%s absolute_extrude=%s" -- cgit v1.2.3-70-g09d2