bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

SD_DETECT_INVERTED => SD_DETECT_STATE (#17112)

Browse Source
This commit is contained in:
Scott Lahteine
2020-03-10 15:43:06 -05:00
committed by GitHub
parent 8799f8bfdb
commit 8f66dbfcd5
6 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Marlin/src/inc/Conditionals_LCD.h
View File

@ -74,7 +74,6 @@
#define U8GLIB_ST7565_64128N
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define U8GLIB_LM6059_AF
#define SD_DETECT_INVERTED
#elif ENABLED(AZSMZ_12864)
#define U8GLIB_ST7565_64128N
#endif

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

@ -292,10 +292,18 @@
#endif
/**
* Override here because this is set in Configuration_adv.h
* Override the SD_DETECT_STATE set in Configuration_adv.h
*/
#if HAS_LCD_MENU && DISABLED(ELB_FULL_GRAPHIC_CONTROLLER) && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#undef SD_DETECT_INVERTED
#if ENABLED(SDSUPPORT)
#if HAS_LCD_MENU && (SD_CONNECTION_IS(LCD) || !defined(SDCARD_CONNECTION))
#undef SD_DETECT_STATE
#if ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define SD_DETECT_STATE HIGH
#endif
#endif
#ifndef SD_DETECT_STATE
#define SD_DETECT_STATE LOW
#endif
#endif
/**

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

@ -99,7 +99,9 @@
#elif defined(X_HOME_RETRACT_MM)
#error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
#elif defined(SDCARDDETECTINVERTED)
#error "SDCARDDETECTINVERTED is now SD_DETECT_INVERTED. Please update your configuration."
#error "SDCARDDETECTINVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
#elif defined(SD_DETECT_INVERTED)
#error "SD_DETECT_INVERTED is now SD_DETECT_STATE (HIGH). Please update your configuration."
#elif defined(BTENABLED)
#error "BTENABLED is now BLUETOOTH. Please update your configuration."
#elif defined(CUSTOM_MENDEL_NAME)

4
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
View File

@ -29,10 +29,6 @@
#error "Oops! Select 'FYSETC F6' in 'Tools > Board.'"
#endif
#if ENABLED(SD_DETECT_INVERTED)
//#error "SD_DETECT_INVERTED must be disabled for the FYSETC_F6_13 board."
#endif
#ifndef BOARD_INFO_NAME
#define BOARD_INFO_NAME "FYSETC F6 1.3"
#endif

2
Marlin/src/sd/cardreader.h
View File

@ -276,7 +276,7 @@ private:
#if ENABLED(USB_FLASH_DRIVE_SUPPORT)
#define IS_SD_INSERTED() Sd2Card::isInserted()
#elif PIN_EXISTS(SD_DETECT)
#define IS_SD_INSERTED() (READ(SD_DETECT_PIN) != ENABLED(SD_DETECT_INVERTED))
#define IS_SD_INSERTED() (READ(SD_DETECT_PIN) == SD_DETECT_STATE)
#else
// No card detect line? Assume the card is inserted.
#define IS_SD_INSERTED() true