MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

FlushSerialRequestResend => flush_and_request_resend

Browse Source
This commit is contained in:
Scott Lahteine 2018-03-11 07:34:21 -05:00
parent eb6f44372e
commit d1256be7ec
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin.h
View File

@ -184,7 +184,7 @@ void sync_plan_position_e();
#define SYNC_PLAN_POSITION_KINEMATIC() sync_plan_position() #define SYNC_PLAN_POSITION_KINEMATIC() sync_plan_position()
#endif #endif
void FlushSerialRequestResend(); void flush_and_request_resend();
void ok_to_send(); void ok_to_send();
void kill(const char*); void kill(const char*);

6
Marlin/Marlin_main.cpp
View File

@ -986,7 +986,7 @@ void gcode_line_error(const char* err, bool doFlush = true) {
serialprintPGM(err); serialprintPGM(err);
SERIAL_ERRORLN(gcode_LastN); SERIAL_ERRORLN(gcode_LastN);
//Serial.println(gcode_N); //Serial.println(gcode_N);
if (doFlush) FlushSerialRequestResend(); if (doFlush) flush_and_request_resend();
serial_count = 0; serial_count = 0;
} }
@ -10975,7 +10975,7 @@ inline void gcode_M999() {
if (parser.boolval('S')) return; if (parser.boolval('S')) return;
// gcode_LastN = Stopped_gcode_LastN; // gcode_LastN = Stopped_gcode_LastN;
FlushSerialRequestResend(); flush_and_request_resend();
} }
#if ENABLED(SWITCHING_EXTRUDER) #if ENABLED(SWITCHING_EXTRUDER)
@ -12014,7 +12014,7 @@ void process_next_command() {
* Send a "Resend: nnn" message to the host to * Send a "Resend: nnn" message to the host to
* indicate that a command needs to be re-sent. * indicate that a command needs to be re-sent.
*/ */
void FlushSerialRequestResend() { void flush_and_request_resend() {
//char command_queue[cmd_queue_index_r][100]="Resend:"; //char command_queue[cmd_queue_index_r][100]="Resend:";
SERIAL_FLUSH(); SERIAL_FLUSH();
SERIAL_PROTOCOLPGM(MSG_RESEND); SERIAL_PROTOCOLPGM(MSG_RESEND);