Skip to content

Commit

Permalink
🐛 Fix serial PORT_RESTORE (and BUFFER_MONITORING) (#23022)
Browse files Browse the repository at this point in the history
  • Loading branch information
somehibs authored and thinkyhead committed Dec 25, 2021
1 parent 66a2744 commit 0f2c4fc
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion Marlin/src/core/serial.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ extern uint8_t marlin_debug_flags;
// interface with the ability to output to multiple serial ports.
#if HAS_MULTI_SERIAL
#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(); }
// If we have a catchall, use that directly
#ifdef SERIAL_CATCHALL
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/gcode/queue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -719,7 +719,7 @@ void GCodeQueue::advance() {

if (auto_buffer_report_interval && ELAPSED(ms, next_buffer_report_ms)) {
next_buffer_report_ms = ms + 1000UL * auto_buffer_report_interval;
PORT_REDIRECT(SERIAL_BOTH);
PORT_REDIRECT(SerialMask::All);
report_buffer_statistics();
PORT_RESTORE();
}
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/libs/autoreport.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ struct AutoReporter {
next_report_ms = ms + SEC_TO_MS(report_interval);
PORT_REDIRECT(report_port_mask);
Helper::report();
//PORT_RESTORE();
PORT_RESTORE();
}
}
};

0 comments on commit 0f2c4fc

Please sign in to comment.