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

prepare for protocol changes ie responses after ok instead of separate line

This commit is contained in:
Michael Moon 2010-10-21 21:44:28 +11:00
parent 14c51beb9c
commit 209dfe66bd
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gcode_parse.c
View File

@ -7,6 +7,7 @@
#include "dda_queue.h" #include "dda_queue.h"
#include "debug.h" #include "debug.h"
#include "heater.h" #include "heater.h"
#include "sersendf.h"
#include "gcode_process.h" #include "gcode_process.h"
@ -352,24 +353,21 @@ void gcode_parse_char(uint8_t c) {
#endif #endif
) { ) {
// process // process
serial_writestr_P(PSTR("ok "));
process_gcode_command(); process_gcode_command();
serial_writestr_P(PSTR("ok\n")); serial_writestr_P(PSTR("\n"));
// expect next line number // expect next line number
if (next_target.seen_N == 1) if (next_target.seen_N == 1)
next_target.N_expected = next_target.N + 1; next_target.N_expected = next_target.N + 1;
} }
else { else {
serial_writestr_P(PSTR("Expected checksum ")); sersendf_P(PSTR("rs %ld Expected checksum %d\n"), next_target.N_expected, next_target.checksum_calculated);
serwrite_uint8(next_target.checksum_calculated);
serial_writechar('\n');
request_resend(); request_resend();
} }
} }
else { else {
serial_writestr_P(PSTR("Expected line number ")); sersendf_P(PSTR("rs %ld Expected line number %ld\n"), next_target.N_expected, next_target.N_expected);
serwrite_uint32(next_target.N_expected);
serial_writechar('\n');
request_resend(); request_resend();
} }