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

G-code parser: an asterisk always ends all fields. 

This solves lines like these, with previous answer:

  M23 bla*3
  ok E: Bad M-code 233
  M23 123*92
  ok E: Bad M-code 88

It should also solve lines with ;-comment _and_ a checksum.
This commit is contained in:
Markus Hitter 2015-07-05 20:04:42 +02:00
parent 49345782f6
commit c6916e2a5b
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gcode_parse.c
View File

@ -112,6 +112,12 @@ void gcode_parse_char(uint8_t c) {
sim_gcode_ch(c);
#endif
// An asterisk is a quasi-EOL and always ends all fields.
if (c == '*') {
next_target.seen_semi_comment = next_target.seen_parens_comment =
next_target.read_string = 0;
}
// Skip comments and strings.
if (next_target.seen_semi_comment == 0 &&
next_target.seen_parens_comment == 0 &&
@ -133,6 +139,7 @@ void gcode_parse_char(uint8_t c) {
// SD card command with a filename.
next_target.read_string = 1; // Reset by string handler or EOL.
str_buf_ptr = 0;
last_field = 0;
}
#endif
if (DEBUG_ECHO && (debug_flags & DEBUG_ECHO))
@ -400,10 +407,11 @@ void gcode_parse_char(uint8_t c) {
#ifdef SD
// Handle string reading. After checking for EOL.
if (next_target.read_string) {
if ((str_buf_ptr && c == ' ') || c == '*') {
next_target.read_string = 0;
if (c == ' ') {
if (str_buf_ptr)
next_target.read_string = 0;
}
else if (c != ' ' && str_buf_ptr < STR_BUF_LEN) {
else if (str_buf_ptr < STR_BUF_LEN) {
gcode_str_buf[str_buf_ptr] = c;
str_buf_ptr++;
gcode_str_buf[str_buf_ptr] = '\0';