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

Add EXP labels to SKR pins

Browse Source
This commit is contained in:
Scott Lahteine
2020-02-01 18:31:00 -06:00
parent 22556a7bbf
commit 63469ed8f7
3 changed files with 126 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

109
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View File

@ -195,6 +195,25 @@
* ----- -----
* EXP2 EXP1
*/
#define EXP1_1_PIN P1_30
#define EXP1_2_PIN P1_18
#define EXP1_3_PIN P1_20
#define EXP1_4_PIN P1_22
#define EXP1_6_PIN P0_28
#define EXP1_7_PIN P1_19
#define EXP1_8_PIN P1_21
#define EXP1_9_PIN P1_23
#define EXP2_1_PIN P0_17
#define EXP2_2_PIN P3_26
#define EXP2_3_PIN P3_25
#define EXP2_4_PIN P1_31
#define EXP2_6_PIN P0_15
#define EXP2_7_PIN P0_16
#define EXP2_8_PIN P0_18
#define EXP2_9_PIN -1
#if HAS_SPI_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD)
@ -222,75 +241,75 @@
* LCD LCD
*/
#define LCD_PINS_RS P1_23
#define LCD_PINS_RS EXP1_9_PIN
#define BTN_EN1 P1_20
#define BTN_EN2 P1_22
#define BTN_ENC P1_18
#define BTN_EN1 EXP1_3_PIN
#define BTN_EN2 EXP1_4_PIN
#define BTN_ENC EXP1_2_PIN
#define LCD_PINS_ENABLE P1_21
#define LCD_PINS_D4 P1_19
#define LCD_PINS_ENABLE EXP1_8_PIN
#define LCD_PINS_D4 EXP1_7_PIN
#elif ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS P1_22
#define LCD_PINS_RS EXP1_4_PIN
#define BTN_EN1 P1_18
#define BTN_EN2 P1_20
#define BTN_ENC P0_28 // (58) open-drain
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXP1_6_PIN // (58) open-drain
#define LCD_PINS_ENABLE P1_23
#define LCD_PINS_D4 P1_21
#define LCD_PINS_ENABLE EXP1_9_PIN
#define LCD_PINS_D4 EXP1_8_PIN
#else // !CR10_STOCKDISPLAY
#define LCD_PINS_RS P1_19
#define LCD_PINS_RS EXP1_7_PIN
#define BTN_EN1 P3_26 // (31) J3-2 & AUX-4
#define BTN_EN2 P3_25 // (33) J3-4 & AUX-4
#define BTN_ENC P0_28 // (58) open-drain
#define BTN_EN1 EXP2_2_PIN // (31) J3-2 & AUX-4
#define BTN_EN2 EXP2_3_PIN // (33) J3-4 & AUX-4
#define BTN_ENC EXP1_6_PIN // (58) open-drain
#define LCD_PINS_ENABLE P1_18
#define LCD_PINS_D4 P1_20
#define LCD_PINS_ENABLE EXP1_2_PIN
#define LCD_PINS_D4 EXP1_3_PIN
#define LCD_SDSS P0_16 // (16) J3-7 & AUX-4
#define SD_DETECT_PIN P1_31 // (49) (NOT 5V tolerant)
#define LCD_SDSS EXP2_7_PIN // (16) J3-7 & AUX-4
#define SD_DETECT_PIN EXP2_4_PIN // (49) (NOT 5V tolerant)
#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS P1_18
#define DOGLCD_A0 P1_19
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18
#define DOGLCD_CS EXP1_2_PIN
#define DOGLCD_A0 EXP1_7_PIN
#define DOGLCD_SCK EXP2_6_PIN
#define DOGLCD_MOSI EXP2_8_PIN
#define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems
// results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_RESET_PIN P1_20 // Must be high or open for LCD to operate normally.
#define LCD_RESET_PIN EXP1_3_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN P1_21
#define RGB_LED_R_PIN EXP1_8_PIN
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_22
#define RGB_LED_G_PIN EXP1_4_PIN
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_23
#define RGB_LED_B_PIN EXP1_9_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P1_21
#define NEOPIXEL_PIN EXP1_8_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P1_21
#define DOGLCD_A0 P1_22
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18
#define DOGLCD_CS EXP1_8_PIN
#define DOGLCD_A0 EXP1_4_PIN
#define DOGLCD_SCK EXP2_6_PIN
#define DOGLCD_MOSI EXP2_8_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
@ -300,27 +319,27 @@
* 5V | · · | GND
* (MOSI) P1_23 | · · | P1_22 (LCD_CS)
* (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
* RESET P1.19 | · · | P1_18 (BTN_EN1)
* RESET P1_19 | · · | P1_18 (BTN_EN1)
* (BTN_ENC) P0_28 | · · | P1_30 (SCK)
* -----
* EXP1
*/
#define BTN_EN1 P1_18
#define BTN_EN2 P1_20
#define BTN_ENC P0_28
#define DOGLCD_CS P1_22
#define DOGLCD_A0 P1_21
#define DOGLCD_SCK P1_30
#define DOGLCD_MOSI P1_23
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXP1_6_PIN
#define DOGLCD_CS EXP1_4_PIN
#define DOGLCD_A0 EXP1_8_PIN
#define DOGLCD_SCK EXP1_1_PIN
#define DOGLCD_MOSI EXP1_9_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#endif
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 P1_21
#define LCD_PINS_D6 P1_22
#define LCD_PINS_D7 P1_23
#define LCD_PINS_D5 EXP1_8_PIN
#define LCD_PINS_D6 EXP1_4_PIN
#define LCD_PINS_D7 EXP1_9_PIN
#endif
#endif // !FYSETC_MINI_12864
@ -338,7 +357,7 @@
#endif
#if SD_CONNECTION_IS(LCD)
#define SS_PIN P0_16
#define SS_PIN EXP2_7_PIN
#endif
/**