zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Cleanup MKS-SBASE compile warnings

Browse source
This commit is contained in:
Thomas Moore 2018-01-19 15:46:34 -06:00
parent 7c469c0712
commit 63fd23ab1c
2 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
Marlin/src/HAL/HAL_LPC1768/spi_pins.h
View file

@ -23,50 +23,29 @@
#ifndef SPI_PINS_LPC1768_H #ifndef SPI_PINS_LPC1768_H
#define SPI_PINS_LPC1768_H #define SPI_PINS_LPC1768_H
#include "../../inc/MarlinConfig.h" #define LPC_SOFTWARE_SPI // Re-ARM board needs a software SPI because using the
#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
// 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 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 // 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 */ /** onboard SD card */
//#define SCK_PIN P0_07 //#define SCK_PIN P0_07
//#define MISO_PIN P0_08 //#define MISO_PIN P0_08
//#define MOSI_PIN P0_09 //#define MOSI_PIN P0_09
//#define SS_PIN P0_06 //#define SS_PIN P0_06
/** external */ /** external */
#ifndef SCK_PIN #ifndef SCK_PIN
#define SCK_PIN P0_15 #define SCK_PIN P0_15
#endif #endif
#ifndef MISO_PIN #ifndef MISO_PIN
#define MISO_PIN P0_17 #define MISO_PIN P0_17
#endif #endif
#ifndef MOSI_PIN #ifndef MOSI_PIN
#define MOSI_PIN P0_18 #define MOSI_PIN P0_18
#endif #endif
#ifndef SS_PIN #ifndef SS_PIN
#define SS_PIN P1_23 #define SS_PIN P1_23
#endif #endif
#endif // MKS_SBASE
#ifndef SDSS #ifndef SDSS
#define SDSS SS_PIN #define SDSS SS_PIN
#endif #endif

11
Marlin/src/pins/pins_MKS_SBASE.h
View file

@ -184,6 +184,17 @@
// //
// Misc. Functions // Misc. Functions
// //
#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
#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
#define SDSS P0_06 #define SDSS P0_06
/** /**