Browse Source

SDPOWER => SDPOWER_PIN

Scott Lahteine 4 years ago
parent
commit
9ac348ef7b

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

384
   #error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h."
384
   #error "POWER_SUPPLY is now obsolete. Please remove it from Configuration.h."
385
 #elif defined(MKS_ROBIN_TFT)
385
 #elif defined(MKS_ROBIN_TFT)
386
   #error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration."
386
   #error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT. Please update your configuration."
387
+#elif defined(SDPOWER)
388
+  #error "SDPOWER is now SDPOWER_PIN. Please update your configuration and/or pins."
387
 #endif
389
 #endif
388
 
390
 
389
 #define BOARD_MKS_13        -1109
391
 #define BOARD_MKS_13        -1109

+ 0
- 1
Marlin/src/pins/mega/pins_CHEAPTRONICv2.h View File

125
 #define BEEPER_PIN         44
125
 #define BEEPER_PIN         44
126
 
126
 
127
 #if ENABLED(SDSUPPORT)
127
 #if ENABLED(SDSUPPORT)
128
-  #define SDPOWER          -1
129
   #define SDSS             53
128
   #define SDSS             53
130
   #define SD_DETECT_PIN    49
129
   #define SD_DETECT_PIN    49
131
 #endif
130
 #endif

+ 0
- 1
Marlin/src/pins/mega/pins_GT2560_REV_A.h View File

89
 //
89
 //
90
 // Misc. Functions
90
 // Misc. Functions
91
 //
91
 //
92
-#define SDPOWER            -1
93
 #define SDSS               53
92
 #define SDSS               53
94
 #define LED_PIN            13
93
 #define LED_PIN            13
95
 #define PS_ON_PIN          12
94
 #define PS_ON_PIN          12

+ 0
- 1
Marlin/src/pins/mega/pins_WANHAO_ONEPLUS.h View File

83
 // SD Card
83
 // SD Card
84
 //
84
 //
85
 #define SD_DETECT_PIN      -1
85
 #define SD_DETECT_PIN      -1
86
-#define SDPOWER            -1
87
 #define SDSS               53
86
 #define SDSS               53
88
 
87
 
89
 //
88
 //

+ 2
- 2
Marlin/src/pins/pins.h View File

774
 #ifndef SD_DETECT_PIN
774
 #ifndef SD_DETECT_PIN
775
   #define SD_DETECT_PIN -1
775
   #define SD_DETECT_PIN -1
776
 #endif
776
 #endif
777
-#ifndef SDPOWER
778
-  #define SDPOWER -1
777
+#ifndef SDPOWER_PIN
778
+  #define SDPOWER_PIN -1
779
 #endif
779
 #endif
780
 #ifndef SDSS
780
 #ifndef SDSS
781
   #define SDSS -1
781
   #define SDSS -1

+ 2
- 2
Marlin/src/pins/pinsDebug_list.h View File

707
 // #if defined(SDA) && SDA >= 0
707
 // #if defined(SDA) && SDA >= 0
708
 //   REPORT_NAME_DIGITAL(__LINE__, SDA)
708
 //   REPORT_NAME_DIGITAL(__LINE__, SDA)
709
 // #endif
709
 // #endif
710
-#if defined(SDPOWER) && SDPOWER >= 0
711
-  REPORT_NAME_DIGITAL(__LINE__, SDPOWER)
710
+#if PIN_EXISTS(SDPOWER)
711
+  REPORT_NAME_DIGITAL(__LINE__, SDPOWER_PIN)
712
 #endif
712
 #endif
713
 #if defined(SDSS) && SDSS >= 0
713
 #if defined(SDSS) && SDSS >= 0
714
   REPORT_NAME_DIGITAL(__LINE__, SDSS)
714
   REPORT_NAME_DIGITAL(__LINE__, SDSS)

+ 1
- 2
Marlin/src/pins/ramps/pins_FELIX2.h View File

42
 //
42
 //
43
 // Misc. Functions
43
 // Misc. Functions
44
 //
44
 //
45
-#undef SDPOWER
46
-#define SDPOWER             1
45
+#define SDPOWER_PIN         1
47
 
46
 
48
 #define PS_ON_PIN          12
47
 #define PS_ON_PIN          12
49
 
48
 

+ 1
- 1
Marlin/src/pins/ramps/pins_RAMPS_OLD.h View File

103
 //
103
 //
104
 // Misc. Functions
104
 // Misc. Functions
105
 //
105
 //
106
-#define SDPOWER            48
106
+#define SDPOWER_PIN        48
107
 #define SDSS               53
107
 #define SDSS               53
108
 #define LED_PIN            13
108
 #define LED_PIN            13
109
 #define CASE_LIGHT_PIN     45   // Hardware PWM
109
 #define CASE_LIGHT_PIN     45   // Hardware PWM

+ 0
- 1
Marlin/src/pins/ramps/pins_RUMBA.h View File

215
 #define BEEPER_PIN         44
215
 #define BEEPER_PIN         44
216
 
216
 
217
 #if ENABLED(SDSUPPORT)
217
 #if ENABLED(SDSUPPORT)
218
-  #define SDPOWER          -1
219
   #define SDSS             53
218
   #define SDSS             53
220
   #define SD_DETECT_PIN    49
219
   #define SD_DETECT_PIN    49
221
 #endif
220
 #endif

+ 0
- 1
Marlin/src/pins/stm32/pins_BEAST.h View File

86
 //
86
 //
87
 // Misc. Functions
87
 // Misc. Functions
88
 //
88
 //
89
-#define SDPOWER            -1
90
 #define SDSS               PA15
89
 #define SDSS               PA15
91
 #define LED_PIN            PB2
90
 #define LED_PIN            PB2
92
 
91
 

+ 0
- 1
Marlin/src/pins/stm32/pins_CHITU3D.h View File

84
 //
84
 //
85
 // Misc. Functions
85
 // Misc. Functions
86
 //
86
 //
87
-#define SDPOWER            -1
88
 #define SDSS               -1
87
 #define SDSS               -1
89
 #define LED_PIN            -1
88
 #define LED_PIN            -1
90
 #define CASE_LIGHT_PIN      8
89
 #define CASE_LIGHT_PIN      8

+ 2
- 3
Marlin/src/sd/cardreader.cpp View File

133
   // Disable autostart until card is initialized
133
   // Disable autostart until card is initialized
134
   autostart_index = -1;
134
   autostart_index = -1;
135
 
135
 
136
-  //power to SD reader
137
-  #if SDPOWER > -1
138
-    OUT_WRITE(SDPOWER, HIGH);
136
+  #if PIN_EXISTS(SDPOWER)
137
+    OUT_WRITE(SDPOWER_PIN, HIGH); // Power the SD reader
139
   #endif
138
   #endif
140
 }
139
 }
141
 
140
 

Loading…
Cancel
Save