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

As we assume a G1 by default now, there's no longer a point in 

writing "huh?". Included question marks for debugging instead.
This commit is contained in:
Markus Hitter 2010-09-25 15:56:52 +02:00
parent f5258ef9fc
commit 903baad3d1
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
gcode.c
View File

@ -271,6 +271,14 @@ void scan_char(uint8_t c) {
if (read_digit.exponent == 0) if (read_digit.exponent == 0)
read_digit.exponent = 1; read_digit.exponent = 1;
break; break;
#ifdef DEBUG
case ' ':
case '\t':
case 10:
case 13;
// ignore
break;
#endif
default: default:
// can't do ranges in switch..case, so process actual digits here // can't do ranges in switch..case, so process actual digits here
@ -280,7 +288,14 @@ void scan_char(uint8_t c) {
if (read_digit.exponent) if (read_digit.exponent)
read_digit.exponent++; read_digit.exponent++;
} }
// everything else is ignored #ifdef DEBUG
else {
// invalid
serial_writechar('?');
serial_writechar(c);
serial_writechar('?');
}
#endif
} }
} else if ( next_target.seen_parens_comment == 1 && c == ')') } else if ( next_target.seen_parens_comment == 1 && c == ')')
next_target.seen_parens_comment = 0; // recognize stuff after a (comment) next_target.seen_parens_comment = 0; // recognize stuff after a (comment)
@ -311,15 +326,8 @@ void scan_char(uint8_t c) {
#endif #endif
) { ) {
// process // process
if (next_target.seen_G || next_target.seen_M) { process_gcode_command(&next_target);
process_gcode_command(&next_target); serial_writestr_P(PSTR("ok\n"));
serial_writestr_P(PSTR("ok\n"));
}
else {
// write "OK" for invalid/unknown commands as well
serial_writestr_P(PSTR("ok huh?\n"));
}
// expect next line number // expect next line number
if (next_target.seen_N == 1) if (next_target.seen_N == 1)