From f22c9a1ae1facdc0188e29d5e324162ddca8e3fe Mon Sep 17 00:00:00 2001 From: Giuliano Zaro <3684609+GMagician@users.noreply.github.com> Date: Sat, 11 May 2019 02:57:15 +0200 Subject: [PATCH] Fix G-code parser with MMU2 (#13951) --- Marlin/src/gcode/parser.cpp | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp index 0c59ab961..2acf06a17 100644 --- a/Marlin/src/gcode/parser.cpp +++ b/Marlin/src/gcode/parser.cpp @@ -142,27 +142,23 @@ void GCodeParser::parse(char *p) { // Skip spaces to get the numeric part while (*p == ' ') p++; - // Bail if there's no command code number - // Prusa MMU2 has T?/Tx/Tc commands - #if DISABLED(PRUSA_MMU2) - if (!NUMERIC(*p)) return; - #endif - - // Save the command letter at this point - // A '?' signifies an unknown command - command_letter = letter; - - #if ENABLED(PRUSA_MMU2) if (letter == 'T') { // check for special MMU2 T?/Tx/Tc commands if (*p == '?' || *p == 'x' || *p == 'c') { + command_letter = letter; string_arg = p; return; } } #endif + // Bail if there's no command code number + if (!NUMERIC(*p)) return; + + // Save the command letter at this point + // A '?' signifies an unknown command + command_letter = letter; // Get the code number - integer digits only codenum = 0;