bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix PSU_POWERUP_DELAY compile error (#16064)

Browse Source
This commit is contained in:
Felicia Hummel
2019-12-01 19:55:28 +01:00
committed by Scott Lahteine
parent b258cc85bf
commit 6c2438deae
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Marlin/src/inc/Conditionals_post.h
View File

@ -321,27 +321,22 @@
#endif
/**
* Power Supply Control
* Power Supply
*/
#ifndef PSU_NAME
#if ENABLED(PSU_CONTROL)
#if PSU_ACTIVE_HIGH
#define PSU_NAME "XBox" // X-Box 360 (203W)
#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
#if DISABLED(PSU_CONTROL)
#define PSU_NAME "Generic" // No control
#elif PSU_ACTIVE_HIGH
#define PSU_NAME "XBox" // X-Box 360 (203W)
#else
#define PSU_NAME "Generic" // No control
#define PSU_NAME "ATX" // ATX style
#endif
#endif
#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL) && DISABLED(AUTO_POWER_CONTROL)
#define PSU_POWERUP_DELAY 100
#endif
/**
* Temp Sensor defines
*/