Browse Source

Remove extraneous Serial init (#16794)

Robby Candra 5 years ago
parent
commit
86812432f3
No account linked to committer's email address
2 changed files with 1 additions and 15 deletions
  1. 0
    9
      Marlin/src/HAL/HAL_LPC1768/main.cpp
  2. 1
    6
      Marlin/src/MarlinCore.cpp

+ 0
- 9
Marlin/src/HAL/HAL_LPC1768/main.cpp View File

136
     #endif
136
     #endif
137
   }
137
   }
138
 
138
 
139
-  #if NUM_SERIAL > 0
140
-    MYSERIAL0.begin(BAUDRATE);
141
-    #if NUM_SERIAL > 1
142
-      MYSERIAL1.begin(BAUDRATE);
143
-    #endif
144
-    SERIAL_PRINTF("\n\necho:%s (%dMhz) Initialized\n", isLPC1769() ? "LPC1769" : "LPC1768", SystemCoreClock / 1000000);
145
-    SERIAL_FLUSHTX();
146
-  #endif
147
-
148
   HAL_timer_init();
139
   HAL_timer_init();
149
 }
140
 }
150
 
141
 

+ 1
- 6
Marlin/src/MarlinCore.cpp View File

880
 
880
 
881
   #if NUM_SERIAL > 0
881
   #if NUM_SERIAL > 0
882
     MYSERIAL0.begin(BAUDRATE);
882
     MYSERIAL0.begin(BAUDRATE);
883
-    #if NUM_SERIAL > 1
884
-      MYSERIAL1.begin(BAUDRATE);
885
-    #endif
886
-  #endif
887
-
888
-  #if NUM_SERIAL > 0
889
     uint32_t serial_connect_timeout = millis() + 1000UL;
883
     uint32_t serial_connect_timeout = millis() + 1000UL;
890
     while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
884
     while (!MYSERIAL0 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
891
     #if NUM_SERIAL > 1
885
     #if NUM_SERIAL > 1
886
+      MYSERIAL1.begin(BAUDRATE);
892
       serial_connect_timeout = millis() + 1000UL;
887
       serial_connect_timeout = millis() + 1000UL;
893
       while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
888
       while (!MYSERIAL1 && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
894
     #endif
889
     #endif

Loading…
Cancel
Save