MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

🔧 Improve SD_DETECT_STATE default (#21885)

Browse Source
This commit is contained in:
Scott Lahteine 2021-05-13 01:14:37 -05:00 committed by Scott Lahteine
parent 1d1f318752
commit 159f9c85a6
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/src/inc/Conditionals_post.h
View File

@ -330,11 +330,6 @@
*/ */
#if ENABLED(SDSUPPORT) #if ENABLED(SDSUPPORT)
// Extender cable doesn't support SD_DETECT_PIN
#if ENABLED(NO_SD_DETECT)
#undef SD_DETECT_PIN
#endif
#if HAS_SD_HOST_DRIVE && SD_CONNECTION_IS(ONBOARD) #if HAS_SD_HOST_DRIVE && SD_CONNECTION_IS(ONBOARD)
// //
// The external SD card is not used. Hardware SPI is used to access the card. // The external SD card is not used. Hardware SPI is used to access the card.
@ -345,18 +340,20 @@
#define HAS_SHARED_MEDIA 1 #define HAS_SHARED_MEDIA 1
#endif #endif
#if PIN_EXISTS(SD_DETECT) // Set SD_DETECT_STATE based on hardware if not overridden
#if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION)) #if PIN_EXISTS(SD_DETECT) && !defined(SD_DETECT_STATE)
#undef SD_DETECT_STATE #if BOTH(HAS_LCD_MENU, ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #define SD_DETECT_STATE HIGH
#define SD_DETECT_STATE HIGH #else
#endif
#endif
#ifndef SD_DETECT_STATE
#define SD_DETECT_STATE LOW #define SD_DETECT_STATE LOW
#endif #endif
#endif #endif
// Extender cable doesn't support SD_DETECT_PIN
#if ENABLED(NO_SD_DETECT)
#undef SD_DETECT_PIN
#endif
#if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD) #if DISABLED(USB_FLASH_DRIVE_SUPPORT) || BOTH(MULTI_VOLUME, VOLUME_SD_ONBOARD)
#if ENABLED(SDIO_SUPPORT) #if ENABLED(SDIO_SUPPORT)
#define NEED_SD2CARD_SDIO 1 #define NEED_SD2CARD_SDIO 1

7
Marlin/src/inc/SanityCheck.h
View File

@ -760,6 +760,13 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
#error "LIGHTWEIGHT_UI requires a U8GLIB_ST7920-based display." #error "LIGHTWEIGHT_UI requires a U8GLIB_ST7920-based display."
#endif #endif
/**
* SD Card Settings
*/
#if ALL(SDSUPPORT, ELB_FULL_GRAPHIC_CONTROLLER, HAS_LCD_MENU) && PIN_EXISTS(SD_DETECT) && SD_DETECT_STATE != HIGH && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#error "SD_DETECT_STATE must be set HIGH for SD on the ELB_FULL_GRAPHIC_CONTROLLER."
#endif
/** /**
* SD File Sorting * SD File Sorting
*/ */

7
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_0.h
View File

@ -352,8 +352,11 @@
// //
#if SD_CONNECTION_IS(ONBOARD) #if SD_CONNECTION_IS(ONBOARD)
#define SDIO_SUPPORT // Use SDIO for onboard SD #define SDIO_SUPPORT // Use SDIO for onboard SD
#undef SD_DETECT_STATE #ifndef SD_DETECT_STATE
#define SD_DETECT_STATE HIGH #define SD_DETECT_STATE HIGH
#elif SD_DETECT_STATE == LOW
#error "BOARD_BTT_OCTOPUS_V1_0 onboard SD requires SD_DETECT_STATE set to HIGH."
#endif
#define SD_DETECT_PIN PC14 #define SD_DETECT_PIN PC14
#elif SD_CONNECTION_IS(LCD) #elif SD_CONNECTION_IS(LCD)