|
|
@ -262,8 +262,7 @@ void GCodeQueue::RingBuffer::ok_to_send() { |
|
|
|
* Send a "Resend: nnn" message to the host to |
|
|
|
* indicate that a command needs to be re-sent. |
|
|
|
*/ |
|
|
|
void GCodeQueue::flush_and_request_resend() { |
|
|
|
const serial_index_t serial_ind = ring_buffer.command_port(); |
|
|
|
void GCodeQueue::flush_and_request_resend(const serial_index_t serial_ind) { |
|
|
|
#if HAS_MULTI_SERIAL |
|
|
|
if (serial_ind < 0) return; // Never mind. Command came from SD or Flash Drive
|
|
|
|
PORT_REDIRECT(SERIAL_PORTMASK(serial_ind)); // Reply to the serial port that sent the command
|
|
|
@ -306,7 +305,7 @@ void GCodeQueue::gcode_line_error(PGM_P const err, const serial_index_t serial_i |
|
|
|
SERIAL_ERROR_START(); |
|
|
|
SERIAL_ECHOLNPAIR_P(err, serial_state[serial_ind].last_N); |
|
|
|
while (read_serial(serial_ind) != -1) { /* nada */ } // Clear out the RX buffer. Why don't use flush here ?
|
|
|
|
flush_and_request_resend(); |
|
|
|
flush_and_request_resend(serial_ind); |
|
|
|
serial_state[serial_ind].count = 0; |
|
|
|
} |
|
|
|
|
|
|
|