bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🐛 Fix serial PORT_RESTORE (and BUFFER_MONITORING) (#23022)

Browse Source
This commit is contained in:
somehibs 2021-10-27 21:00:02 +01:00 committed by Scott Lahteine
parent 66a274452c
commit 0f2c4fc40b
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/core/serial.h
View File

@ -87,7 +87,7 @@ extern uint8_t marlin_debug_flags;
// interface with the ability to output to multiple serial ports. // interface with the ability to output to multiple serial ports.
#if HAS_MULTI_SERIAL #if HAS_MULTI_SERIAL
#define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p) #define _PORT_REDIRECT(n,p) REMEMBER(n,multiSerial.portMask,p)
#define _PORT_RESTORE(n,p) RESTORE(n) #define _PORT_RESTORE(n) RESTORE(n)
#define SERIAL_ASSERT(P) if (multiSerial.portMask!=(P)) { debugger(); } #define SERIAL_ASSERT(P) if (multiSerial.portMask!=(P)) { debugger(); }
// If we have a catchall, use that directly // If we have a catchall, use that directly
#ifdef SERIAL_CATCHALL #ifdef SERIAL_CATCHALL

2
Marlin/src/gcode/queue.cpp
View File

@ -719,7 +719,7 @@ void GCodeQueue::advance() {
if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) { if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval; next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
PORT_REDIRECT(SERIAL_BOTH); PORT_REDIRECT(SerialMask::All);
report_buffer_statistics(); report_buffer_statistics();
PORT_RESTORE(); PORT_RESTORE();
} }

2
Marlin/src/libs/autoreport.h
View File

@ -44,7 +44,7 @@ struct AutoReporter {
next_report_ms = ms + SEC_TO_MS(report_interval); next_report_ms = ms + SEC_TO_MS(report_interval);
PORT_REDIRECT(report_port_mask); PORT_REDIRECT(report_port_mask);
Helper::report(); Helper::report();
//PORT_RESTORE(); PORT_RESTORE();
} }
} }
}; };