From 097a26007ffb82c88e0ebdd0cda4d74dac8b8572 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 17 Dec 2017 03:05:33 -0600 Subject: [PATCH] Fix SDSUPPORT for MKS SBASE Fix supplied by @cjsoong in https://github.com/MarlinFirmware/Marlin/issues/8750#issuecomment-350779983 --- Marlin/src/HAL/HAL_LPC1768/spi_pins.h | 67 ++++++++++++++------------- 1 file changed, 35 insertions(+), 32 deletions(-) diff --git a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h index 4016b1f72..a220f4a0c 100644 --- a/Marlin/src/HAL/HAL_LPC1768/spi_pins.h +++ b/Marlin/src/HAL/HAL_LPC1768/spi_pins.h @@ -27,45 +27,48 @@ #if MB(MKS_SBASE) -#define LPC_SOFTWARE_SPI // MKS_SBASE needs a software SPI because the - // selected pins are not on a hardware SPI controller + #define LPC_SOFTWARE_SPI // MKS_SBASE needs a software SPI because the + // selected pins are not on a hardware SPI controller -// A custom cable is needed. See the README file in the -// Marlin\src\config\examples\Mks\Sbase directory + // A custom cable is needed. See the README file in the + // Marlin\src\config\examples\Mks\Sbase directory -#define SCK_PIN P1_22 // J8-2 (moved from EXP2 P0.7) -#define MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8) -#define MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.5) -#define SS_PIN P0_28 + #define SCK_PIN P1_22 // J8-2 (moved from EXP2 P0.7) + #define MISO_PIN P1_23 // J8-3 (moved from EXP2 P0.8) + #define MOSI_PIN P2_12 // J8-4 (moved from EXP2 P0.5) + #define SS_PIN P0_28 + #define SD_DETECT_PIN P0_27 #else -#define LPC_SOFTWARE_SPI // Re-ARM board needs a software SPI because using the - // standard LCD adapter results in the LCD and the - // SD card sharing a single SPI when the RepRap Full - // Graphic Smart Controller is selected + #define LPC_SOFTWARE_SPI // Re-ARM board needs a software SPI because using the + // standard LCD adapter results in the LCD and the + // SD card sharing a single SPI when the RepRap Full + // Graphic Smart Controller is selected + + /** onboard SD card */ + //#define SCK_PIN P0_07 + //#define MISO_PIN P0_08 + //#define MOSI_PIN P0_09 + //#define SS_PIN P0_06 + /** external */ + #ifndef SCK_PIN + #define SCK_PIN P0_15 + #endif + #ifndef MISO_PIN + #define MISO_PIN P0_17 + #endif + #ifndef MOSI_PIN + #define MOSI_PIN P0_18 + #endif + #ifndef SS_PIN + #define SS_PIN P1_23 + #endif + +#endif // MKS_SBASE -/** onboard SD card */ -//#define SCK_PIN P0_07 -//#define MISO_PIN P0_08 -//#define MOSI_PIN P0_09 -//#define SS_PIN P0_06 -/** external */ -#ifndef SCK_PIN - #define SCK_PIN P0_15 -#endif -#ifndef MISO_PIN - #define MISO_PIN P0_17 -#endif -#ifndef MOSI_PIN - #define MOSI_PIN P0_18 -#endif -#ifndef SS_PIN - #define SS_PIN P1_23 -#endif #ifndef SDSS #define SDSS SS_PIN #endif -#endif // MKS_SBASE -#endif /* SPI_PINS_LPC1768_H */ +#endif // SPI_PINS_LPC1768_H