CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 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
Show Stats 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 #endif
/** /**
* Power Supply Control * Power Supply
*/ */
#ifndef PSU_NAME #ifndef PSU_NAME
#if ENABLED(PSU_CONTROL) #if DISABLED(PSU_CONTROL)
#if PSU_ACTIVE_HIGH #define PSU_NAME "Generic" // No control
#define PSU_NAME "XBox" // X-Box 360 (203W) #elif PSU_ACTIVE_HIGH
#else #define PSU_NAME "XBox" // X-Box 360 (203W)
#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 #else
#define PSU_NAME "Generic" // No control #define PSU_NAME "ATX" // ATX style
#endif #endif
#endif #endif
#if !defined(PSU_POWERUP_DELAY) && ENABLED(PSU_CONTROL) && DISABLED(AUTO_POWER_CONTROL)
#define PSU_POWERUP_DELAY 100
#endif
/** /**
* Temp Sensor defines * Temp Sensor defines
*/ */

4
Marlin/src/inc/SanityCheck.h
View File

@ -1605,7 +1605,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
/** /**
* LED Backlight Timeout * LED Backlight Timeout
*/ */
#if defined(LED_BACKLIGHT_TIMEOUT) && !(EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && ENABLED(PSU_CONTROL)) #if defined(LED_BACKLIGHT_TIMEOUT) && !(ENABLED(PSU_CONTROL) && EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1))
#error "LED_BACKLIGHT_TIMEOUT requires a FYSETC Mini Panel and a Power Switch." #error "LED_BACKLIGHT_TIMEOUT requires a FYSETC Mini Panel and a Power Switch."
#endif #endif
@ -2486,6 +2486,8 @@ 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."