From d1256be7ec728b17b3a7a628acc5495a3bab3077 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 11 Mar 2018 07:34:21 -0500 Subject: [PATCH] FlushSerialRequestResend => flush_and_request_resend --- Marlin/Marlin.h | 2 +- Marlin/Marlin_main.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Marlin.h b/Marlin/Marlin.h index 3cbf06541..4730ab251 100644 --- a/Marlin/Marlin.h +++ b/Marlin/Marlin.h @@ -184,7 +184,7 @@ void sync_plan_position_e(); #define SYNC_PLAN_POSITION_KINEMATIC() sync_plan_position() #endif -void FlushSerialRequestResend(); +void flush_and_request_resend(); void ok_to_send(); void kill(const char*); diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index 5a12e5d27..2d8e2235c 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -986,7 +986,7 @@ void gcode_line_error(const char* err, bool doFlush = true) { serialprintPGM(err); SERIAL_ERRORLN(gcode_LastN); //Serial.println(gcode_N); - if (doFlush) FlushSerialRequestResend(); + if (doFlush) flush_and_request_resend(); serial_count = 0; } @@ -10975,7 +10975,7 @@ inline void gcode_M999() { if (parser.boolval('S')) return; // gcode_LastN = Stopped_gcode_LastN; - FlushSerialRequestResend(); + flush_and_request_resend(); } #if ENABLED(SWITCHING_EXTRUDER) @@ -12014,7 +12014,7 @@ void process_next_command() { * Send a "Resend: nnn" message to the host to * 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:"; SERIAL_FLUSH(); SERIAL_PROTOCOLPGM(MSG_RESEND);