Skip to content

Commit

Permalink
EXP header pin numbers redux (#24525)
Browse files Browse the repository at this point in the history 
Followup to 504fec9
  • Loading branch information
@thinkyhead
thinkyhead committed Jul 23, 2022
1 parent 30da489 commit c6f2be6
Show file tree
Hide file tree
Showing 51 changed files with 879 additions and 878 deletions.
28 changes: 14 additions & 14 deletions Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,23 +128,23 @@
* EXP1 EXP2
*/

#define EXP1_08_PIN 17
#define EXP1_07_PIN 15
#define EXP1_06_PIN 16
#define EXP1_05_PIN 0
#define EXP1_04_PIN 4
#define EXP1_03_PIN 21
#define EXP1_02_PIN 13
#define EXP1_01_PIN 149
#define EXP1_02_PIN 13
#define EXP1_03_PIN 21
#define EXP1_04_PIN 4
#define EXP1_05_PIN 0
#define EXP1_06_PIN 16
#define EXP1_07_PIN 15
#define EXP1_08_PIN 17

#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN 34
#define EXP2_06_PIN 23
#define EXP2_05_PIN 12
#define EXP2_04_PIN 5
#define EXP2_03_PIN 14
#define EXP2_02_PIN 18
#define EXP2_01_PIN 19
#define EXP2_02_PIN 18
#define EXP2_03_PIN 14
#define EXP2_04_PIN 5
#define EXP2_05_PIN 12
#define EXP2_06_PIN 23
#define EXP2_07_PIN 34
#define EXP2_08_PIN -1 // RESET

//
// MicroSD card
Expand Down
20 changes: 10 additions & 10 deletions Marlin/src/pins/esp32/pins_PANDA_common.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,19 +90,19 @@
* ------ ------
* EXP2 EXP1
*/
#define EXP1_05_PIN 14
#define EXP1_04_PIN 27
#define EXP1_03_PIN 26
#define EXP1_02_PIN 12
#define EXP1_01_PIN 129
#define EXP1_02_PIN 12
#define EXP1_03_PIN 26
#define EXP1_04_PIN 27
#define EXP1_05_PIN 14

#define EXP2_07_PIN 2 // ?
#define EXP2_06_PIN 23 // ?
#define EXP2_05_PIN 32
#define EXP2_04_PIN 5 // ?
#define EXP2_03_PIN 33
#define EXP2_02_PIN 18 // ?
#define EXP2_01_PIN 19 // ?
#define EXP2_02_PIN 18 // ?
#define EXP2_03_PIN 33
#define EXP2_04_PIN 5 // ?
#define EXP2_05_PIN 32
#define EXP2_06_PIN 23 // ?
#define EXP2_07_PIN 2 // ?

//
// SD Card
Expand Down
28 changes: 14 additions & 14 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,23 +66,23 @@
* ------ ------
* EXP1 EXP2
*/
#define EXP1_08_PIN -1 // NC
#define EXP1_07_PIN -1 // NC
#define EXP1_06_PIN -1 // NC
#define EXP1_05_PIN P0_15
#define EXP1_04_PIN P0_16
#define EXP1_03_PIN P0_18
#define EXP1_02_PIN P2_11
#define EXP1_01_PIN P1_30
#define EXP1_02_PIN P2_11
#define EXP1_03_PIN P0_18
#define EXP1_04_PIN P0_16
#define EXP1_05_PIN P0_15
#define EXP1_06_PIN -1 // NC
#define EXP1_07_PIN -1 // NC
#define EXP1_08_PIN -1 // NC

#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN P1_31
#define EXP2_06_PIN P0_18
#define EXP2_05_PIN P3_25
#define EXP2_04_PIN P1_23
#define EXP2_03_PIN P3_26
#define EXP2_02_PIN P0_15
#define EXP2_01_PIN P0_17
#define EXP2_02_PIN P0_15
#define EXP2_03_PIN P3_26
#define EXP2_04_PIN P1_23
#define EXP2_05_PIN P3_25
#define EXP2_06_PIN P0_18
#define EXP2_07_PIN P1_31
#define EXP2_08_PIN -1 // RESET

/**
* LCD / Controller
Expand Down
48 changes: 24 additions & 24 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,23 +199,23 @@
* ------ ------
* EXP1 EXP2
*/
#define EXP1_08_PIN P1_23
#define EXP1_07_PIN P1_22
#define EXP1_06_PIN P1_21
#define EXP1_05_PIN P1_20
#define EXP1_04_PIN P1_19
#define EXP1_03_PIN P1_18
#define EXP1_02_PIN P0_28
#define EXP1_01_PIN P1_30
#define EXP1_02_PIN P0_28
#define EXP1_03_PIN P1_18
#define EXP1_04_PIN P1_19
#define EXP1_05_PIN P1_20
#define EXP1_06_PIN P1_21
#define EXP1_07_PIN P1_22
#define EXP1_08_PIN P1_23

#define EXP2_08_PIN -1
#define EXP2_07_PIN P1_31
#define EXP2_06_PIN P0_18
#define EXP2_05_PIN P3_25
#define EXP2_04_PIN P0_16
#define EXP2_03_PIN P3_26
#define EXP2_02_PIN P0_15
#define EXP2_01_PIN P0_17
#define EXP2_02_PIN P0_15
#define EXP2_03_PIN P3_26
#define EXP2_04_PIN P0_16
#define EXP2_05_PIN P3_25
#define EXP2_06_PIN P0_18
#define EXP2_07_PIN P1_31
#define EXP2_08_PIN -1

#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
Expand All @@ -239,11 +239,11 @@
*
* BEFORE AFTER
* ------ ------
* (CLK) | 1 2 | (BEEPER) (BEEPER) | 1 2 | --
* -- | 3 4 | (BTN_ENC) (BTN_ENC) | 3 4 | (CLK)
* (SID) 5 6 | (BTN_EN1) (BTN_EN1) 5 6 | (SID)
* (CS) | 7 8 | (BTN_EN2) (BTN_EN2) | 7 8 | (CS)
* GND | 9 10 | 5V GND | 9 10 | 5V
* (CLK) | 1 2 | (BEEPER) (BEEPER) |10 9 | --
* -- | 3 4 | (BTN_ENC) (BTN_ENC) | 8 7 | (CLK)
* (SID) 5 6 | (BTN_EN1) (BTN_EN1) 6 5 | (SID)
* (CS) | 7 8 | (BTN_EN2) (BTN_EN2) | 4 3 | (CS)
* GND | 9 10 | 5V GND | 2 1 | 5V
* ------ ------
* LCD LCD
*/
Expand Down Expand Up @@ -274,11 +274,11 @@
*
* BEFORE AFTER
* ______ ______
* | 1 2 | (MOSI) (MOSI) | 1 2 | --
* (BTN_ENC) | 3 4 | (SCK) (BTN_ENC) | 3 4 | (SCK)
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 5 6 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 7 8 | (CS)
* 5V | 9 10 | GND GND | 9 10 | 5V
* | 1 2 | (MOSI) (MOSI) |10 9 | --
* (BTN_ENC) | 3 4 | (SCK) (BTN_ENC) | 8 7 | (SCK)
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 6 5 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 4 3 | (CS)
* 5V | 9 10 | GND GND | 2 1 | 5V
* ------ ------
* LCD LCD
*/
Expand Down
48 changes: 24 additions & 24 deletions Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,23 +254,23 @@
* ------ ------
* EXP1 EXP2
*/
#define EXP1_08_PIN P1_23
#define EXP1_07_PIN P1_22
#define EXP1_06_PIN P1_21
#define EXP1_05_PIN P1_20
#define EXP1_04_PIN P1_19
#define EXP1_03_PIN P1_18
#define EXP1_02_PIN P0_28
#define EXP1_01_PIN P1_30
#define EXP1_02_PIN P0_28
#define EXP1_03_PIN P1_18
#define EXP1_04_PIN P1_19
#define EXP1_05_PIN P1_20
#define EXP1_06_PIN P1_21
#define EXP1_07_PIN P1_22
#define EXP1_08_PIN P1_23

#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN P1_31
#define EXP2_06_PIN P0_18
#define EXP2_05_PIN P3_25
#define EXP2_04_PIN P0_16
#define EXP2_03_PIN P3_26
#define EXP2_02_PIN P0_15
#define EXP2_01_PIN P0_17
#define EXP2_02_PIN P0_15
#define EXP2_03_PIN P3_26
#define EXP2_04_PIN P0_16
#define EXP2_05_PIN P3_25
#define EXP2_06_PIN P0_18
#define EXP2_07_PIN P1_31
#define EXP2_08_PIN -1 // RESET

#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI

Expand Down Expand Up @@ -300,11 +300,11 @@
*
* BEFORE AFTER
* ------ ------
* (BEEPER) | 1 2 | (CLK) (BEEPER) | 1 2 | (CLK)
* (BTN_ENC) | 3 4 | -- (BTN_ENC) | 3 4 | --
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 5 6 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 7 8 | (CS)
* 5V | 9 10 | GND GND | 9 10 | 5V
* (BEEPER) | 1 2 | (CLK) (BEEPER) |10 9 | (CLK)
* (BTN_ENC) | 3 4 | -- (BTN_ENC) | 8 7 | --
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 6 5 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 4 3 | (CS)
* 5V | 9 10 | GND GND | 2 1 | 5V
* ------ ------
* LCD LCD
*/
Expand Down Expand Up @@ -336,11 +336,11 @@
*
* BEFORE AFTER
* ------ ------
* (BEEPER) | 1 2 | (CLK) (BEEPER) | 1 2 | --
* (BTN_ENC) | 3 4 | -- (BTN_ENC) | 3 4 | (CLK)
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 5 6 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 7 8 | (CS)
* 5V | 9 10 | GND GND | 9 10 | 5V
* (BEEPER) | 1 2 | (CLK) (BEEPER) |10 9 | --
* (BTN_ENC) | 3 4 | -- (BTN_ENC) | 8 7 | (CLK)
* (BTN_EN1) 5 6 | (SID) (BTN_EN1) 6 5 | (SID)
* (BTN_EN2) | 7 8 | (CS) (BTN_EN2) | 4 3 | (CS)
* 5V | 9 10 | GND GND | 2 1 | 5V
* ------ ------
* LCD LCD
*/
Expand Down
32 changes: 16 additions & 16 deletions Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,25 +91,25 @@
//
// Extension ports
//
#define EXP1_10_PIN P0_28 // SCL0
#define EXP1_09_PIN P0_27 // SDA0
#define EXP1_08_PIN P0_16 // SSEL0
#define EXP1_07_PIN P0_15 // SCK0
#define EXP1_06_PIN P0_18 // MOSI0
#define EXP1_05_PIN P0_17 // MISO0
#define EXP1_04_PIN P1_31
#define EXP1_03_PIN P1_30
#define EXP1_02_PIN P0_02 // TX0
#define EXP1_01_PIN P0_03 // RX0
#define EXP1_02_PIN P0_02 // TX0
#define EXP1_03_PIN P1_30
#define EXP1_04_PIN P1_31
#define EXP1_05_PIN P0_17 // MISO0
#define EXP1_06_PIN P0_18 // MOSI0
#define EXP1_07_PIN P0_15 // SCK0
#define EXP1_08_PIN P0_16 // SSEL0
#define EXP1_09_PIN P0_27 // SDA0
#define EXP1_10_PIN P0_28 // SCL0

#define EXP2_08_PIN P1_27
#define EXP2_07_PIN P1_26
#define EXP2_06_PIN P1_29
#define EXP2_05_PIN P1_28
#define EXP2_04_PIN P0_01 // SCL1
#define EXP2_03_PIN P0_00 // SDA1
#define EXP2_02_PIN P0_11
#define EXP2_01_PIN P0_10
#define EXP2_02_PIN P0_11
#define EXP2_03_PIN P0_00 // SDA1
#define EXP2_04_PIN P0_01 // SCL1
#define EXP2_05_PIN P1_28
#define EXP2_06_PIN P1_29
#define EXP2_07_PIN P1_26
#define EXP2_08_PIN P1_27

//
// SD Support
Expand Down
28 changes: 14 additions & 14 deletions Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -239,23 +239,23 @@
* ------ ------
* EXP1 EXP2
*/
#define EXP1_08_PIN P1_22
#define EXP1_07_PIN P1_00
#define EXP1_06_PIN P0_17
#define EXP1_05_PIN P0_15
#define EXP1_04_PIN P0_16
#define EXP1_03_PIN P0_18
#define EXP1_02_PIN P1_30
#define EXP1_01_PIN P1_31
#define EXP1_02_PIN P1_30
#define EXP1_03_PIN P0_18
#define EXP1_04_PIN P0_16
#define EXP1_05_PIN P0_15
#define EXP1_06_PIN P0_17
#define EXP1_07_PIN P1_00
#define EXP1_08_PIN P1_22

#define EXP2_08_PIN -1 // RESET
#define EXP2_07_PIN P0_27
#define EXP2_06_PIN P0_09
#define EXP2_05_PIN P3_26
#define EXP2_04_PIN P0_28
#define EXP2_03_PIN P3_25
#define EXP2_02_PIN P0_07
#define EXP2_01_PIN P0_08
#define EXP2_02_PIN P0_07
#define EXP2_03_PIN P3_25
#define EXP2_04_PIN P0_28
#define EXP2_05_PIN P3_26
#define EXP2_06_PIN P0_09
#define EXP2_07_PIN P0_27
#define EXP2_08_PIN -1 // RESET

#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
Expand Down
26 changes: 13 additions & 13 deletions Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,14 +194,14 @@
* ------
* EXP
*/
#define EXP1_08_PIN P0_18
#define EXP1_07_PIN P0_17
#define EXP1_06_PIN P0_15
#define EXP1_05_PIN P0_20
#define EXP1_04_PIN -1
#define EXP1_03_PIN P0_19
#define EXP1_02_PIN P0_16
#define EXP1_01_PIN P2_08
#define EXP1_02_PIN P0_16
#define EXP1_03_PIN P0_19
#define EXP1_04_PIN -1
#define EXP1_05_PIN P0_20
#define EXP1_06_PIN P0_15
#define EXP1_07_PIN P0_17
#define EXP1_08_PIN P0_18

#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
Expand All @@ -210,12 +210,12 @@

/**
* Ender 3 V2 display SKR E3 Turbo (EXP1) Ender 3 V2 display --> SKR E3 Turbo
* ------ ------ RX 8 --> 5 P0_15
* -- | 1 2 | -- (BEEPER) P2_08 | 1 2 | P0_16 (BTN_ENC) TX 7 --> 9 P0_16
* (SKR_TX1) RX | 3 4 | TX (SKR_RX1) (BTN_EN1) P0_19 | 3 4 | RESET BEEPER 5 --> 10 P2_08
* (BTN_ENC) ENT 5 6 | BEEPER (BTN_EN2) P0_20 5 6 | P0_15 (LCD_D4)
* (BTN_E2) B | 7 8 | A (BTN_E1) (LCD_RS) P0_17 | 7 8 | P0_18 (LCD_EN)
* GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------ RX 3 --> 5 P0_15
* -- | 1 2 | -- (BEEPER) P2_08 |10 9 | P0_16 (BTN_ENC) TX 4 --> 9 P0_16
* (SKR_TX1) RX | 3 4 | TX (SKR_RX1) (BTN_EN1) P0_19 | 8 7 | RESET BEEPER 6 --> 10 P2_08
* (BTN_ENC) ENT 5 6 | BEEPER (BTN_EN2) P0_20 6 5 | P0_15 (LCD_D4)
* (BTN_E2) B | 7 8 | A (BTN_E1) (LCD_RS) P0_17 | 4 3 | P0_18 (LCD_EN)
* GND | 9 10 | 5V GND | 2 1 | 5V
* ------ ------
*/

Expand Down
Loading

0 comments on commit c6f2be6

Please sign in to comment.