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

🚸 Renumber EXP pins to match schematics/RRF/Klipper

Browse Source
This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 96d3c66b64
commit 173eb3ff71
53 changed files with 2587 additions and 2589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

78
Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
View File

@ -145,25 +145,25 @@
/**
* SKR Mini E3 V3.0
* ------
* (BEEPER) PB5 |10 9 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 8 7 | RESET
* (BTN_EN2) PA10 6 5 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 4 3 | PD6 (LCD_EN)
* GND | 2 1 | 5V
* (BEEPER) PB5 | 1 2 | PA15 (BTN_ENC)
* (BTN_EN1) PA9 | 3 4 | RESET
* (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
* (LCD_RS) PB8 | 7 8 | PD6 (LCD_EN)
* GND | 9 10 | 5V
* ------
* EXP1
*/
#define EXP1_09_PIN PA15
#define EXP1_03_PIN PD6
#define EXP1_02_PIN PA15
#define EXP1_08_PIN PD6
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
* ------ ------ ------
* (ENT) |10 9 | (BEEP) |10 9 | |10 9 |
* (RX) | 8 7 | (RX) | 8 7 | (TX) RX | 8 7 | TX
* (TX) 6 5 | (ENT) 6 5 | (BEEP) ENT | 6 5 | BEEP
* (B) | 4 3 | (A) (B) | 4 3 | (A) B | 4 3 | A
* GND | 2 1 | (VCC) GND | 2 1 | VCC GND | 2 1 | VCC
* (ENT) | 1 2 | (BEEP) | 1 2 | | 1 2 |
* (RX) | 3 4 | (RX) | 3 4 | (TX) RX | 3 4 | TX
* (TX) 5 6 | (ENT) 5 6 | (BEEP) ENT | 5 6 | BEEP
* (B) | 7 8 | (A) (B) | 7 8 | (A) B | 7 8 | A
* GND | 9 10 | (VCC) GND | 9 10 | VCC GND | 9 10 | VCC
* ------ ------ ------
* EXP1 DWIN DWIN (plug)
*
@ -174,8 +174,8 @@
#error "CAUTION! DWIN_CREALITY_LCD requires a custom cable, see diagram above this line. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
#define BEEPER_PIN EXP1_09_PIN
#define BTN_EN1 EXP1_03_PIN
#define BEEPER_PIN EXP1_02_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 PB8
#define BTN_ENC PB5
@ -184,13 +184,13 @@
#if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN PB5
#define BTN_ENC EXP1_09_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define LCD_PINS_RS PB8
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 PB9
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@ -200,7 +200,7 @@
#endif
#define LCD_PINS_RS PB9
#define LCD_PINS_ENABLE EXP1_09_PIN
#define LCD_PINS_ENABLE EXP1_02_PIN
#define LCD_PINS_D4 PB8
#define LCD_PINS_D5 PA10
#define LCD_PINS_D6 PA9
@ -209,14 +209,14 @@
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define BTN_ENC EXP1_09_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PA9
#define BTN_EN2 PA10
#define DOGLCD_CS PB8
#define DOGLCD_A0 PB9
#define DOGLCD_SCK PB5
#define DOGLCD_MOSI EXP1_03_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
@ -234,11 +234,11 @@
*
* Board Display
* ------ ------
* (BEEPER) PB6 |10 9 | PB5 (SD_DET) 5V |10 9 | GND
* RESET | 8 7 | PA9 (MOD_RESET) -- | 8 7 | (SD_DET)
* PB9 6 5 | PA10 (SD_CS) (MOSI) | 6 5 | --
* PB7 | 4 3 | PB8 (LCD_CS) (SD_CS) | 4 3 | (LCD_CS)
* GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
* (BEEPER) PB6 | 1 2 | PB5 (SD_DET) 5V | 1 2 | GND
* RESET | 3 4 | PA9 (MOD_RESET) -- | 3 4 | (SD_DET)
* PB9 5 6 | PA10 (SD_CS) (MOSI) | 5 6 | --
* PB7 | 7 8 | PB8 (LCD_CS) (SD_CS) | 7 8 | (LCD_CS)
* GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
@ -272,20 +272,20 @@
*
* Board Display
* ------ ------
* (EN2) PB5 |10 9 | PA15(BTN_ENC) 5V |10 9 | GND
* (LCD_CS) PA9 | 8 7 | RST (RESET) -- | 8 7 | --
* (EN2) PB5 | 1 2 | PA15(BTN_ENC) 5V | 1 2 | GND
* (LCD_CS) PA9 | 3 4 | RST (RESET) -- | 3 4 | --
* (LCD_A0) PA10 |#6 5 | PB9 (EN1) (DIN) | 6 5#| (RESET)
* (LCD_SCK)PB8 | 4 3 | PD6 (MOSI) (LCD_A0) | 4 3 | (LCD_CS)
* GND | 2 1 | 5V (BTN_ENC) | 2 1 | --
* (LCD_SCK)PB8 | 7 8 | PD6 (MOSI) (LCD_A0) | 7 8 | (LCD_CS)
* GND | 9 10 | 5V (BTN_ENC) | 9 10 | --
* ------ ------
* EXP1 EXP1
*
* ------
* -- |10 9 | --
* --- (RESET) | 8 7 | --
* -- | 1 2 | --
* --- (RESET) | 3 4 | --
* | 3 | (MOSI) | 6 5#| (EN2)
* | 2 | (DIN) -- | 4 3 | (EN1)
* | 1 | (LCD_SCK)| 2 1 | --
* | 2 | (DIN) -- | 7 8 | (EN1)
* | 1 | (LCD_SCK)| 9 10 | --
* --- ------
* Neopixel EXP2
*
@ -294,7 +294,7 @@
* Check twice index position!!! (marked as # here)
* On BTT boards pins from IDC10 connector are numbered in unusual order.
*/
#define BTN_ENC EXP1_09_PIN
#define BTN_ENC EXP1_02_PIN
#define BTN_EN1 PB9
#define BTN_EN2 PB5
#define BEEPER_PIN -1
@ -324,11 +324,11 @@
*
* Board Display
* ------ ------
* (SD_DET) PB5 |10 9 | PB6 (BEEPER) 5V |10 9 | GND
* (MOD_RESET) PA9 | 8 7 | RESET (RESET) | 8 7 | (SD_DET)
* (SD_CS) PA10 6 5 | PB9 (FREE) (MOSI) | 6 5 | (LCD_CS)
* (LCD_CS) PB8 | 4 3 | PB7 (FREE) (SD_CS) | 4 3 | (MOD_RESET)
* 5V | 2 1 | GND (SCK) | 2 1 | (MISO)
* (SD_DET) PB5 | 1 2 | PB6 (BEEPER) 5V | 1 2 | GND
* (MOD_RESET) PA9 | 3 4 | RESET (RESET) | 3 4 | (SD_DET)
* (SD_CS) PA10 5 6 | PB9 (FREE) (MOSI) | 5 6 | (LCD_CS)
* (LCD_CS) PB8 | 7 8 | PB7 (FREE) (SD_CS) | 7 8 | (MOD_RESET)
* 5V | 9 10 | GND (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
@ -350,7 +350,7 @@
#define CLCD_SPI_BUS 1 // SPI1 connector
#define BEEPER_PIN EXP1_09_PIN
#define BEEPER_PIN EXP1_02_PIN
#define CLCD_MOD_RESET PA9
#define CLCD_SPI_CS PB8