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

Fix parser parameter value handling

Browse Source
This commit is contained in:
Scott Lahteine 2017-11-14 23:20:33 -06:00
parent e70b44dc0b
commit 2c8c30437e
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/src/gcode/parser.cpp
View File

@ -170,7 +170,7 @@ void GCodeParser::parse(char *p) {
* For 'M118' you must use 'E1' and 'A1' rather than just 'E' or 'A' * For 'M118' you must use 'E1' and 'A1' rather than just 'E' or 'A'
*/ */
string_arg = NULL; string_arg = NULL;
while (char code = *p++) { // Get the next parameter. A NUL ends the loop while (const char code = *p++) { // Get the next parameter. A NUL ends the loop
// Special handling for M32 [P] !/path/to/file.g# // Special handling for M32 [P] !/path/to/file.g#
// The path must be the last parameter // The path must be the last parameter
@ -191,12 +191,20 @@ void GCodeParser::parse(char *p) {
if (PARAM_TEST) { if (PARAM_TEST) {
while (*p == ' ') p++; // Skip spaces between parameters & values while (*p == ' ') p++; // Skip spaces between parameters & values
const bool has_num = DECIMAL_SIGNED(*p); // The parameter has a number [-+0-9.]
const bool has_num = NUMERIC(p[0]) // [0-9]
|| (p[0] == '.' && NUMERIC(p[1])) // .[0-9]
|| (
(p[0] == '-' || p[0] == '+') && ( // [-+]
NUMERIC(p[1]) // [0-9]
|| (p[1] == '.' && NUMERIC(p[2])) // .[0-9]
)
);
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)
if (debug) { if (debug) {
SERIAL_ECHOPAIR("Got letter ", code); // DEBUG SERIAL_ECHOPAIR("Got letter ", code);
SERIAL_ECHOPAIR(" at index ", (int)(p - command_ptr - 1)); // DEBUG SERIAL_ECHOPAIR(" at index ", (int)(p - command_ptr - 1));
if (has_num) SERIAL_ECHOPGM(" (has_num)"); if (has_num) SERIAL_ECHOPGM(" (has_num)");
} }
#endif #endif
@ -213,11 +221,13 @@ void GCodeParser::parse(char *p) {
#endif #endif
#if ENABLED(FASTER_GCODE_PARSER) #if ENABLED(FASTER_GCODE_PARSER)
{
set(code, has_num ? p : NULL // Set parameter exists and pointer (NULL for no number) set(code, has_num ? p : NULL // Set parameter exists and pointer (NULL for no number)
#if ENABLED(DEBUG_GCODE_PARSER) #if ENABLED(DEBUG_GCODE_PARSER)
, debug , debug
#endif #endif
); );
}
#endif #endif
} }
else if (!string_arg) { // Not A-Z? First time, keep as the string_arg else if (!string_arg) { // Not A-Z? First time, keep as the string_arg
@ -227,8 +237,8 @@ void GCodeParser::parse(char *p) {
#endif #endif
} }
if (!WITHIN(*p, 'A', 'Z')) { if (!WITHIN(*p, 'A', 'Z')) { // Another parameter right away?
while (*p && NUMERIC(*p)) p++; // Skip over the value section of a parameter while (*p && DECIMAL_SIGNED(*p)) p++; // Skip over the value section of a parameter
while (*p == ' ') p++; // Skip over all spaces while (*p == ' ') p++; // Skip over all spaces
} }
} }