Browse Source

Apply AUTO_POWER_CONTROL later in setup() (#21193)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Evgeny Z 4 years ago
parent
commit
6e1c133e33
No account linked to committer's email address
1 changed files with 10 additions and 10 deletions
  1. 10
    10
      Marlin/src/MarlinCore.cpp

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

@@ -915,12 +915,6 @@ void setup() {
915 915
     OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
916 916
   #endif
917 917
 
918
-  #if ENABLED(PSU_CONTROL)
919
-    SETUP_LOG("PSU_CONTROL");
920
-    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
921
-    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
922
-  #endif
923
-
924 918
   #if EITHER(DISABLE_DEBUG, DISABLE_JTAG)
925 919
     // Disable any hardware debug to free up pins for IO
926 920
     #if ENABLED(DISABLE_DEBUG) && defined(JTAGSWD_DISABLE)
@@ -951,10 +945,6 @@ void setup() {
951 945
     OUT_WRITE(MAX6675_SS2_PIN, HIGH); // Disable
952 946
   #endif
953 947
 
954
-  #if HAS_L64XX
955
-    SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
956
-  #endif
957
-
958 948
   #if ENABLED(DUET_SMART_EFFECTOR) && PIN_EXISTS(SMART_EFFECTOR_MOD)
959 949
     OUT_WRITE(SMART_EFFECTOR_MOD_PIN, LOW);   // Put Smart Effector into NORMAL mode
960 950
   #endif
@@ -963,10 +953,20 @@ void setup() {
963 953
     SETUP_RUN(runout.setup());
964 954
   #endif
965 955
 
956
+  #if ENABLED(PSU_CONTROL)
957
+    SETUP_LOG("PSU_CONTROL");
958
+    powersupply_on = ENABLED(PSU_DEFAULT_OFF);
959
+    if (ENABLED(PSU_DEFAULT_OFF)) PSU_OFF(); else PSU_ON();
960
+  #endif
961
+
966 962
   #if ENABLED(POWER_LOSS_RECOVERY)
967 963
     SETUP_RUN(recovery.setup());
968 964
   #endif
969 965
 
966
+  #if HAS_L64XX
967
+    SETUP_RUN(L64xxManager.init());  // Set up SPI, init drivers
968
+  #endif
969
+
970 970
   #if HAS_TMC220x
971 971
     SETUP_RUN(tmc_serial_begin());
972 972
   #endif

Loading…
Cancel
Save