From 86812432f39ee836ae568f60d5d9bfa85680b69f Mon Sep 17 00:00:00 2001 From: Robby Candra Date: Fri, 7 Feb 2020 03:11:49 +0700 Subject: [PATCH] Remove extraneous Serial init (#16794) --- Marlin/src/HAL/HAL_LPC1768/main.cpp | 9 --------- Marlin/src/MarlinCore.cpp | 7 +------ 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/main.cpp b/Marlin/src/HAL/HAL_LPC1768/main.cpp index 581dd8671..d7ba62fe5 100644 --- a/Marlin/src/HAL/HAL_LPC1768/main.cpp +++ b/Marlin/src/HAL/HAL_LPC1768/main.cpp @@ -136,15 +136,6 @@ void HAL_init() { #endif } - #if NUM_SERIAL > 0 - MYSERIAL0.begin(BAUDRATE); - #if NUM_SERIAL > 1 - MYSERIAL1.begin(BAUDRATE); - #endif - SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000); - SERIAL_FLUSHTX(); - #endif - HAL_timer_init(); } diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index 180bedd87..bb418b1e9 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -880,15 +880,10 @@ void setup() { #if NUM_SERIAL > 0 MYSERIAL0.begin(BAUDRATE); - #if NUM_SERIAL > 1 - MYSERIAL1.begin(BAUDRATE); - #endif - #endif - - #if NUM_SERIAL > 0 uint32_t serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #if NUM_SERIAL > 1 + MYSERIAL1.begin(BAUDRATE); serial_connect_timeout = millis() + 1000UL; while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ } #endif