From 5466bfb500f50824eb7cb06271742589df0f3679 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 27 Sep 2023 17:06:06 +0200 Subject: [PATCH] Cleanup uartout declaration --- Firmware/Marlin.h | 10 ---------- Firmware/Marlin_main.cpp | 5 ++--- 2 files changed, 2 insertions(+), 13 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index b0c024c0e..3c97901b7 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -65,16 +65,6 @@ #include "lcd.h" -#ifdef __cplusplus -extern "C" { -#endif -extern FILE _uartout; -#ifdef __cplusplus -} -#endif - -#define uartout (&_uartout) - #define SERIAL_PROTOCOL(x) (MYSERIAL.print(x)) #define SERIAL_PROTOCOL_F(x,y) (MYSERIAL.print(x,y)) #define SERIAL_PROTOCOLPGM(x) (serialprintPGM(PSTR(x))) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 4730f7f00..b38c10c91 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -773,9 +773,8 @@ static void factory_reset(char level) } } -extern "C" { -FILE _uartout; //= {0}; Global variable is always zero initialized. No need to explicitly state this. -} +static FILE _uartout; +#define uartout (&_uartout) int uart_putchar(char c, FILE *) {