josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

G-code parser: make space a field delimiter. 

This is neccessary to allow file names with leading digits. It's
still possible to send commands like M105 with spaces in between
("M1 05") and also to put space between character and number, like
"X 15.0".
This commit is contained in:
Markus Hitter 2015-07-03 00:45:25 +02:00
parent bf6fd141c0
commit 49345782f6
1 changed files with 16 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gcode_parse.c
View File

@ -111,11 +111,15 @@ void gcode_parse_char(uint8_t c) {
#ifdef SIMULATOR #ifdef SIMULATOR
sim_gcode_ch(c); sim_gcode_ch(c);
#endif #endif
// process previous field
if (last_field) { // Skip comments and strings.
// check if we're seeing a new field or end of line if (next_target.seen_semi_comment == 0 &&
// any character will start a new field, even invalid/unknown ones next_target.seen_parens_comment == 0 &&
if ((c >= 'A' && c <= 'Z') || c == '*' || (c == 10) || (c == 13)) { next_target.read_string == 0
) {
// Check if the field has ended. Either by a new field, space or EOL.
if (last_field && ((c >= 'A' && c <= 'Z') || c == '*' || c == ' ' ||
c == '\r' || c == '\n')) {
switch (last_field) { switch (last_field) {
case 'G': case 'G':
next_target.G = read_digit.mantissa; next_target.G = read_digit.mantissa;
@ -210,20 +214,12 @@ void gcode_parse_char(uint8_t c) {
serwrite_uint8(next_target.checksum_read); serwrite_uint8(next_target.checksum_read);
break; break;
} }
// reset for next field
last_field = 0;
read_digit.sign = read_digit.mantissa = read_digit.exponent = 0;
} }
}
// Skip comments and strings.
if (next_target.seen_semi_comment == 0 &&
next_target.seen_parens_comment == 0 &&
next_target.read_string == 0
) {
// new field? // new field?
if ((c >= 'A' && c <= 'Z') || c == '*') { if ((c >= 'A' && c <= 'Z') || c == '*') {
last_field = c; last_field = c;
read_digit.sign = read_digit.mantissa = read_digit.exponent = 0;
if (DEBUG_ECHO && (debug_flags & DEBUG_ECHO)) if (DEBUG_ECHO && (debug_flags & DEBUG_ECHO))
serial_writechar(c); serial_writechar(c);
} }
@ -292,10 +288,10 @@ void gcode_parse_char(uint8_t c) {
// comments // comments
case ';': case ';':
next_target.seen_semi_comment = 1; next_target.seen_semi_comment = 1; // Reset by EOL.
break; break;
case '(': case '(':
next_target.seen_parens_comment = 1; next_target.seen_parens_comment = 1; // Reset by ')' or EOL.
break; break;
// now for some numeracy // now for some numeracy
@ -390,7 +386,8 @@ void gcode_parse_char(uint8_t c) {
next_target.seen_semi_comment = next_target.seen_parens_comment = \ next_target.seen_semi_comment = next_target.seen_parens_comment = \
next_target.read_string = next_target.checksum_read = \ next_target.read_string = next_target.checksum_read = \
next_target.checksum_calculated = 0; next_target.checksum_calculated = 0;
// last_field and read_digit are reset above already last_field = 0;
read_digit.sign = read_digit.mantissa = read_digit.exponent = 0;
if (next_target.option_all_relative) { if (next_target.option_all_relative) {
next_target.target.axis[X] = next_target.target.axis[Y] = next_target.target.axis[Z] = 0; next_target.target.axis[X] = next_target.target.axis[Y] = next_target.target.axis[Z] = 0;
@ -403,10 +400,10 @@ void gcode_parse_char(uint8_t c) {
#ifdef SD #ifdef SD
// Handle string reading. After checking for EOL. // Handle string reading. After checking for EOL.
if (next_target.read_string) { if (next_target.read_string) {
if (c == ' ' || c == '*') { if ((str_buf_ptr && c == ' ') || c == '*') {
next_target.read_string = 0; next_target.read_string = 0;
} }
else if (str_buf_ptr < STR_BUF_LEN) { else if (c != ' ' && str_buf_ptr < STR_BUF_LEN) {
gcode_str_buf[str_buf_ptr] = c; gcode_str_buf[str_buf_ptr] = c;
str_buf_ptr++; str_buf_ptr++;
gcode_str_buf[str_buf_ptr] = '\0'; gcode_str_buf[str_buf_ptr] = '\0';