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

Report auto temp to both serial ports, if available (#13301)

Browse Source
This commit is contained in:
Chris Pepper 2019-03-04 03:03:48 +00:00 committed by Scott Lahteine
parent 367d392880
commit 38bef9da91
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -42,11 +42,11 @@ enum MarlinDebugFlags : uint8_t {
extern uint8_t marlin_debug_flags; extern uint8_t marlin_debug_flags;
#define DEBUGGING(F) (marlin_debug_flags & (MARLIN_DEBUG_## F)) #define DEBUGGING(F) (marlin_debug_flags & (MARLIN_DEBUG_## F))
#define SERIAL_BOTH 0x7F
#if NUM_SERIAL > 1 #if NUM_SERIAL > 1
extern int8_t serial_port_index; extern int8_t serial_port_index;
#define _PORT_REDIRECT(n,p) REMEMBER(n,serial_port_index,p) #define _PORT_REDIRECT(n,p) REMEMBER(n,serial_port_index,p)
#define _PORT_RESTORE(n) RESTORE(n) #define _PORT_RESTORE(n) RESTORE(n)
#define SERIAL_BOTH 0x7F
#define SERIAL_OUT(WHAT, ...) do{ \ #define SERIAL_OUT(WHAT, ...) do{ \
if (!serial_port_index || serial_port_index == SERIAL_BOTH) MYSERIAL0.WHAT(__VA_ARGS__); \ if (!serial_port_index || serial_port_index == SERIAL_BOTH) MYSERIAL0.WHAT(__VA_ARGS__); \
if ( serial_port_index) MYSERIAL1.WHAT(__VA_ARGS__); \ if ( serial_port_index) MYSERIAL1.WHAT(__VA_ARGS__); \

1
Marlin/src/module/temperature.cpp
View File

@ -2660,6 +2660,7 @@ void Temperature::isr() {
void Temperature::auto_report_temperatures() { void Temperature::auto_report_temperatures() {
if (auto_report_temp_interval && ELAPSED(millis(), next_temp_report_ms)) { if (auto_report_temp_interval && ELAPSED(millis(), next_temp_report_ms)) {
next_temp_report_ms = millis() + 1000UL * auto_report_temp_interval; next_temp_report_ms = millis() + 1000UL * auto_report_temp_interval;
PORT_REDIRECT(SERIAL_BOTH);
print_heater_states(active_extruder); print_heater_states(active_extruder);
SERIAL_EOL(); SERIAL_EOL();
} }