0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Correct SKR expansion port pins (#16974)

Browse source
This commit is contained in:
InsanityAutomation 2020-02-26 05:18:34 -05:00 committed by GitHub
parent 70af080813
commit 28008aced0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 143 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

150
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View file

@ -187,32 +187,32 @@
/**
* _____ _____
* NC | · · | GND 5V | · · | GND
* RESET | · · | 1.31 (SD_DETECT) (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
* (MOSI) 0.18 | · · | 3.25 (BTN_EN2) (LCD_D5) 1.21 | · · | 1.20 (LCD_D4)
* (SD_SS) 0.16 | · · | 3.26 (BTN_EN1) (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
* (SCK) 0.15 | · · | 0.17 (MISO) (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
* NC | 1 2 | GND 5V | 1 2 | GND
* RESET | 3 4 | 1.31 (SD_DETECT) (LCD_D7) 1.23 | 3 4 | 1.22 (LCD_D6)
* (MOSI) 0.18 | 5 6 3.25 (BTN_EN2) (LCD_D5) 1.21 | 5 6 1.20 (LCD_D4)
* (SD_SS) 0.16 | 7 8 | 3.26 (BTN_EN1) (LCD_RS) 1.19 | 7 8 | 1.18 (LCD_EN)
* (SCK) 0.15 | 9 10| 0.17 (MISO) (BTN_ENC) 0.28 | 9 10| 1.30 (BEEPER)
* ----- -----
* 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 EXPA1_03_PIN P1_23
#define EXPA1_04_PIN P1_22
#define EXPA1_05_PIN P1_21
#define EXPA1_06_PIN P1_20
#define EXPA1_07_PIN P1_19
#define EXPA1_08_PIN P1_18
#define EXPA1_09_PIN P0_28
#define EXPA1_10_PIN P1_30
#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
#define EXPA2_03_PIN -1
#define EXPA2_04_PIN P1_31
#define EXPA2_05_PIN P0_18
#define EXPA2_06_PIN P3_25
#define EXPA2_07_PIN P0_16
#define EXPA2_08_PIN P3_26
#define EXPA2_09_PIN P0_15
#define EXPA2_10_PIN P0_17
#if HAS_SPI_LCD
@ -232,114 +232,114 @@
*
* BEFORE AFTER
* _____ _____
* GND 1 | · · | 2 5V 5V 1 | · · | 2 GND
* CS 3 | · · | 4 BTN_EN2 CS 3 | · · | 4 BTN_EN2
* SID 5 | · · | 6 BTN_EN1 SID 5 | · · | 6 BTN_EN1
* open 7 | · · | 8 BTN_ENC CLK 7 | · · | 8 BTN_ENC
* CLK 9 | · · | 10 Beeper open 9 | · · | 10 Beeper
* GND 1 | 1 2 | 2 5V 5V 1 | 1 2 | 2 GND
* CS 3 | 3 4 | 4 BTN_EN2 CS 3 | 3 4 | 4 BTN_EN2
* SID 5 | 5 6 6 BTN_EN1 SID 5 | 5 6 6 BTN_EN1
* open 7 | 7 8 | 8 BTN_ENC CLK 7 | 7 8 | 8 BTN_ENC
* CLK 9 | 9 10| 10 Beeper open 9 | 9 10| 10 Beeper
* ----- -----
* LCD LCD
*/
#define LCD_PINS_RS EXP1_9_PIN
#define LCD_PINS_RS EXPA1_03_PIN
#define BTN_EN1 EXP1_3_PIN
#define BTN_EN2 EXP1_4_PIN
#define BTN_ENC EXP1_2_PIN
#define BTN_EN1 EXPA1_06_PIN
#define BTN_EN2 EXPA1_04_PIN
#define BTN_ENC EXPA1_08_PIN
#define LCD_PINS_ENABLE EXP1_8_PIN
#define LCD_PINS_D4 EXP1_7_PIN
#define LCD_PINS_ENABLE EXPA1_05_PIN
#define LCD_PINS_D4 EXPA1_07_PIN
#elif ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXP1_4_PIN
#define LCD_PINS_RS EXPA1_04_PIN
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXP1_6_PIN // (58) open-drain
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC EXPA1_09_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXP1_9_PIN
#define LCD_PINS_D4 EXP1_8_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#else // !CR10_STOCKDISPLAY
#define LCD_PINS_RS EXP1_7_PIN
#define LCD_PINS_RS EXPA1_07_PIN
#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 BTN_EN1 EXPA2_08_PIN // (31) J3-2 & AUX-4
#define BTN_EN2 EXPA2_06_PIN // (33) J3-4 & AUX-4
#define BTN_ENC EXPA1_09_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXP1_2_PIN
#define LCD_PINS_D4 EXP1_3_PIN
#define LCD_PINS_ENABLE EXPA1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN
#define LCD_SDSS EXP2_7_PIN // (16) J3-7 & AUX-4
#define SD_DETECT_PIN EXP2_4_PIN // (49) (NOT 5V tolerant)
#define LCD_SDSS EXPA2_07_PIN // (16) J3-7 & AUX-4
#define SD_DETECT_PIN EXPA2_04_PIN // (49) (NOT 5V tolerant)
#if ENABLED(FYSETC_MINI_12864)
#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 DOGLCD_CS EXPA1_08_PIN
#define DOGLCD_A0 EXPA1_07_PIN
#define DOGLCD_SCK EXPA2_09_PIN
#define DOGLCD_MOSI EXPA2_05_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 EXP1_3_PIN // Must be high or open for LCD to operate normally.
#define LCD_RESET_PIN EXPA1_06_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 EXP1_8_PIN
#define RGB_LED_R_PIN EXPA1_05_PIN
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN EXP1_4_PIN
#define RGB_LED_G_PIN EXPA1_04_PIN
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN EXP1_9_PIN
#define RGB_LED_B_PIN EXPA1_03_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN EXP1_8_PIN
#define NEOPIXEL_PIN EXPA1_05_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS EXP1_8_PIN
#define DOGLCD_A0 EXP1_4_PIN
#define DOGLCD_SCK EXP2_6_PIN
#define DOGLCD_MOSI EXP2_8_PIN
#define DOGLCD_CS EXPA1_05_PIN
#define DOGLCD_A0 EXPA1_04_PIN
#define DOGLCD_SCK EXPA2_09_PIN
#define DOGLCD_MOSI EXPA2_05_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
/**
* Creality Ender-2 display pinout
* _____
* 5V | · · | GND
* (MOSI) P1_23 | · · | P1_22 (LCD_CS)
* (LCD_A0) P1_21 | · · | P1_20 (BTN_EN2)
* RESET P1_19 | · · | P1_18 (BTN_EN1)
* (BTN_ENC) P0_28 | · · | P1_30 (SCK)
* 5V | 1 2 | GND
* (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
* (LCD_A0) P1_21 | 5 6 P1_20 (BTN_EN2)
* RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
* (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
* -----
* EXP1
*/
#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 BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC EXPA1_09_PIN
#define DOGLCD_CS EXPA1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#endif
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 EXP1_8_PIN
#define LCD_PINS_D6 EXP1_4_PIN
#define LCD_PINS_D7 EXP1_9_PIN
#define LCD_PINS_D5 EXPA1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN
#endif
#endif // !FYSETC_MINI_12864
@ -357,7 +357,7 @@
#endif
#if SD_CONNECTION_IS(LCD)
#define SS_PIN EXP2_7_PIN
#define SS_PIN EXPA2_07_PIN
#endif
/**

59
Marlin/src/pins/stm32/pins_BTT_SKR_E3_DIP.h
View file

@ -163,53 +163,54 @@
/**
* _____
* 5V | · · | GND
* (LCD_EN) PB7 | · · | PB8 (LCD_RS)
* (LCD_D4) PB9 | · · | PA10 (BTN_EN2)
* RESET | · · | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | · · | PA15 (BEEPER)
* 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
* RESET | 7 8 | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | 9 10| PA15 (BEEPER)
* -----
* EXP1
*/
#define EXP1_1_PIN PA15
#define EXP1_2_PIN PA9
#define EXP1_3_PIN PA10
#define EXP1_4_PIN PB8
#define EXP1_6_PIN PB6
#define EXP1_7_PIN -1
#define EXP1_8_PIN PB9
#define EXP1_9_PIN PB7
#define EXPA1_03_PIN PB7
#define EXPA1_04_PIN PB8
#define EXPA1_05_PIN PB9
#define EXPA1_06_PIN PA10
#define EXPA1_07_PIN -1
#define EXPA1_08_PIN PA9
#define EXPA1_09_PIN PB6
#define EXPA1_10_PIN PA15
#if HAS_SPI_LCD
#define BTN_ENC EXP1_6_PIN
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXPA1_09_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN EXP1_1_PIN
#define BEEPER_PIN EXPA1_10_PIN
#define LCD_PINS_RS EXP1_4_PIN
#define LCD_PINS_ENABLE EXP1_9_PIN
#define LCD_PINS_D4 EXP1_8_PIN
#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* _____
* 5V | · · | GND
* (MOSI) PB7 | · · | PB8 (LCD_RS)
* (LCD_A0) PB9 | · · | PA10 (BTN_EN2)
* RESET | · · | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | · · | PA15 (SCK)
* 5V | 1 2 | GND
* (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
* RESET | 7 8 | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | 9 10| PA15 (SCK)
* -----
* EXP1
*/
#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 DOGLCD_CS EXPA1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1

76
Marlin/src/pins/stm32/pins_BTT_SKR_MINI_E3.h
View file

@ -103,70 +103,70 @@
/**
* _____
* 5V | · · | GND
* (LCD_EN) PB7 | · · | PB8 (LCD_RS)
* (LCD_D4) PB9 | · · | PA10 (BTN_EN2)
* RESET | · · | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | · · | PB5 (BEEPER)
* 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
* RESET | 7 8 | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | 9 10| PB5 (BEEPER)
* -----
* EXP1
*/
#define EXP1_1_PIN PB5
#define EXP1_2_PIN PA9
#define EXP1_3_PIN PA10
#define EXP1_4_PIN PB8
#define EXP1_6_PIN PB6
#define EXP1_7_PIN -1
#define EXP1_8_PIN PB9
#define EXP1_9_PIN PB7
#define EXPA1_03_PIN PB7
#define EXPA1_04_PIN PB8
#define EXPA1_05_PIN PB9
#define EXPA1_06_PIN PA10
#define EXPA1_07_PIN -1
#define EXPA1_08_PIN PA9
#define EXPA1_09_PIN PB6
#define EXPA1_10_PIN PB5
#if HAS_SPI_LCD
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN EXP1_1_PIN
#define BEEPER_PIN EXPA1_10_PIN
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXP1_6_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC EXPA1_09_PIN
#define LCD_PINS_RS EXP1_4_PIN
#define LCD_PINS_ENABLE EXP1_9_PIN
#define LCD_PINS_D4 EXP1_8_PIN
#define LCD_PINS_RS EXPA1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_MINI_E3.h' for details. Comment out this line to continue."
#define LCD_PINS_RS EXP1_8_PIN
#define LCD_PINS_ENABLE EXP1_6_PIN
#define LCD_PINS_D4 EXP1_4_PIN
#define LCD_PINS_D5 EXP1_3_PIN
#define LCD_PINS_D6 EXP1_2_PIN
#define LCD_PINS_D7 EXP1_1_PIN
#define LCD_PINS_RS EXPA1_05_PIN
#define LCD_PINS_ENABLE EXPA1_09_PIN
#define LCD_PINS_D4 EXPA1_04_PIN
#define LCD_PINS_D5 EXPA1_06_PIN
#define LCD_PINS_D6 EXPA1_08_PIN
#define LCD_PINS_D7 EXPA1_10_PIN
#define ADC_KEYPAD_PIN PA1 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* _____
* 5V | · · | GND
* (MOSI) PB7 | · · | PB8 (LCD_RS)
* (LCD_A0) PB9 | · · | PA10 (BTN_EN2)
* RESET | · · | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | · · | PB5 (SCK)
* 5V | 1 2 | GND
* (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
* RESET | 7 8 | PA9 (BTN_EN1)
* (BTN_ENC) PB6 | 9 10| PB5 (SCK)
* -----
* EXP1
*/
#define BTN_EN1 EXP1_2_PIN
#define BTN_EN2 EXP1_3_PIN
#define BTN_ENC EXP1_6_PIN
#define BTN_EN1 EXPA1_08_PIN
#define BTN_EN2 EXPA1_06_PIN
#define BTN_ENC EXPA1_09_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 DOGLCD_CS EXPA1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1