From 3201fd15386d1fa5285b999f863be5c36a99952b Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Sun, 14 Jan 2018 19:36:30 +0100 Subject: [PATCH 1/2] removed duplicit comment --- Firmware/MarlinSerial.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Firmware/MarlinSerial.cpp b/Firmware/MarlinSerial.cpp index 359aaa59..357de7c6 100644 --- a/Firmware/MarlinSerial.cpp +++ b/Firmware/MarlinSerial.cpp @@ -196,10 +196,6 @@ int MarlinSerial::read(void) void MarlinSerial::flush() { - // don't reverse this or there may be problems if the RX interrupt - // occurs after reading the value of rx_buffer_head but before writing - // the value to rx_buffer_tail; the previous value of rx_buffer_head - // may be written to rx_buffer_tail, making it appear as if the buffer // don't reverse this or there may be problems if the RX interrupt // occurs after reading the value of rx_buffer_head but before writing // the value to rx_buffer_tail; the previous value of rx_buffer_head From 1d3f6e8be56ec8f3a8b32f11b3188a11bc30cc19 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Mon, 15 Jan 2018 12:18:21 +0100 Subject: [PATCH 2/2] flush rx buffer in case that it was full --- Firmware/cmdqueue.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/Firmware/cmdqueue.cpp b/Firmware/cmdqueue.cpp index 2bb38984..771daafe 100644 --- a/Firmware/cmdqueue.cpp +++ b/Firmware/cmdqueue.cpp @@ -368,11 +368,15 @@ void get_command() bool rx_buffer_full = false; //flag that serial rx buffer is full + if (MYSERIAL.available() == RX_BUFFER_SIZE - 1) { //compare number of chars buffered in rx buffer with rx buffer size + MYSERIAL.flush(); + SERIAL_ECHOLNPGM("Full RX Buffer"); //if buffer was full, there is danger that reading of last gcode will not be completed + + rx_buffer_full = true; //sets flag that buffer was full + } + while (MYSERIAL.available() > 0) { - if (MYSERIAL.available() == RX_BUFFER_SIZE - 1) { //compare number of chars buffered in rx buffer with rx buffer size - SERIAL_ECHOLNPGM("Full RX Buffer"); //if buffer was full, there is danger that reading of last gcode will not be completed - rx_buffer_full = true; //sets flag that buffer was full - } + char serial_char = MYSERIAL.read(); /* if (selectedSerialPort == 1) { @@ -529,11 +533,11 @@ void get_command() } //add comment - if (rx_buffer_full == true && serial_count > 0) { //if rx buffer was full and string was not properly terminated + /*if (rx_buffer_full == true && serial_count > 0) { //if rx buffer was full and string was not properly terminated rx_buffer_full = false; bufindw = bufindw - serial_count; //adjust tail of the buffer to prepare buffer for writing new command serial_count = 0; - } + }*/ #ifdef SDSUPPORT if(!card.sdprinting || serial_count!=0){