diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index adece01c4c4d1257eb93e65105f98fe5a727e282..dd522c4814e2b5b451cf65dbbba9b2d1e25ee280 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -384,6 +384,8 @@ #error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h." #elif defined(MKS_ROBIN_TFT) #error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration." +#elif defined(SDPOWER) + #error "SDPOWER is now SDPOWER_PIN. Please update your configuration and/or pins." #endif #define BOARD_MKS_13 -1109 diff --git a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h index 111d76cd200de0b336b54e61f4f746d0cd14aee2..a409f0335238e3fb36e0dafbd42528a3e8774841 100644 --- a/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h +++ b/Marlin/src/pins/mega/pins_CHEAPTRONICv2.h @@ -125,7 +125,6 @@ #define BEEPER_PIN 44 #if ENABLED(SDSUPPORT) - #define SDPOWER -1 #define SDSS 53 #define SD_DETECT_PIN 49 #endif diff --git a/Marlin/src/pins/mega/pins_GT2560_REV_A.h b/Marlin/src/pins/mega/pins_GT2560_REV_A.h index ba4f4830ac5b47cda47bd4aeebb675b37a8237ac..3bc68cfd45dfe16baa9959456ae6aa963865adc4 100644 --- a/Marlin/src/pins/mega/pins_GT2560_REV_A.h +++ b/Marlin/src/pins/mega/pins_GT2560_REV_A.h @@ -89,7 +89,6 @@ // // Misc. Functions // -#define SDPOWER -1 #define SDSS 53 #define LED_PIN 13 #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h index dbb00d176188768e553b1365970036495d15515d..86f295b6226f424880ca5de95fbd9c78b17ca3c6 100644 --- a/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h +++ b/Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h @@ -83,7 +83,6 @@ // SD Card // #define SD_DETECT_PIN -1 -#define SDPOWER -1 #define SDSS 53 // diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 81b53939f832a795fc27f0016b1da9229978d504..6b0e5edbd98136272eb72d2d51941cb5f335e079 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -774,8 +774,8 @@ #ifndef SD_DETECT_PIN #define SD_DETECT_PIN -1 #endif -#ifndef SDPOWER - #define SDPOWER -1 +#ifndef SDPOWER_PIN + #define SDPOWER_PIN -1 #endif #ifndef SDSS #define SDSS -1 diff --git a/Marlin/src/pins/pinsDebug_list.h b/Marlin/src/pins/pinsDebug_list.h index a150e4460abef6770edb617076b7fb8ca5628999..1bbc926e23d991e5bf19419a89f610b2905f2d3d 100644 --- a/Marlin/src/pins/pinsDebug_list.h +++ b/Marlin/src/pins/pinsDebug_list.h @@ -707,8 +707,8 @@ // #if defined(SDA) && SDA >= 0 // REPORT_NAME_DIGITAL(__LINE__, SDA) // #endif -#if defined(SDPOWER) && SDPOWER >= 0 - REPORT_NAME_DIGITAL(__LINE__, SDPOWER) +#if PIN_EXISTS(SDPOWER) + REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN) #endif #if defined(SDSS) && SDSS >= 0 REPORT_NAME_DIGITAL(__LINE__, SDSS) diff --git a/Marlin/src/pins/ramps/pins_FELIX2.h b/Marlin/src/pins/ramps/pins_FELIX2.h index ec02cc22cea1f622a63cc230e09cbf6dc3991258..5a1f6505830e33760015501d9c18331bb4129208 100644 --- a/Marlin/src/pins/ramps/pins_FELIX2.h +++ b/Marlin/src/pins/ramps/pins_FELIX2.h @@ -42,8 +42,7 @@ // // Misc. Functions // -#undef SDPOWER -#define SDPOWER 1 +#define SDPOWER_PIN 1 #define PS_ON_PIN 12 diff --git a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h index cceeefedbe7d81eee9e3ff7ad69cf1052f49bac9..13a2d9dee4a7a91a90968e235487a8d560eb9063 100644 --- a/Marlin/src/pins/ramps/pins_RAMPS_OLD.h +++ b/Marlin/src/pins/ramps/pins_RAMPS_OLD.h @@ -103,7 +103,7 @@ // // Misc. Functions // -#define SDPOWER 48 +#define SDPOWER_PIN 48 #define SDSS 53 #define LED_PIN 13 #define CASE_LIGHT_PIN 45 // Hardware PWM diff --git a/Marlin/src/pins/ramps/pins_RUMBA.h b/Marlin/src/pins/ramps/pins_RUMBA.h index 606934fd668e7dba0f911736f9693b60df24e10a..0f8ea6ee96f8f815a7959670353c9877e90b8b27 100644 --- a/Marlin/src/pins/ramps/pins_RUMBA.h +++ b/Marlin/src/pins/ramps/pins_RUMBA.h @@ -215,7 +215,6 @@ #define BEEPER_PIN 44 #if ENABLED(SDSUPPORT) - #define SDPOWER -1 #define SDSS 53 #define SD_DETECT_PIN 49 #endif diff --git a/Marlin/src/pins/stm32/pins_BEAST.h b/Marlin/src/pins/stm32/pins_BEAST.h index e6fc5f769af54013fdc0e4347559d800cae6fb85..44204f0c9ce35cb105e649ef1021b11089f6cb7b 100644 --- a/Marlin/src/pins/stm32/pins_BEAST.h +++ b/Marlin/src/pins/stm32/pins_BEAST.h @@ -86,7 +86,6 @@ // // Misc. Functions // -#define SDPOWER -1 #define SDSS PA15 #define LED_PIN PB2 diff --git a/Marlin/src/pins/stm32/pins_CHITU3D.h b/Marlin/src/pins/stm32/pins_CHITU3D.h index 03a194ad6d4011bada3abc786cc2662ef3341e67..7a42dc9e4efc0edb47e0add9875f13dced032ad4 100644 --- a/Marlin/src/pins/stm32/pins_CHITU3D.h +++ b/Marlin/src/pins/stm32/pins_CHITU3D.h @@ -84,7 +84,6 @@ // // Misc. Functions // -#define SDPOWER -1 #define SDSS -1 #define LED_PIN -1 #define CASE_LIGHT_PIN 8 diff --git a/Marlin/src/sd/cardreader.cpp b/Marlin/src/sd/cardreader.cpp index 0ee57c019e2514622c7809fc412509f3987ce275..d89503963fb2e6d747b0aa11907014021ed1ac2f 100644 --- a/Marlin/src/sd/cardreader.cpp +++ b/Marlin/src/sd/cardreader.cpp @@ -133,9 +133,8 @@ CardReader::CardReader() { // Disable autostart until card is initialized autostart_index = -1; - //power to SD reader - #if SDPOWER > -1 - OUT_WRITE(SDPOWER, HIGH); + #if PIN_EXISTS(SDPOWER) + OUT_WRITE(SDPOWER_PIN, HIGH); // Power the SD reader #endif }