Browse Source

Init serial ports first (#20944)

zeleps 4 years ago
parent
commit
d49969ddf3
No account linked to committer's email address
1 changed files with 11 additions and 11 deletions
  1. 11
    11
      Marlin/src/MarlinCore.cpp

+ 11
- 11
Marlin/src/MarlinCore.cpp View File

886
   #endif
886
   #endif
887
   #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
887
   #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
888
 
888
 
889
+  MYSERIAL0.begin(BAUDRATE);
890
+  millis_t serial_connect_timeout = millis() + 1000UL;
891
+  while (!MYSERIAL0.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
892
+
893
+  #if HAS_MULTI_SERIAL && !HAS_ETHERNET
894
+    MYSERIAL1.begin(BAUDRATE);
895
+    serial_connect_timeout = millis() + 1000UL;
896
+    while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
897
+  #endif
898
+  SERIAL_ECHOLNPGM("start");
899
+
889
   // Set up these pins early to prevent suicide
900
   // Set up these pins early to prevent suicide
890
   #if HAS_KILL
901
   #if HAS_KILL
891
     SETUP_LOG("KILL_PIN");
902
     SETUP_LOG("KILL_PIN");
918
     #endif
929
     #endif
919
   #endif
930
   #endif
920
 
931
 
921
-  MYSERIAL0.begin(BAUDRATE);
922
-  millis_t serial_connect_timeout = millis() + 1000UL;
923
-  while (!MYSERIAL0.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
924
-
925
-  #if HAS_MULTI_SERIAL && !HAS_ETHERNET
926
-    MYSERIAL1.begin(BAUDRATE);
927
-    serial_connect_timeout = millis() + 1000UL;
928
-    while (!MYSERIAL1.connected() && PENDING(millis(), serial_connect_timeout)) { /*nada*/ }
929
-  #endif
930
-  SERIAL_ECHOLNPGM("start");
931
-
932
   #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
932
   #if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
933
     mks_esp_wifi_init();
933
     mks_esp_wifi_init();
934
     WIFISERIAL.begin(WIFI_BAUDRATE);
934
     WIFISERIAL.begin(WIFI_BAUDRATE);

Loading…
Cancel
Save