bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Merge pull request #3044 from thinkyhead/rc_gcode_spaces

Browse Source 
Fix GCode handling of spaces between command letter and first digit
This commit is contained in:
Scott Lahteine 2016-02-27 22:21:28 -08:00
commit d118e3f985
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -5704,8 +5704,12 @@ void process_next_command() {
// Get the command code, which must be G, M, or T // Get the command code, which must be G, M, or T
char command_code = *current_command; char command_code = *current_command;
// Skip the letter-code and spaces to get the numeric part
current_command_args = current_command + 1;
while (*current_command_args == ' ') ++current_command_args;
// The code must have a numeric value // The code must have a numeric value
bool code_is_good = (current_command[1] >= '0' && current_command[1] <= '9'); bool code_is_good = (*current_command_args >= '0' && *current_command_args <= '9');
int codenum; // define ahead of goto int codenum; // define ahead of goto
@ -5714,9 +5718,7 @@ void process_next_command() {
// Args pointer optimizes code_seen, especially those taking XYZEF // Args pointer optimizes code_seen, especially those taking XYZEF
// This wastes a little cpu on commands that expect no arguments. // This wastes a little cpu on commands that expect no arguments.
current_command_args = current_command+2; // skip two chars for command code and first digit while (*current_command_args == ' ' || (*current_command_args >= '0' && *current_command_args <= '9')) ++current_command_args;
while (*current_command_args >= '0' && *current_command_args <= '9') ++current_command_args;
while (*current_command_args == ' ') ++current_command_args;
// Interpret the code int // Interpret the code int
seen_pointer = current_command; seen_pointer = current_command;