zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix G-code parser with MMU2 (#13951)

Browse source
This commit is contained in:
Giuliano Zaro 2019-05-11 02:57:15 +02:00 committed by Scott Lahteine
parent 746c38f4be
commit f22c9a1ae1
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Marlin/src/gcode/parser.cpp
View file

@ -142,27 +142,23 @@ void GCodeParser::parse(char *p) {
// Skip spaces to get the numeric part // Skip spaces to get the numeric part
while (*p == ' ') p++; 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 ENABLED(PRUSA_MMU2)
if (letter == 'T') { if (letter == 'T') {
// check for special MMU2 T?/Tx/Tc commands // check for special MMU2 T?/Tx/Tc commands
if (*p == '?' || *p == 'x' || *p == 'c') { if (*p == '?' || *p == 'x' || *p == 'c') {
command_letter = letter;
string_arg = p; string_arg = p;
return; return;
} }
} }
#endif #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 // Get the code number - integer digits only
codenum = 0; codenum = 0;