SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

HAS_SDCARD_CONNECTION is more obsolete

Browse source
This commit is contained in:
Scott Lahteine 2020-02-25 22:30:16 -06:00
parent 5071fe82ab
commit 5b438fb20d
4 changed files with 19 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
Marlin/Configuration_adv.h
View file

@ -1172,18 +1172,16 @@
// Add an optimized binary file transfer mode, initiated with 'M28 B1' // Add an optimized binary file transfer mode, initiated with 'M28 B1'
//#define BINARY_FILE_TRANSFER //#define BINARY_FILE_TRANSFER
#if HAS_SDCARD_CONNECTION /**
/** * Set this option to one of the following (or the board's defaults apply):
* Set this option to one of the following (or the board's defaults apply): *
* * LCD - Use the SD drive in the external LCD controller.
* LCD - Use the SD drive in the external LCD controller. * ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.)
* ONBOARD - Use the SD drive on the control board. (No SD_DETECT_PIN. M21 to init.) * CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file).
* CUSTOM_CABLE - Use a custom cable to access the SD (as defined in a pins file). *
* * :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ]
* :[ 'LCD', 'ONBOARD', 'CUSTOM_CABLE' ] */
*/ //#define SDCARD_CONNECTION LCD
//#define SDCARD_CONNECTION LCD
#endif
#endif // SDSUPPORT #endif // SDSUPPORT

2
Marlin/src/inc/Conditionals_LCD.h
View file

@ -571,8 +571,6 @@
#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) #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)
#define HAS_SDCARD_CONNECTION EITHER(TARGET_LPC1768, ADAFRUIT_GRAND_CENTRAL_M4)
#define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE)) #define HAS_LINEAR_E_JERK (DISABLED(CLASSIC_JERK) && ENABLED(LIN_ADVANCE))
#ifndef SPI_SPEED #ifndef SPI_SPEED

4
Marlin/src/pins/stm32/pins_BTT_SKR_PRO_V1_1.h
View file

@ -182,6 +182,10 @@
// Misc. Functions // Misc. Functions
// //
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION LCD
#endif
// //
// Onboard SD card // Onboard SD card
// NOT compatible with LCD // NOT compatible with LCD

6
Marlin/src/pins/stm32/pins_STEVAL_3DP001V1.h
View file

@ -236,7 +236,11 @@
#define SDIO_CK_PIN 28 // PC12 SDIO_CK #define SDIO_CK_PIN 28 // PC12 SDIO_CK
#define SDIO_CMD_PIN 29 // PD2 SDIO_CMD #define SDIO_CMD_PIN 29 // PD2 SDIO_CMD
#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD #ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
#if SDCARD_CONNECTION == ONBOARD
#define SDIO_SUPPORT // Use SDIO for onboard SD #define SDIO_SUPPORT // Use SDIO for onboard SD
#ifndef SDIO_SUPPORT #ifndef SDIO_SUPPORT