Configurable PSU power-on delay (#16050)

This commit is contained in:
Felicia Hummel
2019-11-30 14:17:24 +01:00
committed by Scott Lahteine
parent 27943f9e31
commit 690ed531b6
138 changed files with 411 additions and 274 deletions

View File

@ -110,7 +110,7 @@
#include "feature/I2CPositionEncoder.h"
#endif
#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)
#if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
#include "feature/tmc_util.h"
#endif
@ -234,7 +234,7 @@ void setup_powerhold() {
OUT_WRITE(SUICIDE_PIN, !SUICIDE_PIN_INVERTING);
#endif
#if ENABLED(PSU_CONTROL)
#if ENABLED(PS_DEFAULT_OFF)
#if ENABLED(PSU_DEFAULT_OFF)
powersupply_on = true; PSU_OFF();
#else
powersupply_on = false; PSU_ON();
@ -1110,7 +1110,7 @@ void setup() {
host_action_prompt_end();
#endif
#if HAS_TRINAMIC && DISABLED(PS_DEFAULT_OFF)
#if HAS_TRINAMIC && DISABLED(PSU_DEFAULT_OFF)
test_tmc_connection(true, true, true, true);
#endif

View File

@ -72,7 +72,7 @@
#endif
#if DISABLED(AUTO_POWER_CONTROL)
delay(100); // Wait for power to settle
delay(PSU_POWERUP_DELAY); // Wait for power to settle
restore_stepper_drivers();
#endif

View File

@ -330,6 +330,13 @@
#else
#define PSU_NAME "ATX" // ATX style
#endif
#if DISABLED(AUTO_POWER_CONTROL)
#ifndef PSU_POWERUP_DELAY
#define PSU_POWERUP_DELAY 100
#endif
#elif defined(PSU_POWERUP_DELAY)
#error "PSU_POWERUP_DELAY has no effect if AUTO_POWER_CONTROL is enabled."
#endif
#else
#define PSU_NAME "Generic" // No control
#endif

View File

@ -416,6 +416,8 @@
#error "BABYSTEP_MULTIPLICATOR is now BABYSTEP_MULTIPLICATOR_[XY|Z]. Please update Configuration_adv.h."
#elif defined(LULZBOT_TOUCH_UI)
#error "LULZBOT_TOUCH_UI is now TOUCH_UI_FTDI_EVE. Please update your configuration."
#elif defined(PS_DEFAULT_OFF)
#error "PS_DEFAULT_OFF is now PSU_DEFAULT_OFF. Please update your configuration."
#endif
#define BOARD_MKS_13 -1000