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
     PSU_PIN_ON();
109
     PSU_PIN_ON();
110
 
110
 
111
     #if HAS_TRINAMIC
111
     #if HAS_TRINAMIC
112
-      delay(100); // Wait for power to settle
112
+      delay(PSU_POWERUP_DELAY); // Wait for power to settle
113
       restore_stepper_drivers();
113
       restore_stepper_drivers();
114
     #endif
114
     #endif
115
   }
115
   }

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

333
   #endif
333
   #endif
334
 #endif
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
   #define PSU_POWERUP_DELAY 100
337
   #define PSU_POWERUP_DELAY 100
338
 #endif
338
 #endif
339
 
339
 

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

2486
     #error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'."
2486
     #error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'."
2487
   #elif !PIN_EXISTS(PS_ON)
2487
   #elif !PIN_EXISTS(PS_ON)
2488
     #error "PSU_CONTROL requires PS_ON_PIN."
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
   #endif
2489
   #endif
2492
 #elif ENABLED(AUTO_POWER_CONTROL)
2490
 #elif ENABLED(AUTO_POWER_CONTROL)
2493
   #error "AUTO_POWER_CONTROL requires PSU_CONTROL."
2491
   #error "AUTO_POWER_CONTROL requires PSU_CONTROL."

Loading…
Cancel
Save