Pārlūkot izejas kodu

Remove extraneous Serial init (#16794)

Robby Candra 5 gadus atpakaļ
vecāks
revīzija
86812432f3
Revīzijas autora e-pasta adrese nav piesaistīta nevienam kontam
2 mainītis faili ar 1 papildinājumiem un 15 dzēšanām
  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 Parādīt failu

@@ -136,15 +136,6 @@ void HAL_init() {
136 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 139
   HAL_timer_init();
149 140
 }
150 141
 

+ 1
- 6
Marlin/src/MarlinCore.cpp Parādīt failu

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

Notiek ielāde…
Atcelt
Saglabāt