Browse Source

Use PSU powerup delay for all powerups (#16065)

ManuelMcLure 5 years ago
parent
commit
c061656659

+ 1
- 1
Marlin/src/feature/power.cpp View File

@@ -109,7 +109,7 @@ void Power::power_on() {
109 109
     PSU_PIN_ON();
110 110
 
111 111
     #if HAS_TRINAMIC
112
-      delay(100); // Wait for power to settle
112
+      delay(PSU_POWERUP_DELAY); // Wait for power to settle
113 113
       restore_stepper_drivers();
114 114
     #endif
115 115
   }

+ 1
- 1
Marlin/src/inc/Conditionals_post.h View File

@@ -333,7 +333,7 @@
333 333
   #endif
334 334
 #endif
335 335
 
336
-#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL) && DISABLED(AUTO_POWER_CONTROL)
336
+#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL)
337 337
   #define PSU_POWERUP_DELAY 100
338 338
 #endif
339 339
 

+ 0
- 2
Marlin/src/inc/SanityCheck.h View File

@@ -2486,8 +2486,6 @@ static_assert(   _ARR_TEST(3,0) && _ARR_TEST(3,1) && _ARR_TEST(3,2)
2486 2486
     #error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'."
2487 2487
   #elif !PIN_EXISTS(PS_ON)
2488 2488
     #error "PSU_CONTROL requires PS_ON_PIN."
2489
-  #elif defined(PSU_POWERUP_DELAY) && ENABLED(AUTO_POWER_CONTROL)
2490
-    #error "PSU_POWERUP_DELAY has no effect with AUTO_POWER_CONTROL enabled."
2491 2489
   #endif
2492 2490
 #elif ENABLED(AUTO_POWER_CONTROL)
2493 2491
   #error "AUTO_POWER_CONTROL requires PSU_CONTROL."

Loading…
Cancel
Save