Merge pull request #8820 from thinkyhead/bf2_mks_sbase_spi

[2.0.x] Fix SDSUPPORT for MKS SBASE

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
+  #define LPC_SOFTWARE_SPI  // MKS_SBASE needs a software SPI because the
-                          // selected pins are not on a hardware SPI controller
+                            // selected pins are not on a hardware SPI controller
 
-// A custom cable is needed. See the README file in the
+  // A custom cable is needed. See the README file in the
-// Marlin\src\config\examples\Mks\Sbase directory
+  // Marlin\src\config\examples\Mks\Sbase directory
 
-#define SCK_PIN           P1_22  // J8-2 (moved from EXP2 P0.7)
+  #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 MISO_PIN          P1_23  // J8-3 (moved from EXP2 P0.8)
-#define MOSI_PIN          P2_12  // J8-4 (moved from EXP2 P0.5)
+  #define MOSI_PIN          P2_12  // J8-4 (moved from EXP2 P0.5)
-#define SS_PIN            P0_28
+  #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
+  #define LPC_SOFTWARE_SPI  // Re-ARM board needs a software SPI because using the
-                          // standard LCD adapter results in the LCD and the
+                            // standard LCD adapter results in the LCD and the
-                          // SD card sharing a single SPI when the RepRap Full
+                            // SD card sharing a single SPI when the RepRap Full
-                          // Graphic Smart Controller is selected
+                            // 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 */