Browse Source

Move setup logging to the top

Scott Lahteine 5 years ago
parent
commit
d8b8d88276
1 changed files with 16 additions and 15 deletions
  1. 16
    15
      Marlin/src/MarlinCore.cpp

+ 16
- 15
Marlin/src/MarlinCore.cpp View File

@@ -875,6 +875,19 @@ void stop() {
875 875
  */
876 876
 void setup() {
877 877
 
878
+  #if ENABLED(MARLIN_DEV_MODE)
879
+    auto log_current_ms = [&](PGM_P const msg) {
880
+      SERIAL_ECHO_START();
881
+      SERIAL_CHAR('['); SERIAL_ECHO(millis()); SERIAL_ECHO("] ");
882
+      serialprintPGM(msg);
883
+      SERIAL_EOL();
884
+    };
885
+    #define SETUP_LOG(M) log_current_ms(PSTR(M))
886
+  #else
887
+    #define SETUP_LOG(...) NOOP
888
+  #endif
889
+  #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
890
+
878 891
   HAL_init();
879 892
 
880 893
   #if HAS_L64XX
@@ -939,12 +952,13 @@ void setup() {
939 952
 
940 953
   #if HAS_TMC_SPI
941 954
     #if DISABLED(TMC_USE_SW_SPI)
942
-      SPI.begin();
955
+      SETUP_RUN(SPI.begin());
943 956
     #endif
944
-    tmc_init_cs_pins();
957
+    SETUP_RUN(tmc_init_cs_pins());
945 958
   #endif
946 959
 
947 960
   #ifdef BOARD_INIT
961
+    SETUP_LOG("BOARD_INIT");
948 962
     BOARD_INIT();
949 963
   #endif
950 964
 
@@ -977,19 +991,6 @@ void setup() {
977 991
   // UI must be initialized before EEPROM
978 992
   // (because EEPROM code calls the UI).
979 993
 
980
-  #if ENABLED(MARLIN_DEV_MODE)
981
-    auto log_current_ms = [&](PGM_P const msg) {
982
-      SERIAL_ECHO_START();
983
-      SERIAL_CHAR('['); SERIAL_ECHO(millis()); SERIAL_ECHO("] ");
984
-      serialprintPGM(msg);
985
-      SERIAL_EOL();
986
-    };
987
-    #define SETUP_LOG(M) log_current_ms(PSTR(M))
988
-  #else
989
-    #define SETUP_LOG(...) NOOP
990
-  #endif
991
-  #define SETUP_RUN(C) do{ SETUP_LOG(STRINGIFY(C)); C; }while(0)
992
-
993 994
   // Set up LEDs early
994 995
   #if HAS_COLOR_LEDS
995 996
     SETUP_RUN(leds.setup());

Loading…
Cancel
Save