zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Use PSU powerup delay for all powerups (#16065)

Browse source
This commit is contained in:
ManuelMcLure 2019-12-01 15:36:49 -08:00 committed by Scott Lahteine
parent 25a7ceabdb
commit c061656659
3 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/feature/power.cpp
View file

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

2
Marlin/src/inc/Conditionals_post.h
View file

@ -333,7 +333,7 @@
#endif #endif
#endif #endif
#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL) && DISABLED(AUTO_POWER_CONTROL) #if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL)
#define PSU_POWERUP_DELAY 100 #define PSU_POWERUP_DELAY 100
#endif #endif

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)
#error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'." #error "PSU_CONTROL requires PSU_ACTIVE_HIGH to be defined as 'true' or 'false'."
#elif !PIN_EXISTS(PS_ON) #elif !PIN_EXISTS(PS_ON)
#error "PSU_CONTROL requires PS_ON_PIN." #error "PSU_CONTROL requires PS_ON_PIN."
#elif defined(PSU_POWERUP_DELAY) && ENABLED(AUTO_POWER_CONTROL)
#error "PSU_POWERUP_DELAY has no effect with AUTO_POWER_CONTROL enabled."
#endif #endif
#elif ENABLED(AUTO_POWER_CONTROL) #elif ENABLED(AUTO_POWER_CONTROL)
#error "AUTO_POWER_CONTROL requires PSU_CONTROL." #error "AUTO_POWER_CONTROL requires PSU_CONTROL."