|
@@ -330,11 +330,6 @@
|
330
|
330
|
*/
|
331
|
331
|
#if ENABLED(SDSUPPORT)
|
332
|
332
|
|
333
|
|
- // Extender cable doesn't support SD_DETECT_PIN
|
334
|
|
- #if ENABLED(NO_SD_DETECT)
|
335
|
|
- #undef SD_DETECT_PIN
|
336
|
|
- #endif
|
337
|
|
-
|
338
|
333
|
#if HAS_SD_HOST_DRIVE && SD_CONNECTION_IS(ONBOARD)
|
339
|
334
|
//
|
340
|
335
|
// The external SD card is not used. Hardware SPI is used to access the card.
|
|
@@ -345,18 +340,20 @@
|
345
|
340
|
#define HAS_SHARED_MEDIA 1
|
346
|
341
|
#endif
|
347
|
342
|
|
348
|
|
- #if PIN_EXISTS(SD_DETECT)
|
349
|
|
- #if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
|
350
|
|
- #undef SD_DETECT_STATE
|
351
|
|
- #if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
|
352
|
|
- #define SD_DETECT_STATE HIGH
|
353
|
|
- #endif
|
354
|
|
- #endif
|
355
|
|
- #ifndef SD_DETECT_STATE
|
|
343
|
+ // Set SD_DETECT_STATE based on hardware if not overridden
|
|
344
|
+ #if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
|
|
345
|
+ #if BOTH(HAS_LCD_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
|
|
346
|
+ #define SD_DETECT_STATE HIGH
|
|
347
|
+ #else
|
356
|
348
|
#define SD_DETECT_STATE LOW
|
357
|
349
|
#endif
|
358
|
350
|
#endif
|
359
|
351
|
|
|
352
|
+ // Extender cable doesn't support SD_DETECT_PIN
|
|
353
|
+ #if ENABLED(NO_SD_DETECT)
|
|
354
|
+ #undef SD_DETECT_PIN
|
|
355
|
+ #endif
|
|
356
|
+
|
360
|
357
|
#if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD)
|
361
|
358
|
#if ENABLED(SDIO_SUPPORT)
|
362
|
359
|
#define NEED_SD2CARD_SDIO 1
|