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

Move LPC SD options to configs, add MKS_MINI_DISPLAY to SKR boards (#13712)

Browse Source
This commit is contained in:
jmdearras
2019-04-15 23:55:33 -04:00
committed by Scott Lahteine
parent 9b578ca343
commit 5f49b65c1f
81 changed files with 893 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/src/pins/pins_AZTEEG_X5_MINI.h
View File

@ -185,13 +185,9 @@
//
// SD Support
//
//#define USB_SD_DISABLED // Disable host access to SD card as mass storage device through USB
//#define USB_SD_ONBOARD // Enable host access to SD card as mass storage device through USB
//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD
#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board. There is no SD detect pin
// for the onboard card. Init card from LCD menu or send M21 whenever printer
// is powered on to enable SD access.
#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE)
#define LPC_SD_ONBOARD
#endif
#if ENABLED(LPC_SD_LCD)

17
Marlin/src/pins/pins_BIGTREE_SKR_V1.3.h
View File

@ -208,15 +208,24 @@
#define LCD_PINS_D7 P1_23
#endif
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P1_21
#define DOGLCD_A0 P1_22
#endif
#endif
#endif // ULTRA_LCD
//#define USB_SD_DISABLED
#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device
//
// SD Support
//
#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD
//#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board
#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE)
#undef USB_SD_DISABLED
#define USB_SD_ONBOARD
#define LPC_SD_LCD
#endif
#if ENABLED(LPC_SD_LCD)

25
Marlin/src/pins/pins_BIQU_SKR_V1.1.h
View File

@ -105,18 +105,29 @@
#define LCD_PINS_RS P0_16
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P2_06
#define DOGLCD_A0 P0_16
#endif
#endif
//
// SD Support
//
//#define USB_SD_DISABLED // Disable host access to SD card as mass storage device through USB
#define USB_SD_ONBOARD // Enable host access to SD card as mass storage device through USB
//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD
#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board. There is no SD detect pin
// for the onboard card. Init card from LCD menu or send M21 whenever printer
// is powered on to enable SD access.
// MKS_MINI_12864 strongly prefers the SD card on the display and
// requires jumpers on the SKR V1.1 board as documented here:
// https://www.facebook.com/groups/505736576548648/permalink/630639874058317/
#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE)
#if ENABLED(MKS_MINI_12864)
#define LPC_SD_LCD
#undef USB_SD_DISABLED
#define USB_SD_ONBOARD
#else
#define USB_SD_ONBOARD
#define LPC_SD_ONBOARD
#endif
#endif
#if ENABLED(LPC_SD_LCD)

22
Marlin/src/pins/pins_MKS_SBASE.h
View File

@ -158,23 +158,11 @@
#define ENET_TXD0 P1_00 // J12-11
#define ENET_TXD1 P1_01 // J12-12
/**
* The SBase can share the on-board SD card with a PC via USB the following
* definitions control this feature:
*/
//#define USB_SD_DISABLED
#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device
/**
* There are a number of configurations available for the SBase SD card reader.
* - A custom cable can be used to allow access to the LCD based SD card.
* - A standard cable can be used for access to the LCD SD card (but no SD detect).
* - The onboard SD card can be used and optionally shared with a PC via USB.
*/
//#define LPC_SD_CUSTOM_CABLE // Use a custom cable to access the SD
//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD
#define LPC_SD_ONBOARD // Marlin uses the SD drive attached to the control board
#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE)
#undef USB_SD_DISABLED
#define USB_SD_ONBOARD
#define LPC_SD_ONBOARD
#endif
#if ENABLED(LPC_SD_CUSTOM_CABLE)

13
Marlin/src/pins/pins_RAMPS_RE_ARM.h
View File

@ -361,11 +361,14 @@
#define ENET_TXD0 P1_00 // (78) J12-11
#define ENET_TXD1 P1_01 // (79) J12-12
//#define USB_SD_DISABLED
#define USB_SD_ONBOARD // Provide the onboard SD card to the host as a USB mass storage device
//#define LPC_SD_LCD // Marlin uses the SD drive attached to the LCD
#define LPC_SD_ONBOARD // Marlin uses the SD drive on the control board
//
// SD Support
//
#if !ANY(LPC_SD_LCD, LPC_SD_ONBOARD, LPC_SD_CUSTOM_CABLE)
#undef USB_SD_DISABLED
#define USB_SD_ONBOARD
#define LPC_SD_ONBOARD
#endif
#if ENABLED(LPC_SD_LCD)