From cd7c1b8e68d8234524149c62e8ea2ad0bda07d2f Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Sun, 16 Aug 2020 14:40:04 -0400 Subject: toolhead: Move G4 and M400 commands from gcode.py to toolhead.py Signed-off-by: Kevin O'Connor --- klippy/gcode.py | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'klippy/gcode.py') diff --git a/klippy/gcode.py b/klippy/gcode.py index 8db551bd..c86549ff 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -344,7 +344,7 @@ class GCodeParser: % (key_param, key)) values[key_param](gcmd) all_handlers = [ - 'G1', 'G4', 'G28', 'M400', + 'G1', 'G28', 'G20', 'M82', 'M83', 'G90', 'G91', 'G92', 'M114', 'M220', 'M221', 'SET_GCODE_OFFSET', 'SAVE_GCODE_STATE', 'RESTORE_GCODE_STATE', 'M112', 'M115', 'IGNORE', 'GET_POSITION', @@ -382,10 +382,6 @@ class GCodeParser: raise gcmd.error("Unable to parse move '%s'" % (gcmd.get_commandline(),)) self.move_with_transform(self.last_position, self.speed) - def cmd_G4(self, gcmd): - # Dwell - delay = gcmd.get_float('P', 0., minval=0.) / 1000. - self.toolhead.dwell(delay) def cmd_G28(self, gcmd): # Move to origin axes = [] @@ -400,9 +396,6 @@ class GCodeParser: homing_state.home_axes(axes) for axis in homing_state.get_axes(): self.base_position[axis] = self.homing_position[axis] - def cmd_M400(self, gcmd): - # Wait for current moves to finish - self.toolhead.wait_moves() # G-Code coordinate manipulation def cmd_G20(self, gcmd): # Set units to inches -- cgit v1.2.3-70-g09d2