Browse Source

HAS_SDCARD_CONNECTION is more obsolete

Scott Lahteine 5 years ago
parent
commit
5b438fb20d

+ 10
- 12
Marlin/Configuration_adv.h View File

1172
   // Add an optimized binary file transfer mode, initiated with 'M28 B1'
1172
   // Add an optimized binary file transfer mode, initiated with 'M28 B1'
1173
   //#define BINARY_FILE_TRANSFER
1173
   //#define BINARY_FILE_TRANSFER
1174
 
1174
 
1175
-  #if HAS_SDCARD_CONNECTION
1176
-    /**
1177
-     * Set this option to one of the following (or the board's defaults apply):
1178
-     *
1179
-     *           LCD - Use the SD drive in the external LCD controller.
1180
-     *       ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
1181
-     *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
1182
-     *
1183
-     * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
1184
-     */
1185
-    //#define SDCARD_CONNECTION LCD
1186
-  #endif
1175
+  /**
1176
+   * Set this option to one of the following (or the board's defaults apply):
1177
+   *
1178
+   *           LCD - Use the SD drive in the external LCD controller.
1179
+   *       ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
1180
+   *  CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
1181
+   *
1182
+   * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
1183
+   */
1184
+  //#define SDCARD_CONNECTION LCD
1187
 
1185
 
1188
 #endif // SDSUPPORT
1186
 #endif // SDSUPPORT
1189
 
1187
 

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

571
 
571
 
572
 #define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
572
 #define IS_RE_ARM_BOARD MB(RAMPS_14_RE_ARM_EFB, RAMPS_14_RE_ARM_EEB, RAMPS_14_RE_ARM_EFF, RAMPS_14_RE_ARM_EEF, RAMPS_14_RE_ARM_SF)
573
 
573
 
574
-#define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4)
575
-
576
 #define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
574
 #define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
577
 
575
 
578
 #ifndef SPI_SPEED
576
 #ifndef SPI_SPEED

+ 4
- 0
Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h View File

182
 // Misc. Functions
182
 // Misc. Functions
183
 //
183
 //
184
 
184
 
185
+#ifndef SDCARD_CONNECTION
186
+  #define SDCARD_CONNECTION LCD
187
+#endif
188
+
185
 //
189
 //
186
 // Onboard SD card
190
 // Onboard SD card
187
 //   NOT compatible with LCD
191
 //   NOT compatible with LCD

+ 5
- 1
Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h View File

236
 #define SDIO_CK_PIN       28   // PC12  SDIO_CK
236
 #define SDIO_CK_PIN       28   // PC12  SDIO_CK
237
 #define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
237
 #define SDIO_CMD_PIN      29   // PD2   SDIO_CMD
238
 
238
 
239
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
239
+#ifndef SDCARD_CONNECTION
240
+  #define SDCARD_CONNECTION ONBOARD
241
+#endif
242
+
243
+#if SDCARD_CONNECTION == ONBOARD
240
   #define SDIO_SUPPORT     // Use SDIO for onboard SD
244
   #define SDIO_SUPPORT     // Use SDIO for onboard SD
241
 
245
 
242
   #ifndef SDIO_SUPPORT
246
   #ifndef SDIO_SUPPORT

Loading…
Cancel
Save