Scott Lahteine
5 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with
18 additions and
16 deletions
-
Marlin/Configuration_adv.h
-
Marlin/src/inc/Conditionals_LCD.h
-
Marlin/src/inc/Conditionals_post.h
-
Marlin/src/inc/SanityCheck.h
-
Marlin/src/pins/ramps/pins_FYSETC_F6_13.h
-
Marlin/src/sd/cardreader.h
|
|
|
@ -1018,12 +1018,9 @@ |
|
|
|
|
|
|
|
#if ENABLED(SDSUPPORT) |
|
|
|
|
|
|
|
// Some RAMPS and other boards don't detect when an SD card is inserted. You can work
|
|
|
|
// around this by connecting a push button or single throw switch to the pin defined
|
|
|
|
// as SD_DETECT_PIN in your board's pins definitions.
|
|
|
|
// This setting should be disabled unless you are using a push button, pulling the pin to ground.
|
|
|
|
// Note: This is always disabled for ULTIPANEL (except ELB_FULL_GRAPHIC_CONTROLLER).
|
|
|
|
#define SD_DETECT_INVERTED |
|
|
|
// The standard SD detect circuit reads LOW when media is inserted and HIGH when empty.
|
|
|
|
// Enable this option and set to HIGH if your SD cards are incorrectly detected.
|
|
|
|
//#define SD_DETECT_STATE HIGH
|
|
|
|
|
|
|
|
#define SD_FINISHED_STEPPERRELEASE true // Disable steppers when SD Print is finished
|
|
|
|
#define SD_FINISHED_RELEASECOMMAND "M84 X Y Z E" // You might want to keep the Z enabled so your bed stays in place.
|
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
/**
|
|
|
|
|
|
|
|
@ -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) |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
|
|
|
@ -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 |
|
|
|
|
