From a0a93e35ae4275c1f99d776b5cc32d91ee7160d2 Mon Sep 17 00:00:00 2001
From: Robby Candra <robbycandra.mail@gmail.com>
Date: Mon, 27 Jan 2020 11:46:26 +0700
Subject: [PATCH] =?UTF-8?q?Fix=20serial=20port=20redirection=20(index=20?=
=?UTF-8?q?=E2=89=A0=20port=20num)=20(#16687)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/core/serial.cpp | 2 +-
Marlin/src/gcode/queue.cpp | 17 ++++++++---------
Marlin/src/gcode/queue.h | 2 +-
3 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/Marlin/src/core/serial.cpp b/Marlin/src/core/serial.cpp
index 534d94f00a..2c37d681ee 100644
--- a/Marlin/src/core/serial.cpp
+++ b/Marlin/src/core/serial.cpp
@@ -29,7 +29,7 @@ static const char errormagic[] PROGMEM = "Error:";
static const char echomagic[] PROGMEM = "echo:";
#if NUM_SERIAL > 1
- int8_t serial_port_index = SERIAL_PORT;
+ int8_t serial_port_index = 0;
#endif
void serialprintPGM(PGM_P str) {
diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp
index ff35b553a8..b1673f57f3 100644
--- a/Marlin/src/gcode/queue.cpp
+++ b/Marlin/src/gcode/queue.cpp
@@ -191,7 +191,6 @@ bool GCodeQueue::process_injected_command() {
// Execute command if non-blank
if (i) {
parser.parse(cmd);
- PORT_REDIRECT(SERIAL_PORT);
gcode.process_parsed_command();
}
return true;
@@ -243,7 +242,7 @@ void GCodeQueue::ok_to_send() {
#if NUM_SERIAL > 1
const int16_t pn = port[index_r];
if (pn < 0) return;
- PORT_REDIRECT(pn);
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
#endif
if (!send_ok[index_r]) return;
SERIAL_ECHOPGM(MSG_OK);
@@ -267,9 +266,9 @@ void GCodeQueue::ok_to_send() {
*/
void GCodeQueue::flush_and_request_resend() {
#if NUM_SERIAL > 1
- const int16_t p = port[index_r];
- if (p < 0) return;
- PORT_REDIRECT(p);
+ const int16_t pn = port[index_r];
+ if (pn < 0) return;
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
#endif
SERIAL_FLUSH();
SERIAL_ECHOPGM(MSG_RESEND);
@@ -296,14 +295,14 @@ inline int read_serial(const uint8_t index) {
}
}
-void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t port) {
- PORT_REDIRECT(port);
+void GCodeQueue::gcode_line_error(PGM_P const err, const int8_t pn) {
+ PORT_REDIRECT(pn); // Reply to the serial port that sent the command
SERIAL_ERROR_START();
serialprintPGM(err);
SERIAL_ECHOLN(last_N);
- while (read_serial(port) != -1); // clear out the RX buffer
+ while (read_serial(pn) != -1); // Clear out the RX buffer
flush_and_request_resend();
- serial_count[port] = 0;
+ serial_count[pn] = 0;
}
FORCE_INLINE bool is_M29(const char * const cmd) { // matches "M29" & "M29 ", but not "M290", etc
diff --git a/Marlin/src/gcode/queue.h b/Marlin/src/gcode/queue.h
index 173cadc68e..d7f30d1bac 100644
--- a/Marlin/src/gcode/queue.h
+++ b/Marlin/src/gcode/queue.h
@@ -150,7 +150,7 @@ private:
*/
static bool enqueue_one(const char* cmd);
- static void gcode_line_error(PGM_P const err, const int8_t port);
+ static void gcode_line_error(PGM_P const err, const int8_t pn);
};
--
GitLab