From 167b18b58f919da314266a359353a0bf8e33861b Mon Sep 17 00:00:00 2001 From: Kevin O'Connor Date: Thu, 20 Apr 2017 10:11:10 -0400 Subject: [PATCH] gcode: Ignore M21 command No need to recommend users disable "SD card support" in octoprint - instead, just ignore the M21 command. Signed-off-by: Kevin O'Connor --- docs/Installation.md | 3 --- klippy/gcode.py | 18 ++++++++---------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/docs/Installation.md b/docs/Installation.md index 5c87d2e8..830fe6f9 100644 --- a/docs/Installation.md +++ b/docs/Installation.md @@ -120,9 +120,6 @@ Enter the Settings tab again and under "Serial Connection" change the and may be safely left at 250000). Unselect the "Not only cancel ongoing prints but also disconnect..." checkbox. -Under the "Features" tab, unselect "Enable SD support". Then click -"Save". - Running the host software ========================= diff --git a/klippy/gcode.py b/klippy/gcode.py index 2ef92045..7dd94a38 100644 --- a/klippy/gcode.py +++ b/klippy/gcode.py @@ -44,10 +44,10 @@ class GCodeParser: self.heater_bed = self.printer.objects.get('heater_bed') self.fan = self.printer.objects.get('fan') # Map command handlers - handlers = ['G1', 'G4', 'G20', 'G21', 'G28', 'G90', 'G91', 'G92', - 'M18', 'M82', 'M83', 'M105', 'M110', 'M112', 'M114', 'M115', + handlers = ['G1', 'G4', 'G20', 'G28', 'G90', 'G91', 'G92', + 'M18', 'M82', 'M83', 'M105', 'M112', 'M114', 'M115', 'M206', 'M400', - 'HELP', 'QUERY_ENDSTOPS', + 'HELP', 'IGNORE', 'QUERY_ENDSTOPS', 'RESTART', 'FIRMWARE_RESTART', 'STATUS'] if self.heater_nozzle is not None: handlers.extend(['M104', 'M109', 'PID_TUNE']) @@ -266,9 +266,6 @@ class GCodeParser: def cmd_G20(self, params): # Set units to inches self.respond_error('Machine does not support G20 (inches) command') - def cmd_G21(self, params): - # Set units to millimeters - pass def cmd_G28(self, params): # Move to origin axes = [] @@ -324,10 +321,6 @@ class GCodeParser: def cmd_M109(self, params): # Set Extruder Temperature and Wait self.set_temp(self.heater_nozzle, params, wait=True) - cmd_M110_when_not_ready = True - def cmd_M110(self, params): - # Set Current Line Number - pass def cmd_M112(self, params): # Emergency Stop self.toolhead.force_shutdown() @@ -372,6 +365,11 @@ class GCodeParser: def cmd_M400(self, params): # Wait for current moves to finish self.toolhead.wait_moves() + cmd_IGNORE_when_not_ready = True + cmd_IGNORE_aliases = ["G21", "M110", "M21"] + def cmd_IGNORE(self, params): + # Commands that are just silently accepted + pass cmd_QUERY_ENDSTOPS_help = "Report on the status of each endstop" cmd_QUERY_ENDSTOPS_aliases = ["M119"] def cmd_QUERY_ENDSTOPS(self, params):