From 9ac348ef7b47d7291a35ae577e357af25f4cbfac Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Fri, 2 Aug 2019 02:19:39 -0500
Subject: [PATCH] SDPOWER => SDPOWER_PIN

---
 Marlin/src/inc/SanityCheck.h               | 2 ++
 Marlin/src/pins/mega/pins_CHEAPTRONICv2.h  | 1 -
 Marlin/src/pins/mega/pins_GT2560_REV_A.h   | 1 -
 Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h | 1 -
 Marlin/src/pins/pins.h                     | 4 ++--
 Marlin/src/pins/pinsDebug_list.h           | 4 ++--
 Marlin/src/pins/ramps/pins_FELIX2.h        | 3 +--
 Marlin/src/pins/ramps/pins_RAMPS_OLD.h     | 2 +-
 Marlin/src/pins/ramps/pins_RUMBA.h         | 1 -
 Marlin/src/pins/stm32/pins_BEAST.h         | 1 -
 Marlin/src/pins/stm32/pins_CHITU3D.h       | 1 -
 Marlin/src/sd/cardreader.cpp               | 5 ++---
 12 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index adece01c4..dd522c481 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 111d76cd2..a409f0335 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 ba4f4830a..3bc68cfd4 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 dbb00d176..86f295b62 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 81b53939f..6b0e5edbd 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 a150e4460..1bbc926e2 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 ec02cc22c..5a1f65058 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 cceeefedb..13a2d9dee 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 606934fd6..0f8ea6ee9 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 e6fc5f769..44204f0c9 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 03a194ad6..7a42dc9e4 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 0ee57c019..d89503963 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
 }