From 504fec98237a1042819eba145ae39ad14cc49a1e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sat, 16 Jul 2022 16:26:36 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=9A=B8=20Renumber=20EXP=20pins=20to=20mat?=
=?UTF-8?q?ch=20schematics/RRF/Klipper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/pins/esp32/pins_MKS_TINYBEE.h | 84 +++----
Marlin/src/pins/esp32/pins_PANDA_common.h | 58 ++---
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 80 +++---
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h | 210 ++++++++--------
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h | 208 ++++++++--------
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h | 54 ++--
Marlin/src/pins/lpc1768/pins_EMOTRONIC.h | 64 +++--
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h | 140 +++++------
.../src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h | 84 +++----
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h | 136 +++++------
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h | 70 +++---
Marlin/src/pins/ramps/pins_MKS_GEN_13.h | 42 ++--
Marlin/src/pins/ramps/pins_RAMPS.h | 230 +++++++++---------
Marlin/src/pins/ramps/pins_RAMPS_PLUS.h | 42 ++--
Marlin/src/pins/ramps/pins_ZRIB_V53.h | 56 ++---
Marlin/src/pins/sam/pins_RAMPS_FD_V1.h | 96 ++++----
Marlin/src/pins/sam/pins_RAMPS_SMART.h | 42 ++--
Marlin/src/pins/sam/pins_RURAMPS4D_11.h | 94 +++----
Marlin/src/pins/sam/pins_RURAMPS4D_13.h | 98 ++++----
.../src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h | 168 ++++++-------
Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h | 172 ++++++-------
.../src/pins/sanguino/pins_MELZI_CREALITY.h | 10 +-
Marlin/src/pins/sanguino/pins_ZMIB_V2.h | 48 ++--
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h | 30 +--
.../stm32f1/pins_BTT_SKR_MINI_E3_common.h | 60 ++---
.../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 110 ++++-----
.../src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h | 40 +--
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h | 20 +-
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h | 66 ++---
Marlin/src/pins/stm32f1/pins_FLY_MINI.h | 78 +++---
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h | 60 ++---
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h | 140 +++++------
.../pins/stm32f1/pins_MKS_ROBIN_E3_common.h | 108 ++++----
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h | 64 ++---
Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h | 48 ++--
Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h | 114 ++++-----
Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h | 86 +++----
.../src/pins/stm32f4/pins_BTT_BTT002_V1_0.h | 124 +++++-----
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h | 40 +--
Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h | 122 +++++-----
.../pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h | 164 ++++++-------
.../pins/stm32f4/pins_BTT_SKR_PRO_common.h | 178 +++++++-------
.../pins/stm32f4/pins_BTT_SKR_V2_0_common.h | 188 +++++++-------
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h | 78 +++---
.../pins/stm32f4/pins_FYSETC_CHEETAH_V20.h | 110 ++++-----
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h | 126 +++++-----
.../pins/stm32f4/pins_MKS_MONSTER8_common.h | 114 ++++-----
.../stm32f4/pins_MKS_ROBIN_NANO_V3_common.h | 114 ++++-----
.../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h | 110 ++++-----
.../src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h | 68 +++---
Marlin/src/pins/stm32f4/pins_VAKE403D.h | 64 ++---
.../pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h | 78 +++---
.../pins/stm32h7/pins_BTT_SKR_V3_0_common.h | 188 +++++++-------
53 files changed, 2587 insertions(+), 2589 deletions(-)
diff --git a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
index 110c6f83ef8..3762f640336 100644
--- a/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
+++ b/Marlin/src/pins/esp32/pins_MKS_TINYBEE.h
@@ -119,72 +119,72 @@
/**
* ------ ------
- * (BEEPER) 149 |10 9 | 13 (BTN_ENC) (SPI MISO) 19 |10 9 | 18 (SPI SCK)
- * (LCD_EN) 21 | 8 7 | 4 (LCD_RS) (BTN_EN1) 14 | 8 7 | 5 (SPI CS)
- * (LCD_D4) 0 6 5 | 16 (LCD_D5) (BTN_EN2) 12 6 5 | 23 (SPI MOSI)
- * (LCD_D6) 15 | 4 3 | 17 (LCD_D7) (SPI_DET) 34 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * (BEEPER) 149 | 1 2 | 13 (BTN_ENC) (SPI MISO) 19 | 1 2 | 18 (SPI SCK)
+ * (LCD_EN) 21 | 3 4 | 4 (LCD_RS) (BTN_EN1) 14 | 3 4 | 5 (SPI CS)
+ * (LCD_D4) 0 5 6 | 16 (LCD_D5) (BTN_EN2) 12 5 6 | 23 (SPI MOSI)
+ * (LCD_D6) 15 | 7 8 | 17 (LCD_D7) (SPI_DET) 34 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN 17
-#define EXP1_04_PIN 15
-#define EXP1_05_PIN 16
-#define EXP1_06_PIN 0
-#define EXP1_07_PIN 4
-#define EXP1_08_PIN 21
-#define EXP1_09_PIN 13
-#define EXP1_10_PIN 149
+#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 EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN 34
-#define EXP2_05_PIN 23
-#define EXP2_06_PIN 12
-#define EXP2_07_PIN 5
-#define EXP2_08_PIN 14
-#define EXP2_09_PIN 18
-#define EXP2_10_PIN 19
+#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
//
// MicroSD card
//
-//#define SD_MOSI_PIN EXP2_05_PIN // uses esp32 default 23
-//#define SD_MISO_PIN EXP2_10_PIN // uses esp32 default 19
-//#define SD_SCK_PIN EXP2_09_PIN // uses esp32 default 18
-#define SDSS EXP2_07_PIN
-#define SD_DETECT_PIN EXP2_04_PIN // IO34 default is SD_DET signal (Jump to SDDET)
+//#define SD_MOSI_PIN EXP2_06_PIN // uses esp32 default 23
+//#define SD_MISO_PIN EXP2_01_PIN // uses esp32 default 19
+//#define SD_SCK_PIN EXP2_02_PIN // uses esp32 default 18
+#define SDSS EXP2_04_PIN
+#define SD_DETECT_PIN EXP2_07_PIN // IO34 default is SD_DET signal (Jump to SDDET)
#define USES_SHARED_SPI // SPI is shared by SD card with TMC SPI drivers
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864)
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
#define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
// MKS_MINI_12864_V3, BTT_MINI_12864_V1, FYSETC_MINI_12864_2_1
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define LCD_RESET_PIN EXP1_06_PIN
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
#else
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#endif
#define BOARD_ST7920_DELAY_1 96
#define BOARD_ST7920_DELAY_2 48
diff --git a/Marlin/src/pins/esp32/pins_PANDA_common.h b/Marlin/src/pins/esp32/pins_PANDA_common.h
index 7deeca3f622..dfd05255215 100644
--- a/Marlin/src/pins/esp32/pins_PANDA_common.h
+++ b/Marlin/src/pins/esp32/pins_PANDA_common.h
@@ -82,47 +82,47 @@
#endif
/** ------ ------
- * (MISO 19?) |10 9 | (18 SCK?) (BEEPER) 129 |10 9 | 12 (^ENC)
- * (EN1) 33 | 8 7 | (5 SDSS?) (EN) 26 | 8 7 | 27 (RS)
- * (EN2) 32 6 5 | (23 MOSI?) (D4) 14 | 6 5 --
- * (SDDET 2?) | 4 3 | (RESET) -- | 4 3 | --
- * -- | 2 1 | -- (GND) | 2 1 | (5V)
+ * (MISO 19?) | 1 2 | (18 SCK?) (BEEPER) 129 | 1 2 | 12 (^ENC)
+ * (EN1) 33 | 3 4 | (5 SDSS?) (EN) 26 | 3 4 | 27 (RS)
+ * (EN2) 32 5 6 | (23 MOSI?) (D4) 14 | 5 6 --
+ * (SDDET 2?) | 7 8 | (RESET) -- | 7 8 | --
+ * -- | 9 10 | -- (GND) | 9 10 | (5V)
* ------ ------
* EXP2 EXP1
*/
-#define EXP1_06_PIN 14
-#define EXP1_07_PIN 27
-#define EXP1_08_PIN 26
-#define EXP1_09_PIN 12
-#define EXP1_10_PIN 129
+#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 EXP2_04_PIN 2 // ?
-#define EXP2_05_PIN 23 // ?
-#define EXP2_06_PIN 32
-#define EXP2_07_PIN 5 // ?
-#define EXP2_08_PIN 33
-#define EXP2_09_PIN 18 // ?
-#define EXP2_10_PIN 19 // ?
+#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 // ?
//
// SD Card
//
#if ENABLED(SDSUPPORT)
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SDSS EXP2_07_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
index f0f57c63eed..ba042e3bf51 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -58,31 +58,31 @@
/** ------ ------
- * 1.30 |10 9 | 2.11 0.17 |10 9 | 0.15
- * 0.18 | 8 7 | 0.16 3.26 | 8 7 | 1.23
- * 0.15 6 5 | -- 3.25 6 5 | 0.18
- * -- | 4 3 | -- 1.31 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * 1.30 | 1 2 | 2.11 0.17 | 1 2 | 0.15
+ * 0.18 | 3 4 | 0.16 3.26 | 3 4 | 1.23
+ * 0.15 5 6 | -- 3.25 5 6 | 0.18
+ * -- | 7 8 | -- 1.31 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN -1 // NC
-#define EXP1_04_PIN -1 // NC
-#define EXP1_05_PIN -1 // NC
-#define EXP1_06_PIN P0_15
-#define EXP1_07_PIN P0_16
-#define EXP1_08_PIN P0_18
-#define EXP1_09_PIN P2_11
-#define EXP1_10_PIN P1_30
+#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 EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN P1_31
-#define EXP2_05_PIN P0_18
-#define EXP2_06_PIN P3_25
-#define EXP2_07_PIN P1_23
-#define EXP2_08_PIN P3_26
-#define EXP2_09_PIN P0_15
-#define EXP2_10_PIN P0_17
+#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
/**
* LCD / Controller
@@ -100,23 +100,23 @@
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_WIRED_LCD
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define LCD_SDSS EXP2_07_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP2_05_PIN
- #define LCD_PINS_D4 EXP2_09_PIN
+ #define LCD_SDSS EXP2_04_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP2_06_PIN
+ #define LCD_PINS_D4 EXP2_02_PIN
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P2_06
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
#endif
#endif // HAS_WIRED_LCD
@@ -165,10 +165,10 @@
// When using any TMC SPI-based drivers, software SPI is used
// because pins may be shared with the display or SD card.
#define TMC_USE_SW_SPI
- #define TMC_SW_MOSI EXP2_05_PIN
- #define TMC_SW_MISO EXP2_10_PIN
+ #define TMC_SW_MOSI EXP2_06_PIN
+ #define TMC_SW_MISO EXP2_01_PIN
// To minimize pin usage use the same clock pin as the display/SD card reader. (May generate LCD noise.)
- #define TMC_SW_SCK EXP2_09_PIN
+ #define TMC_SW_SCK EXP2_02_PIN
// If pin 2_06 is unused, it can be used for the clock to avoid the LCD noise.
//#define TMC_SW_SCK P2_06
@@ -211,11 +211,11 @@
// SDCARD_CONNECTION must not be 'LCD'. Nothing should be connected to EXP1/EXP2.
//#define SKR_USE_LCD_PINS_FOR_CS
#if ENABLED(SKR_USE_LCD_PINS_FOR_CS)
- #define X_CS_PIN EXP2_07_PIN
- #define Y_CS_PIN EXP2_08_PIN
- #define Z_CS_PIN EXP1_09_PIN
- #define E0_CS_PIN EXP2_06_PIN
- #define E1_CS_PIN EXP2_04_PIN
+ #define X_CS_PIN EXP2_04_PIN
+ #define Y_CS_PIN EXP2_03_PIN
+ #define Z_CS_PIN EXP1_02_PIN
+ #define E0_CS_PIN EXP2_05_PIN
+ #define E1_CS_PIN EXP2_07_PIN
#endif
// Example 2: A REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
@@ -228,11 +228,11 @@
#define Z_CS_PIN P2_06
// We use SD_DETECT_PIN for E0
#undef SD_DETECT_PIN
- #define E0_CS_PIN EXP2_04_PIN
+ #define E0_CS_PIN EXP2_07_PIN
// We use LCD_SDSS pin for E1
#undef LCD_SDSS
#define LCD_SDSS -1
- #define E1_CS_PIN EXP2_07_PIN
+ #define E1_CS_PIN EXP2_04_PIN
#endif
// Example 3: Use the driver enable pins for chip-select.
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
index 4ab5b109372..4ea4687507b 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_3.h
@@ -191,31 +191,31 @@
/**
* ------ ------
- * (BEEPER) 1.30 |10 9 | 0.28 (BTN_ENC) (MISO) 0.17 |10 9 | 0.15 (SCK)
- * (LCD_EN) 1.18 | 8 7 | 1.19 (LCD_RS) (BTN_EN1) 3.26 | 8 7 | 0.16 (SD_SS)
- * (LCD_D4) 1.20 6 5 | 1.21 (LCD_D5) (BTN_EN2) 3.25 6 5 | 0.18 (MOSI)
- * (LCD_D6) 1.22 | 4 3 | 1.23 (LCD_D7) (SD_DETECT) 1.31 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) 1.30 | 1 2 | 0.28 (BTN_ENC) (MISO) 0.17 | 1 2 | 0.15 (SCK)
+ * (LCD_EN) 1.18 | 3 4 | 1.19 (LCD_RS) (BTN_EN1) 3.26 | 3 4 | 0.16 (SD_SS)
+ * (LCD_D4) 1.20 5 6 | 1.21 (LCD_D5) (BTN_EN2) 3.25 5 6 | 0.18 (MOSI)
+ * (LCD_D6) 1.22 | 7 8 | 1.23 (LCD_D7) (SD_DETECT) 1.31 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN P1_23
-#define EXP1_04_PIN P1_22
-#define EXP1_05_PIN P1_21
-#define EXP1_06_PIN P1_20
-#define EXP1_07_PIN P1_19
-#define EXP1_08_PIN P1_18
-#define EXP1_09_PIN P0_28
-#define EXP1_10_PIN P1_30
+#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 EXP2_03_PIN -1
-#define EXP2_04_PIN P1_31
-#define EXP2_05_PIN P0_18
-#define EXP2_06_PIN P3_25
-#define EXP2_07_PIN P0_16
-#define EXP2_08_PIN P3_26
-#define EXP2_09_PIN P0_15
-#define EXP2_10_PIN P0_17
+#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
#if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
@@ -239,23 +239,23 @@
*
* BEFORE AFTER
* ------ ------
- * (CLK) |10 9 | (BEEPER) (BEEPER) |10 9 | --
- * -- | 8 7 | (BTN_ENC) (BTN_ENC) | 8 7 | (CLK)
- * (SID) 6 5 | (BTN_EN1) (BTN_EN1) 6 5 | (SID)
- * (CS) | 4 3 | (BTN_EN2) (BTN_EN2) | 4 3 | (CS)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * (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
* ------ ------
* LCD LCD
*/
- #define LCD_PINS_RS EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_08_PIN
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_08_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_03_PIN
- #define LCD_PINS_ENABLE EXP1_05_PIN
- #define LCD_PINS_D4 EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_04_PIN
#elif ENABLED(WYH_L12864)
@@ -274,33 +274,33 @@
*
* BEFORE AFTER
* ______ ______
- * |10 9 | (MOSI) (MOSI) |10 9 | --
- * (BTN_ENC) | 8 7 | (SCK) (BTN_ENC) | 8 7 | (SCK)
- * (BTN_EN1) 6 5 | (SID) (BTN_EN1) 6 5 | (SID)
- * (BTN_EN2) | 4 3 | (CS) (BTN_EN2) | 4 3 | (CS)
- * 5V | 2 1 | GND GND | 2 1 | 5V
+ * | 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
* ------ ------
* LCD LCD
*/
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_08_PIN
- #define DOGLCD_CS EXP1_03_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_07_PIN
- #define DOGLCD_MOSI EXP1_10_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_03_PIN
+ #define DOGLCD_CS EXP1_08_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_04_PIN
+ #define DOGLCD_MOSI EXP1_01_PIN
#define LCD_BACKLIGHT_PIN -1
#elif ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN // (58) open-drain
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN // (58) open-drain
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif HAS_ADC_BUTTONS
@@ -308,20 +308,20 @@
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
- #define TFT_A0_PIN EXP1_03_PIN
- #define TFT_DC_PIN EXP1_03_PIN
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
- #define TFT_BACKLIGHT_PIN EXP1_08_PIN
+ #define TFT_A0_PIN EXP1_08_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
+ #define TFT_BACKLIGHT_PIN EXP1_03_PIN
- //#define TFT_RST_PIN EXP2_04_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
+ //#define TFT_RST_PIN EXP2_07_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_ENC EXP1_02_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
@@ -369,90 +369,90 @@
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#else // !CR10_STOCKDISPLAY
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN // (31) J3-2 & AUX-4
- #define BTN_EN2 EXP2_06_PIN // (33) J3-4 & AUX-4
- #define BTN_ENC EXP1_09_PIN // (58) open-drain
+ #define BTN_EN1 EXP2_03_PIN // (31) J3-2 & AUX-4
+ #define BTN_EN2 EXP2_05_PIN // (33) J3-4 & AUX-4
+ #define BTN_ENC EXP1_02_PIN // (58) open-drain
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
- #define LCD_SDSS EXP2_07_PIN // (16) J3-7 & AUX-4
- #define SD_DETECT_PIN EXP2_04_PIN // (49) (NOT 5V tolerant)
+ #define LCD_SDSS EXP2_04_PIN // (16) J3-7 & AUX-4
+ #define SD_DETECT_PIN EXP2_07_PIN // (49) (NOT 5V tolerant)
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
/**
* Creality Ender-2 display pinout
* ------
- * (SCK) P1_30 |10 9 | P0_28 (BTN_ENC)
- * (BTN_EN1) P1_18 | 8 7 | P1_19 (RESET)
- * (BTN_EN2) P1_20 6 5 | P1_21 (LCD_A0)
- * (LCD_CS) P1_22 | 4 3 | P1_23 (MOSI)
- * GND | 2 1 | 5V
+ * (SCK) P1_30 | 1 2 | P0_28 (BTN_ENC)
+ * (BTN_EN1) P1_18 | 3 4 | P1_19 (RESET)
+ * (BTN_EN2) P1_20 5 6 | P1_21 (LCD_A0)
+ * (LCD_CS) P1_22 | 7 8 | P1_23 (MOSI)
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_10_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_01_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#endif
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -467,11 +467,11 @@
#endif // HAS_WIRED_LCD
#if NEED_TOUCH_PINS
- #define TOUCH_CS_PIN EXP1_06_PIN
- #define TOUCH_SCK_PIN EXP2_09_PIN
- #define TOUCH_MOSI_PIN EXP2_05_PIN
- #define TOUCH_MISO_PIN EXP2_10_PIN
- #define TOUCH_INT_PIN EXP1_05_PIN
+ #define TOUCH_CS_PIN EXP1_05_PIN
+ #define TOUCH_SCK_PIN EXP2_02_PIN
+ #define TOUCH_MOSI_PIN EXP2_06_PIN
+ #define TOUCH_MISO_PIN EXP2_01_PIN
+ #define TOUCH_INT_PIN EXP1_06_PIN
#endif
/**
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
index b50e8e57800..8f0f46ad855 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
@@ -246,41 +246,41 @@
#endif
/** ------ ------
- * 1.30 |10 9 | 0.28 0.17 |10 9 | 0.15
- * 1.18 | 8 7 | 1.19 3.26 | 8 7 | 0.16
- * 1.20 6 5 | 1.21 3.25 6 5 | 0.18
- * 1.22 | 4 3 | 1.23 1.31 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * 1.30 | 1 2 | 0.28 0.17 | 1 2 | 0.15
+ * 1.18 | 3 4 | 1.19 3.26 | 3 4 | 0.16
+ * 1.20 5 6 | 1.21 3.25 5 6 | 0.18
+ * 1.22 | 7 8 | 1.23 1.31 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN P1_23
-#define EXP1_04_PIN P1_22
-#define EXP1_05_PIN P1_21
-#define EXP1_06_PIN P1_20
-#define EXP1_07_PIN P1_19
-#define EXP1_08_PIN P1_18
-#define EXP1_09_PIN P0_28
-#define EXP1_10_PIN P1_30
+#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 EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN P1_31
-#define EXP2_05_PIN P0_18
-#define EXP2_06_PIN P3_25
-#define EXP2_07_PIN P0_16
-#define EXP2_08_PIN P3_26
-#define EXP2_09_PIN P0_15
-#define EXP2_10_PIN P0_17
+#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
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
// RET6 DWIN ENCODER LCD
- #define BTN_ENC EXP1_06_PIN
- #define BTN_EN1 EXP1_03_PIN
- #define BTN_EN2 EXP1_04_PIN
+ #define BTN_ENC EXP1_05_PIN
+ #define BTN_EN1 EXP1_08_PIN
+ #define BTN_EN2 EXP1_07_PIN
#ifndef BEEPER_PIN
- #define BEEPER_PIN EXP1_05_PIN
+ #define BEEPER_PIN EXP1_06_PIN
#endif
#elif HAS_WIRED_LCD
@@ -300,24 +300,24 @@
*
* BEFORE AFTER
* ------ ------
- * (BEEPER) | 10 9 | (CLK) (BEEPER) | 10 9 | (CLK)
- * (BTN_ENC) | 8 7 | -- (BTN_ENC) | 8 7 | --
- * (BTN_EN1) 6 5 | (SID) (BTN_EN1) 6 5 | (SID)
- * (BTN_EN2) | 4 3 | (CS) (BTN_EN2) | 4 3 | (CS)
- * 5V | 2 1 | GND GND | 2 1 | 5V
+ * (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
* ------ ------
* LCD LCD
*/
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP1_05_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_10_PIN
+ #define BTN_EN1 EXP1_06_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_01_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define BEEPER_PIN EXP1_03_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define BEEPER_PIN EXP1_08_PIN
#elif ENABLED(ANET_FULL_GRAPHICS_LCD)
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -336,147 +336,147 @@
*
* BEFORE AFTER
* ------ ------
- * (BEEPER) |10 9 | (CLK) (BEEPER) |10 9 | --
- * (BTN_ENC) | 8 7 | -- (BTN_ENC) | 8 7 | (CLK)
- * (BTN_EN1) 6 5 | (SID) (BTN_EN1) 6 5 | (SID)
- * (BTN_EN2) | 4 3 | (CS) (BTN_EN2) | 4 3 | (CS)
- * 5V | 2 1 | GND GND | 2 1 | 5V
+ * (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
* ------ ------
* LCD LCD
*/
- #define LCD_PINS_RS EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_08_PIN
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_08_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_03_PIN
- #define LCD_PINS_ENABLE EXP1_05_PIN
- #define LCD_PINS_D4 EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_04_PIN
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#elif ENABLED(CR10_STOCKDISPLAY)
- #define BTN_ENC EXP1_09_PIN // (58) open-drain
- #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_ENC EXP1_02_PIN // (58) open-drain
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* ------
- * (SCK) 1.30 |10 9 | 0.28 (BTN_ENC)
- * (BTN_EN1) 1.18 | 8 7 | 1.19 (RESET)
- * (BTN_EN2) 1.20 6 5 | 1.21 (LCD_A0)
- * (LCD_RS) 1.22 | 4 3 | 1.23 (MOSI)
- * GND | 2 1 | 5V
+ * (SCK) 1.30 | 1 2 | 0.28 (BTN_ENC)
+ * (BTN_EN1) 1.18 | 3 4 | 1.19 (RESET)
+ * (BTN_EN2) 1.20 5 6 | 1.21 (LCD_A0)
+ * (LCD_RS) 1.22 | 7 8 | 1.23 (MOSI)
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_10_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_01_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_A0_PIN EXP1_03_PIN
- #define TFT_DC_PIN EXP1_03_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_BACKLIGHT_PIN EXP1_08_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_A0_PIN EXP1_08_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_BACKLIGHT_PIN EXP1_03_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
#define LCD_USE_DMA_SPI
- #define TOUCH_INT_PIN EXP1_05_PIN
- #define TOUCH_CS_PIN EXP1_06_PIN
+ #define TOUCH_INT_PIN EXP1_06_PIN
+ #define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
// SPI 1
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
#define TFT_BUFFER_SIZE 2400
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#else
- #define BTN_ENC EXP1_09_PIN // (58) open-drain
- #define LCD_PINS_RS EXP1_07_PIN
+ #define BTN_ENC EXP1_02_PIN // (58) open-drain
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN // (31) J3-2 & AUX-4
- #define BTN_EN2 EXP2_06_PIN // (33) J3-4 & AUX-4
+ #define BTN_EN1 EXP2_03_PIN // (31) J3-2 & AUX-4
+ #define BTN_EN2 EXP2_05_PIN // (33) J3-4 & AUX-4
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
- #define LCD_SDSS EXP2_07_PIN // (16) J3-7 & AUX-4
+ #define LCD_SDSS EXP2_04_PIN // (16) J3-7 & AUX-4
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
#define FORCE_SOFT_SPI
#endif
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
- #define BTN_ENC_EN EXP1_03_PIN // Detect the presence of the encoder
+ #define BTN_ENC_EN EXP1_08_PIN // Detect the presence of the encoder
#endif
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
index 37d0cb7fb1e..ec74cc640e8 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
@@ -134,8 +134,8 @@
#define SD_SCK_PIN P0_15
#define SD_MISO_PIN P0_17
#define SD_MOSI_PIN P0_18
- #define SD_SS_PIN EXP2_07_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_SS_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif SD_CONNECTION_IS(ONBOARD)
#undef SD_DETECT_PIN
@@ -152,11 +152,11 @@
#if ENABLED(BTT_MOTOR_EXPANSION)
/**
* ------ ------
- * (M3STP) |10 9 | (M3DIR) (M3DIAG) |10 9 | (M3RX)
- * (M2STP) | 8 7 | (M2DIR) (M2DIAG) | 8 7 | (M2RX)
- * (M1DIR) 6 5 | (M1STP) (M1DIAG) 6 5 | (M1RX)
- * (M1EN) | 4 3 | -- (M3EN) | 4 3 | (M2EN)
- * GND | 2 1 | -- GND | 2 1 | --
+ * (M3STP) | 1 2 | (M3DIR) (M3DIAG) | 1 2 | (M3RX)
+ * (M2STP) | 3 4 | (M2DIR) (M2DIAG) | 3 4 | (M2RX)
+ * (M1DIR) 5 6 | (M1STP) (M1DIAG) 5 6 | (M1RX)
+ * (M1EN) | 7 8 | -- (M3EN) | 7 8 | (M2EN)
+ * GND | 9 10 | -- GND | 9 10 | --
* ------ ------
* EXP2 EXP1
*
@@ -164,46 +164,46 @@
*/
// M1 on Driver Expansion Module
- #define E2_STEP_PIN EXP2_05_PIN
- #define E2_DIR_PIN EXP2_06_PIN
- #define E2_ENABLE_PIN EXP2_04_PIN
+ #define E2_STEP_PIN EXP2_06_PIN
+ #define E2_DIR_PIN EXP2_05_PIN
+ #define E2_ENABLE_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E2_DIAG_PIN EXP1_06_PIN
- #define E2_CS_PIN EXP1_05_PIN
+ #define E2_DIAG_PIN EXP1_05_PIN
+ #define E2_CS_PIN EXP1_06_PIN
#if HAS_TMC_UART
- #define E2_SERIAL_TX_PIN EXP1_05_PIN
+ #define E2_SERIAL_TX_PIN EXP1_06_PIN
#define E2_SERIAL_RX_PIN E2_SERIAL_TX_PIN
#endif
#endif
// M2 on Driver Expansion Module
- #define E3_STEP_PIN EXP2_08_PIN
- #define E3_DIR_PIN EXP2_07_PIN
+ #define E3_STEP_PIN EXP2_03_PIN
+ #define E3_DIR_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E3_ENABLE_PIN EXP1_03_PIN
- #define E3_DIAG_PIN EXP1_08_PIN
- #define E3_CS_PIN EXP1_07_PIN
+ #define E3_ENABLE_PIN EXP1_08_PIN
+ #define E3_DIAG_PIN EXP1_03_PIN
+ #define E3_CS_PIN EXP1_04_PIN
#if HAS_TMC_UART
- #define E3_SERIAL_TX_PIN EXP1_07_PIN
+ #define E3_SERIAL_TX_PIN EXP1_04_PIN
#define E3_SERIAL_RX_PIN E3_SERIAL_TX_PIN
#endif
#else
- #define E3_ENABLE_PIN EXP2_04_PIN
+ #define E3_ENABLE_PIN EXP2_07_PIN
#endif
// M3 on Driver Expansion Module
- #define E4_STEP_PIN EXP2_10_PIN
- #define E4_DIR_PIN EXP2_09_PIN
+ #define E4_STEP_PIN EXP2_01_PIN
+ #define E4_DIR_PIN EXP2_02_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E4_ENABLE_PIN EXP1_04_PIN
- #define E4_DIAG_PIN EXP1_10_PIN
- #define E4_CS_PIN EXP1_09_PIN
+ #define E4_ENABLE_PIN EXP1_07_PIN
+ #define E4_DIAG_PIN EXP1_01_PIN
+ #define E4_CS_PIN EXP1_02_PIN
#if HAS_TMC_UART
- #define E4_SERIAL_TX_PIN EXP1_09_PIN
+ #define E4_SERIAL_TX_PIN EXP1_02_PIN
#define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN
#endif
#else
- #define E4_ENABLE_PIN EXP2_04_PIN
+ #define E4_ENABLE_PIN EXP2_07_PIN
#endif
#endif // BTT_MOTOR_EXPANSION
diff --git a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
index 1cda5db6694..59b5068eeb8 100644
--- a/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
+++ b/Marlin/src/pins/lpc1768/pins_EMOTRONIC.h
@@ -91,27 +91,25 @@
//
// Extension ports
//
-// warning: pins are backward numbered w.r.t. to the
-// schematics, e.g. EXP1_01 / EXP1_02 are X1-10 / X1-9.
-#define EXP1_01_PIN P0_28 // SCL0
-#define EXP1_02_PIN P0_27 // SDA0
-#define EXP1_03_PIN P0_16 // SSEL0
-#define EXP1_04_PIN P0_15 // SCK0
-#define EXP1_05_PIN P0_18 // MOSI0
-#define EXP1_06_PIN P0_17 // MISO0
-#define EXP1_07_PIN P1_31
-#define EXP1_08_PIN P1_30
-#define EXP1_09_PIN P0_02 // TX0
-#define EXP1_10_PIN P0_03 // RX0
+#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 EXP2_03_PIN P1_27
-#define EXP2_04_PIN P1_26
-#define EXP2_05_PIN P1_29
-#define EXP2_06_PIN P1_28
-#define EXP2_07_PIN P0_01 // SCL1
-#define EXP2_08_PIN P0_00 // SDA1
-#define EXP2_09_PIN P0_11
-#define EXP2_10_PIN P0_10
+#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
//
// SD Support
@@ -126,11 +124,11 @@
#define SD_MOSI_PIN P0_09
#define SD_SS_PIN P0_06
#elif SD_CONNECTION_IS(LCD)
- #define SD_SCK_PIN EXP1_04_PIN
- #define SD_MISO_PIN EXP1_06_PIN
- #define SD_MOSI_PIN EXP1_05_PIN
- #define SD_SS_PIN EXP1_03_PIN
- #define SD_DETECT_PIN EXP1_07_PIN
+ #define SD_SCK_PIN EXP1_07_PIN
+ #define SD_MISO_PIN EXP1_05_PIN
+ #define SD_MOSI_PIN EXP1_06_PIN
+ #define SD_SS_PIN EXP1_08_PIN
+ #define SD_DETECT_PIN EXP1_04_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
@@ -139,13 +137,13 @@
// LCD / Controller
//
#if ENABLED(EMOTION_TECH_LCD)
- #define BEEPER_PIN EXP2_10_PIN
- #define DOGLCD_A0 EXP2_05_PIN
- #define DOGLCD_CS EXP2_07_PIN
- #define DOGLCD_SCK EXP1_04_PIN
- #define DOGLCD_MOSI EXP1_05_PIN
+ #define BEEPER_PIN EXP2_01_PIN
+ #define DOGLCD_A0 EXP2_06_PIN
+ #define DOGLCD_CS EXP2_04_PIN
+ #define DOGLCD_SCK EXP1_07_PIN
+ #define DOGLCD_MOSI EXP1_06_PIN
- #define BTN_EN1 EXP2_04_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP2_09_PIN
+ #define BTN_EN1 EXP2_07_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP2_02_PIN
#endif
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
index 95bbe17b9b3..2ffaef949c0 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
@@ -231,46 +231,46 @@
#define LED4_PIN P1_21
/** ------ ------
- * (BEEPER) 1.31 |10 9 | 1.30 (BTN_ENC) (MISO) 0.8 |10 9 | 0.7 (SD_SCK)
- * (LCD_EN) 0.18 | 8 7 | 0.16 (LCD_RS) (BTN_EN1) 3.25 | 8 7 | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 6 5 | 0.17 (LCD_D5) (BTN_EN2) 3.26 6 5 | 0.9 (SD_MOSI)
- * (LCD_D6) 1.0 | 4 3 | 1.22 (LCD_D7) (SD_DETECT) 0.27 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) 1.31 | 1 2 | 1.30 (BTN_ENC) (MISO) 0.8 | 1 2 | 0.7 (SD_SCK)
+ * (LCD_EN) 0.18 | 3 4 | 0.16 (LCD_RS) (BTN_EN1) 3.25 | 3 4 | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15 5 6 | 0.17 (LCD_D5) (BTN_EN2) 3.26 5 6 | 0.9 (SD_MOSI)
+ * (LCD_D6) 1.0 | 7 8 | 1.22 (LCD_D7) (SD_DETECT) 0.27 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN P1_22
-#define EXP1_04_PIN P1_00
-#define EXP1_05_PIN P0_17
-#define EXP1_06_PIN P0_15
-#define EXP1_07_PIN P0_16
-#define EXP1_08_PIN P0_18
-#define EXP1_09_PIN P1_30
-#define EXP1_10_PIN P1_31
+#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 EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN P0_27
-#define EXP2_05_PIN P0_09
-#define EXP2_06_PIN P3_26
-#define EXP2_07_PIN P0_28
-#define EXP2_08_PIN P3_25
-#define EXP2_09_PIN P0_07
-#define EXP2_10_PIN P0_08
+#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
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
- #define SD_DETECT_PIN EXP2_04_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#else
- #define SD_SS_PIN EXP2_07_PIN
+ #define SD_SS_PIN EXP2_04_PIN
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
@@ -278,30 +278,30 @@
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_A0_PIN EXP1_03_PIN
- #define TFT_DC_PIN EXP1_03_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_BACKLIGHT_PIN EXP1_08_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_A0_PIN EXP1_08_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_BACKLIGHT_PIN EXP1_03_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
#define LCD_USE_DMA_SPI
- #define TOUCH_INT_PIN EXP1_05_PIN
- #define TOUCH_CS_PIN EXP1_06_PIN
+ #define TOUCH_INT_PIN EXP1_06_PIN
+ #define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
@@ -316,8 +316,8 @@
#define TFT_QUEUE_SIZE 6144
#endif
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#elif IS_TFTGLCD_PANEL
@@ -325,74 +325,74 @@
#undef BTN_ENC
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#else
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_SDSS EXP2_07_PIN
+ #define LCD_SDSS EXP2_04_PIN
#if ENABLED(MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC EXP1_05_PIN
- #define DOGLCD_CS EXP1_07_PIN
+ #define LCD_PINS_DC EXP1_06_PIN
+ #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_A0 LCD_PINS_DC
- #define DOGLCD_SCK EXP1_06_PIN
- #define DOGLCD_MOSI EXP1_08_PIN
+ #define DOGLCD_SCK EXP1_05_PIN
+ #define DOGLCD_MOSI EXP1_03_PIN
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#define KILL_PIN -1 // NC
#else // !MKS_12864OLED_SSD1306
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
#endif
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
diff --git a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
index 090a2e40517..d8dae61d94b 100644
--- a/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
+++ b/Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
@@ -186,22 +186,22 @@
/**
* ------
- * (BEEPER) P2_08 |10 9 | P0_16 (BTN_ENC)
- * (BTN_EN1) P0_19 | 8 7 | RESET
- * (BTN_EN2) P0_20 6 5 | P0_15 (LCD_D4)
- * (LCD_RS) P0_17 | 4 3 | P0_18 (LCD_EN)
- * GND | 2 1 | 5V
+ * (BEEPER) P2_08 | 1 2 | P0_16 (BTN_ENC)
+ * (BTN_EN1) P0_19 | 3 4 | RESET
+ * (BTN_EN2) P0_20 5 6 | P0_15 (LCD_D4)
+ * (LCD_RS) P0_17 | 7 8 | P0_18 (LCD_EN)
+ * GND | 9 10 | 5V
* ------
* EXP
*/
-#define EXP1_03_PIN P0_18
-#define EXP1_04_PIN P0_17
-#define EXP1_05_PIN P0_15
-#define EXP1_06_PIN P0_20
-#define EXP1_07_PIN -1
-#define EXP1_08_PIN P0_19
-#define EXP1_09_PIN P0_16
-#define EXP1_10_PIN P2_08
+#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
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
@@ -211,32 +211,32 @@
/**
* Ender 3 V2 display SKR E3 Turbo (EXP1) Ender 3 V2 display --> SKR E3 Turbo
* ------ ------ RX 8 --> 5 P0_15
- * -- |10 9 | -- (BEEPER) P2_08 |10 9 | P0_16 (BTN_ENC) TX 7 --> 9 P0_16
- * (SKR_TX1) RX | 8 7 | TX (SKR_RX1) (BTN_EN1) P0_19 | 8 7 | RESET BEEPER 5 --> 10 P2_08
- * (BTN_ENC) ENT 6 5 | BEEPER (BTN_EN2) P0_20 6 5 | P0_15 (LCD_D4)
- * (BTN_E2) B | 4 3 | A (BTN_E1) (LCD_RS) P0_17 | 4 3 | P0_18 (LCD_EN)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * -- | 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
* ------ ------
*/
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_EN1 EXP1_03_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_EN1 EXP1_08_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_05_PIN
#elif HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY)
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
@@ -244,24 +244,24 @@
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
#endif
- #define LCD_PINS_RS EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_09_PIN
- #define LCD_PINS_D4 EXP1_04_PIN
- #define LCD_PINS_D5 EXP1_06_PIN
- #define LCD_PINS_D6 EXP1_08_PIN
- #define LCD_PINS_D7 EXP1_10_PIN
+ #define LCD_PINS_RS EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_02_PIN
+ #define LCD_PINS_D4 EXP1_07_PIN
+ #define LCD_PINS_D5 EXP1_05_PIN
+ #define LCD_PINS_D6 EXP1_03_PIN
+ #define LCD_PINS_D7 EXP1_01_PIN
#define ADC_KEYPAD_PIN P1_23 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_10_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_01_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1
diff --git a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
index 4cff5d59e17..d137bdae91d 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -270,87 +270,87 @@
#endif
/** ------ ------
- * (BEEPER) 1.31 |10 9 | 1.30 (BTN_ENC) (MISO) 0.8 |10 9 | 0.7 (SD_SCK)
- * (LCD_EN) 0.18 | 8 7 | 0.16 (LCD_RS) (BTN_EN1) 3.25 | 8 7 | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 6 5 | 0.17 (LCD_D5) (BTN_EN2) 3.26 6 5 | 0.9 (SD_MOSI)
- * (LCD_D6) 1.0 | 4 3 | 1.22 (LCD_D7) (SD_DETECT) 0.27 | 4 3 | RST
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) 1.31 | 1 2 | 1.30 (BTN_ENC) (MISO) 0.8 | 1 2 | 0.7 (SD_SCK)
+ * (LCD_EN) 0.18 | 3 4 | 0.16 (LCD_RS) (BTN_EN1) 3.25 | 3 4 | 0.28 (SD_CS2)
+ * (LCD_D4) 0.15 5 6 | 0.17 (LCD_D5) (BTN_EN2) 3.26 5 6 | 0.9 (SD_MOSI)
+ * (LCD_D6) 1.0 | 7 8 | 1.22 (LCD_D7) (SD_DETECT) 0.27 | 7 8 | RST
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN P1_22
-#define EXP1_04_PIN P1_00
-#define EXP1_05_PIN P0_17
-#define EXP1_06_PIN P0_15
-#define EXP1_07_PIN P0_16
-#define EXP1_08_PIN P0_18
-#define EXP1_09_PIN P1_30
-#define EXP1_10_PIN P1_31
+#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 EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN P0_27
-#define EXP2_05_PIN P0_09
-#define EXP2_06_PIN P3_26
-#define EXP2_07_PIN P0_28
-#define EXP2_08_PIN P3_25
-#define EXP2_09_PIN P0_07
-#define EXP2_10_PIN P0_08
+#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
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#else
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_SDSS EXP2_07_PIN
+ #define LCD_SDSS EXP2_04_PIN
#if ENABLED(MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC EXP1_05_PIN
- #define DOGLCD_CS EXP1_07_PIN
+ #define LCD_PINS_DC EXP1_06_PIN
+ #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_A0 LCD_PINS_DC
- #define DOGLCD_SCK EXP1_06_PIN
- #define DOGLCD_MOSI EXP1_08_PIN
+ #define DOGLCD_SCK EXP1_05_PIN
+ #define DOGLCD_MOSI EXP1_03_PIN
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#define KILL_PIN -1 // NC
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_DC_PIN EXP1_03_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_BACKLIGHT_PIN EXP1_08_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_BACKLIGHT_PIN EXP1_03_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
#define LCD_USE_DMA_SPI
- #define TOUCH_INT_PIN EXP1_05_PIN
- #define TOUCH_CS_PIN EXP1_06_PIN
+ #define TOUCH_INT_PIN EXP1_06_PIN
+ #define TOUCH_CS_PIN EXP1_05_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
@@ -367,50 +367,50 @@
#else // !MKS_12864OLED_SSD1306
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
#endif
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -431,15 +431,15 @@
#endif
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
- #define SD_DETECT_PIN EXP2_04_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#else
- #define SD_SS_PIN EXP2_07_PIN
+ #define SD_SS_PIN EXP2_04_PIN
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
diff --git a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
index 81c7dc9403d..f6d8e408446 100644
--- a/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
+++ b/Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
@@ -157,11 +157,11 @@
/**
* ------
- * P1_31 |10 9 | P1_30
- * P3_26 | 8 7 | P2_11
- * P3_25 6 5 | P0_15
- * P0_16 | 4 3 | P0_18
- * GND | 2 1 | 5V
+ * P1_31 | 1 2 | P1_30
+ * P3_26 | 3 4 | P2_11
+ * P3_25 5 6 | P0_15
+ * P0_16 | 7 8 | P0_18
+ * GND | 9 10 | 5V
* ------
* EXP1
*
@@ -171,43 +171,43 @@
* A remote SD card is currently not supported because the pins routed to the EXP2
* connector are shared with the onboard SD card.
*/
-#define EXP1_03_PIN P0_18
-#define EXP1_04_PIN P0_16
-#define EXP1_05_PIN P0_15
-#define EXP1_06_PIN P3_25
-#define EXP1_07_PIN P2_11
-#define EXP1_08_PIN P3_26
-#define EXP1_09_PIN P1_30
-#define EXP1_10_PIN P1_31
+#define EXP1_08_PIN P0_18
+#define EXP1_07_PIN P0_16
+#define EXP1_06_PIN P0_15
+#define EXP1_05_PIN P3_25
+#define EXP1_04_PIN P2_11
+#define EXP1_03_PIN P3_26
+#define EXP1_02_PIN P1_30
+#define EXP1_01_PIN P1_31
#if ENABLED(CR10_STOCKDISPLAY)
/** ------
- * BEEPER |10 9 | ENC
- * EN1 | 8 7 | KILL
- * EN2 6 5 | LCD_D4
- * LCD_RS | 4 3 | LCD_EN
- * GND | 2 1 | 5V
+ * BEEPER | 1 2 | ENC
+ * EN1 | 3 4 | KILL
+ * EN2 5 6 | LCD_D4
+ * LCD_RS | 7 8 | LCD_EN
+ * GND | 9 10 | 5V
* ------
*/
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
- #define KILL_PIN EXP1_07_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
+ #define KILL_PIN EXP1_04_PIN
#elif ENABLED(MKS_MINI_12864)
/** ------
- * SCK |10 9 | ENC
- * EN1 | 8 7 | --
- * EN2 6 5 | A0
- * CS | 4 3 | MOSI
- * GND | 2 1 | 5V
+ * SCK | 1 2 | ENC
+ * EN1 | 3 4 | --
+ * EN2 5 6 | A0
+ * CS | 7 8 | MOSI
+ * GND | 9 10 | 5V
* ------
*/
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_10_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_01_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#define LCD_CONTRAST_INIT 160
#define LCD_CONTRAST_MIN 120
#define LCD_CONTRAST_MAX 180
@@ -221,7 +221,7 @@
#endif
#if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
diff --git a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
index 1ba58629c15..7a8c99e3af1 100644
--- a/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
+++ b/Marlin/src/pins/ramps/pins_MKS_GEN_13.h
@@ -54,8 +54,8 @@
#include "pins_RAMPS.h"
-#undef EXP2_03_PIN
-#define EXP2_03_PIN -1 // RESET
+#undef EXP2_08_PIN
+#define EXP2_08_PIN -1 // RESET
//
// LCD / Controller
@@ -85,11 +85,11 @@
* This configuration uses the following arrangement:
*
* ------ ------
- * ENCB |10 9 | ENCA MISO |10 9 | SCK
- * BLUE_LED | 8 7 | RED_LED ENCBTN | 8 7 | SDCS
- * KILL 6 5 | BEEPER 6 5 | MOSI
- * A0 | 4 3 | LCD_CS SDCD | 4 3 |
- * GND | 2 1 | 5V GND | 2 1 | --
+ * ENCB | 1 2 | ENCA MISO | 1 2 | SCK
+ * BLUE_LED | 3 4 | RED_LED ENCBTN | 3 4 | SDCS
+ * KILL 5 6 | BEEPER 5 6 | MOSI
+ * A0 | 7 8 | LCD_CS SDCD | 7 8 |
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
@@ -107,24 +107,24 @@
//
// VIKI2 12-wire lead
//
- #define SD_DETECT_PIN EXP2_04_PIN // SDCD orange/white
- #define BTN_EN1 EXP1_09_PIN // ENCA white
- #define BTN_EN2 EXP1_10_PIN // ENCB green
- #define BTN_ENC EXP2_08_PIN // ENCBTN purple
- #define DOGLCD_A0 EXP1_04_PIN // A0 brown
- #define DOGLCD_CS EXP1_03_PIN // LCS green/white
+ #define SD_DETECT_PIN EXP2_07_PIN // SDCD orange/white
+ #define BTN_EN1 EXP1_02_PIN // ENCA white
+ #define BTN_EN2 EXP1_01_PIN // ENCB green
+ #define BTN_ENC EXP2_03_PIN // ENCBTN purple
+ #define DOGLCD_A0 EXP1_07_PIN // A0 brown
+ #define DOGLCD_CS EXP1_08_PIN // LCS green/white
- // EXP2_10_PIN gray MISO
- // EXP2_05_PIN yellow MOSI
- // EXP2_09_PIN orange SCK
+ // EXP2_01_PIN gray MISO
+ // EXP2_06_PIN yellow MOSI
+ // EXP2_02_PIN orange SCK
- //#define SDSS EXP2_07_PIN // SDCS blue
+ //#define SDSS EXP2_04_PIN // SDCS blue
//
// VIKI2 4-wire lead
//
- #define KILL_PIN EXP1_06_PIN // BTN blue
- #define BEEPER_PIN EXP1_05_PIN // BUZZER green
- #define STAT_LED_RED_PIN EXP1_07_PIN // RED-LED yellow
- #define STAT_LED_BLUE_PIN EXP1_08_PIN // BLUE-LED white
+ #define KILL_PIN EXP1_05_PIN // BTN blue
+ #define BEEPER_PIN EXP1_06_PIN // BUZZER green
+ #define STAT_LED_RED_PIN EXP1_04_PIN // RED-LED yellow
+ #define STAT_LED_BLUE_PIN EXP1_03_PIN // BLUE-LED white
#endif
diff --git a/Marlin/src/pins/ramps/pins_RAMPS.h b/Marlin/src/pins/ramps/pins_RAMPS.h
index 5672915b7cb..a9824fbb8d4 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS.h
@@ -513,62 +513,62 @@
* LCD adapters come in different variants. The socket keys can be
* on either side, and may be backwards on some boards / displays.
*/
-#ifndef EXP1_03_PIN
+#ifndef EXP1_08_PIN
- #define EXP1_03_PIN AUX4_13_PIN
- #define EXP1_04_PIN AUX4_14_PIN
- #define EXP1_05_PIN AUX4_15_PIN
- #define EXP1_06_PIN AUX4_16_PIN
- #define EXP1_07_PIN AUX4_18_PIN
- #define EXP1_08_PIN AUX4_17_PIN
+ #define EXP1_08_PIN AUX4_13_PIN
+ #define EXP1_07_PIN AUX4_14_PIN
+ #define EXP1_06_PIN AUX4_15_PIN
+ #define EXP1_05_PIN AUX4_16_PIN
+ #define EXP1_04_PIN AUX4_18_PIN
+ #define EXP1_03_PIN AUX4_17_PIN
- #define EXP2_04_PIN AUX3_02_PIN
- #define EXP2_05_PIN AUX3_04_PIN
- #define EXP2_07_PIN AUX3_06_PIN
- #define EXP2_09_PIN AUX3_05_PIN
- #define EXP2_10_PIN AUX3_03_PIN
+ #define EXP2_07_PIN AUX3_02_PIN
+ #define EXP2_06_PIN AUX3_04_PIN
+ #define EXP2_04_PIN AUX3_06_PIN
+ #define EXP2_02_PIN AUX3_05_PIN
+ #define EXP2_01_PIN AUX3_03_PIN
#if ENABLED(G3D_PANEL)
/** Gadgets3D Smart Adapter
* ------ ------
- * 4-11 |10 9 | 4-12 (MISO) 3-03 |10 9 | 3-05 (SCK)
- * 4-17 | 8 7 | 4-18 4-10 | 8 7 | 3-06
- * 4-16 6 5 | 4-15 4-09 6 5 | 3-04 (MOSI)
- * 4-14 | 4 3 | 4-13 3-02 | 4 3 | 4-07
- * (GND) 4-02 | 2 1 | 4-01 (5V) -- | 2 1 | --
+ * 4-11 | 1 2 | 4-12 (MISO) 3-03 | 1 2 | 3-05 (SCK)
+ * 4-17 | 3 4 | 4-18 4-10 | 3 4 | 3-06
+ * 4-16 5 6 | 4-15 4-09 5 6 | 3-04 (MOSI)
+ * 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
+ * (GND) 4-02 | 9 10 | 4-01 (5V) -- | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
- #define EXP1_09_PIN AUX4_12_PIN
- #define EXP1_10_PIN AUX4_11_PIN
+ #define EXP1_02_PIN AUX4_12_PIN
+ #define EXP1_01_PIN AUX4_11_PIN
- #define EXP2_03_PIN AUX4_07_PIN
- #define EXP2_06_PIN AUX4_09_PIN
- #define EXP2_08_PIN AUX4_10_PIN
+ #define EXP2_08_PIN AUX4_07_PIN
+ #define EXP2_05_PIN AUX4_09_PIN
+ #define EXP2_03_PIN AUX4_10_PIN
#else
/** Smart Adapter (c) RRD
* ------ ------
- * 4-09 |10 9 | 4-10 (MISO) 3-03 |10 9 | 3-05 (SCK)
- * 4-17 | 8 7 | 4-18 4-12 | 8 7 | 3-06
- * 4-16 6 5 | 4-15 4-11 6 5 | 3-04 (MOSI)
- * 4-14 | 4 3 | 4-13 3-02 | 4 3 | 4-07
- * (GND) 3-07 | 2 1 | 3-01 (5V) (GND) 3-07 | 2 1 | --
+ * 4-09 | 1 2 | 4-10 (MISO) 3-03 | 1 2 | 3-05 (SCK)
+ * 4-17 | 3 4 | 4-18 4-12 | 3 4 | 3-06
+ * 4-16 5 6 | 4-15 4-11 5 6 | 3-04 (MOSI)
+ * 4-14 | 7 8 | 4-13 3-02 | 7 8 | 4-07
+ * (GND) 3-07 | 9 10 | 3-01 (5V) (GND) 3-07 | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
- #define EXP1_09_PIN AUX4_10_PIN
- #define EXP1_10_PIN AUX4_09_PIN
+ #define EXP1_02_PIN AUX4_10_PIN
+ #define EXP1_01_PIN AUX4_09_PIN
#if BOTH(TOUCH_UI_FTDI_EVE, LCD_FYSETC_TFT81050)
- #define EXP2_03_PIN -1 // RESET
- #define EXP2_06_PIN AUX4_12_PIN
- #define EXP2_08_PIN AUX4_11_PIN
+ #define EXP2_08_PIN -1 // RESET
+ #define EXP2_05_PIN AUX4_12_PIN
+ #define EXP2_03_PIN AUX4_11_PIN
#else
- #define EXP2_03_PIN AUX4_07_PIN
- #define EXP2_06_PIN AUX4_11_PIN
- #define EXP2_08_PIN AUX4_12_PIN
+ #define EXP2_08_PIN AUX4_07_PIN
+ #define EXP2_05_PIN AUX4_11_PIN
+ #define EXP2_03_PIN AUX4_12_PIN
#endif
#endif
@@ -588,9 +588,9 @@
//
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
- #define LCD_PINS_RS EXP2_04_PIN // CS chip select /SS chip slave select
- #define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
- #define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
+ #define LCD_PINS_RS EXP2_07_PIN // CS chip select /SS chip slave select
+ #define LCD_PINS_ENABLE EXP2_06_PIN // SID (MOSI)
+ #define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
@@ -603,18 +603,18 @@
#elif ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_06_PIN
+ #define TFTGLCD_CS EXP2_05_PIN
#else
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#if !IS_NEWPANEL
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#endif
#elif ENABLED(ZONESTAR_LCD)
@@ -637,25 +637,25 @@
#else
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
- #define LCD_PINS_DC EXP1_05_PIN // Set as output on init
- #define LCD_PINS_RS EXP1_04_PIN // Pull low for 1s to init
+ #define LCD_PINS_DC EXP1_06_PIN // Set as output on init
+ #define LCD_PINS_RS EXP1_07_PIN // Pull low for 1s to init
// DOGM SPI LCD Support
#define DOGLCD_A0 LCD_PINS_DC
- #define DOGLCD_CS EXP1_07_PIN
- #define DOGLCD_MOSI EXP1_08_PIN
- #define DOGLCD_SCK EXP1_06_PIN
+ #define DOGLCD_CS EXP1_04_PIN
+ #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_SCK EXP1_05_PIN
#else
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
#endif
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if !IS_NEWPANEL
- #define BEEPER_PIN EXP2_06_PIN
+ #define BEEPER_PIN EXP2_05_PIN
#endif
#endif
@@ -666,7 +666,7 @@
//#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN AUX2_08_PIN
//#define SHIFT_OUT_PIN AUX2_06_PIN
- //#define SHIFT_EN_PIN EXP1_08_PIN
+ //#define SHIFT_EN_PIN EXP1_03_PIN
#endif
#endif
@@ -682,22 +682,22 @@
#if IS_RRD_SC
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#else
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#endif
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#ifndef KILL_PIN
- #define KILL_PIN EXP2_03_PIN
+ #define KILL_PIN EXP2_08_PIN
#endif
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
@@ -717,7 +717,7 @@
#define BTN_EN2 AUX4_06_PIN
#define BTN_ENC AUX4_03_PIN
#define LCD_SDSS SDSS
- #define KILL_PIN EXP2_03_PIN
+ #define KILL_PIN EXP2_08_PIN
#elif ENABLED(LCD_I2C_VIKI)
@@ -726,7 +726,7 @@
#define BTN_ENC -1
#define LCD_SDSS SDSS
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif EITHER(VIKI2, miniVIKI)
@@ -734,83 +734,83 @@
#define DOGLCD_A0 AUX2_07_PIN
#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
- #define BEEPER_PIN EXP2_06_PIN
+ #define BEEPER_PIN EXP2_05_PIN
#define STAT_LED_RED_PIN AUX4_03_PIN
- #define STAT_LED_BLUE_PIN EXP1_09_PIN
+ #define STAT_LED_BLUE_PIN EXP1_02_PIN
#define BTN_EN1 22
#define BTN_EN2 7
#define BTN_ENC AUX4_08_PIN
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
- #define KILL_PIN EXP2_08_PIN
+ #define KILL_PIN EXP2_03_PIN
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
- #define DOGLCD_CS EXP1_03_PIN
- #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_08_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
- #define BEEPER_PIN EXP1_06_PIN
- #define LCD_BACKLIGHT_PIN EXP2_06_PIN
+ #define BEEPER_PIN EXP1_05_PIN
+ #define LCD_BACKLIGHT_PIN EXP2_05_PIN
- #define BTN_EN1 EXP1_09_PIN
- #define BTN_EN2 EXP1_10_PIN
- #define BTN_ENC EXP2_08_PIN
+ #define BTN_EN1 EXP1_02_PIN
+ #define BTN_EN2 EXP1_01_PIN
+ #define BTN_ENC EXP2_03_PIN
#define LCD_SDSS SDSS
- #define SD_DETECT_PIN EXP2_04_PIN
- #define KILL_PIN EXP2_03_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define KILL_PIN EXP2_08_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#ifndef KILL_PIN
- #define KILL_PIN EXP2_03_PIN
+ #define KILL_PIN EXP2_08_PIN
#endif
#if ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
// not connected to a pin
#define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#elif ENABLED(FYSETC_MINI_12864)
// From https://wiki.fysetc.com/Mini12864_Panel/
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
//#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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif
@@ -840,31 +840,31 @@
#elif ENABLED(G3D_PANEL)
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
- #define KILL_PIN EXP2_03_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define KILL_PIN EXP2_08_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
+ #define BTN_ENC EXP1_02_PIN
#elif IS_TFTGLCD_PANEL
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#else
- #define BEEPER_PIN EXP2_06_PIN
+ #define BEEPER_PIN EXP2_05_PIN
#if ENABLED(PANEL_ONE) // Buttons connect directly to AUX-2
#define BTN_EN1 AUX2_03_PIN
#define BTN_EN2 AUX2_04_PIN
#define BTN_ENC AUX3_02_PIN
#else
- #define BTN_EN1 EXP1_10_PIN
- #define BTN_EN2 EXP1_09_PIN
- #define BTN_ENC EXP2_08_PIN
+ #define BTN_EN1 EXP1_01_PIN
+ #define BTN_EN2 EXP1_02_PIN
+ #define BTN_ENC EXP2_03_PIN
#endif
#endif
@@ -898,11 +898,11 @@
*
* Board Display
* ------ ------
- * (MISO) 50 |10 9 | 52 (SCK) 5V |10 9 | GND
- * (BTN_EN2) 33 | 8 7 | 53 (SD_CS) RESET | 8 7 | (SD_DET)
- * (BTN_EN1) 31 6 5 | 51 (MOSI) (MOSI) 6 5 | (LCD_CS)
- * (SD_DET) 49 | 4 3 | RESET (SD_CS) | 4 3 | (MOD_RESET)
- * GND | 2 1 | -- (SCK) | 2 1 | (MISO)
+ * (MISO) 50 | 1 2 | 52 (SCK) 5V | 1 2 | GND
+ * (BTN_EN2) 33 | 3 4 | 53 (SD_CS) RESET | 3 4 | (SD_DET)
+ * (BTN_EN1) 31 5 6 | 51 (MOSI) (MOSI) 5 6 | (LCD_CS)
+ * (SD_DET) 49 | 7 8 | RESET (SD_CS) | 7 8 | (MOD_RESET)
+ * GND | 9 10 | -- (SCK) | 9 10 | (MISO)
* ------ ------
* EXP2
*
@@ -925,11 +925,11 @@
* To fix, insert a 1N4148 diode in the MISO line.
*/
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
- #define CLCD_MOD_RESET EXP2_06_PIN
- #define CLCD_SPI_CS EXP2_08_PIN
+ #define CLCD_MOD_RESET EXP2_05_PIN
+ #define CLCD_SPI_CS EXP2_03_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050
diff --git a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
index 0c554c353fa..f4e811b8e6f 100644
--- a/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
+++ b/Marlin/src/pins/ramps/pins_RAMPS_PLUS.h
@@ -65,30 +65,30 @@
/** 3DYMY Expansion Headers
* ------ ------
- * 37 |10 9 | 35 (MISO) 50 |10 9 | 52 (SCK)
- * 31 | 8 7 | 41 29 | 8 7 | 53
- * 33 6 5 | 23 25 6 5 | 51 (MOSI)
- * 42 | 4 3 | 44 49 | 4 3 | 27
- * GND | 2 1 | 5V GND | 2 1 | --
+ * 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK)
+ * 31 | 3 4 | 41 29 | 3 4 | 53
+ * 33 5 6 | 23 25 5 6 | 51 (MOSI)
+ * 42 | 7 8 | 44 49 | 7 8 | 27
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN 44
-#define EXP1_04_PIN 42
-#define EXP1_05_PIN 23
-#define EXP1_06_PIN 33
-#define EXP1_07_PIN 41
-#define EXP1_08_PIN 31
-#define EXP1_09_PIN 35
-#define EXP1_10_PIN 37
+#define EXP1_08_PIN 44
+#define EXP1_07_PIN 42
+#define EXP1_06_PIN 23
+#define EXP1_05_PIN 33
+#define EXP1_04_PIN 41
+#define EXP1_03_PIN 31
+#define EXP1_02_PIN 35
+#define EXP1_01_PIN 37
-#define EXP2_03_PIN 27
-#define EXP2_04_PIN 49
-#define EXP2_05_PIN 51
-#define EXP2_06_PIN 25
-#define EXP2_07_PIN 53
-#define EXP2_08_PIN 29
-#define EXP2_09_PIN 52
-#define EXP2_10_PIN 50
+#define EXP2_08_PIN 27
+#define EXP2_07_PIN 49
+#define EXP2_06_PIN 51
+#define EXP2_05_PIN 25
+#define EXP2_04_PIN 53
+#define EXP2_03_PIN 29
+#define EXP2_02_PIN 52
+#define EXP2_01_PIN 50
#include "pins_RAMPS.h"
diff --git a/Marlin/src/pins/ramps/pins_ZRIB_V53.h b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
index 48808d9601c..38b8e09b038 100644
--- a/Marlin/src/pins/ramps/pins_ZRIB_V53.h
+++ b/Marlin/src/pins/ramps/pins_ZRIB_V53.h
@@ -299,33 +299,33 @@
* LCD adapter. NOTE: These come in two variants. The socket keys can be
* on either side, and may be backwards on some displays.
* ------ ------
- * D37 |10 9 | D35 (MISO) D50 |10 9 | D52 (SCK)
- * D17 | 8 7 | D16 D31 | 8 7 | D53
+ * D37 | 1 2 | D35 (MISO) D50 | 1 2 | D52 (SCK)
+ * D17 | 3 4 | D16 D31 | 3 4 | D53
* D23 6 5 D25 D33 6 5 D51 (MOSI)
- * D27 | 4 3 | D29 D49 | 4 3 | D41
- * GND | 2 1 | 5V GND | 2 1 | --
+ * D27 | 7 8 | D29 D49 | 7 8 | D41
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#ifndef EXP1_03_PIN
- #define EXP1_03_PIN 29
- #define EXP1_04_PIN 27
- #define EXP1_05_PIN 25
- #define EXP1_06_PIN 23
- #define EXP1_07_PIN 16
- #define EXP1_08_PIN 17
- #define EXP1_09_PIN 35
- #define EXP1_10_PIN 37
+#ifndef EXP1_08_PIN
+ #define EXP1_08_PIN 29
+ #define EXP1_07_PIN 27
+ #define EXP1_06_PIN 25
+ #define EXP1_05_PIN 23
+ #define EXP1_04_PIN 16
+ #define EXP1_03_PIN 17
+ #define EXP1_02_PIN 35
+ #define EXP1_01_PIN 37
- #define EXP2_03_PIN 41
- #define EXP2_04_PIN 49
- #define EXP2_05_PIN XS6_05_PIN
- #define EXP2_06_PIN 33
- #define EXP2_07_PIN 53
- #define EXP2_08_PIN 31
- #define EXP2_09_PIN XS6_03_PIN
- #define EXP2_10_PIN XS6_07_PIN
+ #define EXP2_08_PIN 41
+ #define EXP2_07_PIN 49
+ #define EXP2_06_PIN XS6_05_PIN
+ #define EXP2_05_PIN 33
+ #define EXP2_04_PIN 53
+ #define EXP2_03_PIN 31
+ #define EXP2_02_PIN XS6_03_PIN
+ #define EXP2_01_PIN XS6_07_PIN
#endif
//////////////////////////
@@ -386,14 +386,14 @@
#if ENABLED(ZONESTAR_LCD)
#define LCDSCREEN_NAME "LCD2004 ADCKEY"
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#define ADC_KEYPAD_PIN 10 // A10 for ADCKEY
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#endif
/**
diff --git a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
index 4cb0f60328c..e734a08943a 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_FD_V1.h
@@ -135,31 +135,31 @@
#define LED_PIN 13
/** ------ ------
- * 37 |10 9 | 35 (MISO) 50 |10 9 | 76 (SCK)
- * 29 | 8 7 | 27 (EN2) 31 | 8 7 | 4 (SD_SS)
- * 25 6 5 | 23 (EN1) 33 6 5 | 75 (MOSI)
- * 16 | 4 3 | 17 (SDD) 49 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * 37 | 1 2 | 35 (MISO) 50 | 1 2 | 76 (SCK)
+ * 29 | 3 4 | 27 (EN2) 31 | 3 4 | 4 (SD_SS)
+ * 25 5 6 | 23 (EN1) 33 5 6 | 75 (MOSI)
+ * 16 | 7 8 | 17 (SDD) 49 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN 17
-#define EXP1_04_PIN 16
-#define EXP1_05_PIN 23
-#define EXP1_06_PIN 25
-#define EXP1_07_PIN 27
-#define EXP1_08_PIN 29
-#define EXP1_09_PIN 35
-#define EXP1_10_PIN 37
+#define EXP1_08_PIN 17
+#define EXP1_07_PIN 16
+#define EXP1_06_PIN 23
+#define EXP1_05_PIN 25
+#define EXP1_04_PIN 27
+#define EXP1_03_PIN 29
+#define EXP1_02_PIN 35
+#define EXP1_01_PIN 37
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN 49
-#define EXP2_05_PIN 75
-#define EXP2_06_PIN 33
-#define EXP2_07_PIN 4
-#define EXP2_08_PIN 31
-#define EXP2_09_PIN 76
-#define EXP2_10_PIN 74
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN 49
+#define EXP2_06_PIN 75
+#define EXP2_05_PIN 33
+#define EXP2_04_PIN 4
+#define EXP2_03_PIN 31
+#define EXP2_02_PIN 76
+#define EXP2_01_PIN 74
//
// LCD / Controller
@@ -167,65 +167,65 @@
#if HAS_WIRED_LCD
// ramps-fd lcd adaptor
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
- #define BTN_ENC EXP1_09_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#if IS_NEWPANEL
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
#endif
#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS LCD_PINS_ENABLE
#define DOGLCD_A0 LCD_PINS_RS
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
//#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_05_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_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_06_PIN
+ #define RGB_LED_R_PIN EXP1_05_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_07_PIN
+ #define RGB_LED_G_PIN EXP1_04_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_08_PIN
+ #define RGB_LED_B_PIN EXP1_03_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_06_PIN
+ #define NEOPIXEL_PIN EXP1_05_PIN
#endif
#elif IS_NEWPANEL
- #define LCD_PINS_D4 EXP1_05_PIN
- #define LCD_PINS_D5 EXP1_06_PIN
- #define LCD_PINS_D6 EXP1_07_PIN
- #define LCD_PINS_D7 EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D5 EXP1_05_PIN
+ #define LCD_PINS_D6 EXP1_04_PIN
+ #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(MINIPANEL)
- #define DOGLCD_CS EXP1_06_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_05_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
#endif
#endif
#if EITHER(VIKI2, miniVIKI)
- #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
#define KILL_PIN 51
- #define STAT_LED_BLUE_PIN EXP1_08_PIN
- #define STAT_LED_RED_PIN EXP1_05_PIN
- #define DOGLCD_CS EXP1_03_PIN
- #define DOGLCD_SCK EXP2_09_PIN // SCK_PIN - Required for DUE Hardware SPI
- #define DOGLCD_MOSI EXP2_05_PIN // MOSI_PIN
- #define DOGLCD_MISO EXP2_10_PIN // MISO_PIN
+ #define STAT_LED_BLUE_PIN EXP1_03_PIN
+ #define STAT_LED_RED_PIN EXP1_06_PIN
+ #define DOGLCD_CS EXP1_08_PIN
+ #define DOGLCD_SCK EXP2_02_PIN // SCK_PIN - Required for DUE Hardware SPI
+ #define DOGLCD_MOSI EXP2_06_PIN // MOSI_PIN
+ #define DOGLCD_MISO EXP2_01_PIN // MISO_PIN
#endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RAMPS_SMART.h b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
index 2b8942c6ad2..47bc8bbaa6c 100644
--- a/Marlin/src/pins/sam/pins_RAMPS_SMART.h
+++ b/Marlin/src/pins/sam/pins_RAMPS_SMART.h
@@ -110,31 +110,31 @@
#else
/** ------ ------
- * 37 |10 9 | 35 (MISO) 50 |10 9 | 52 (SCK)
- * 31 | 8 7 | 41 29 | 8 7 | 53
- * 33 6 5 | 23 25 6 5 | 51 (MOSI)
- * 42 | 4 3 | 44 49 | 4 3 | 27
- * GND | 2 1 | 5V GND | 2 1 | --
+ * 37 | 1 2 | 35 (MISO) 50 | 1 2 | 52 (SCK)
+ * 31 | 3 4 | 41 29 | 3 4 | 53
+ * 33 5 6 | 23 25 5 6 | 51 (MOSI)
+ * 42 | 7 8 | 44 49 | 7 8 | 27
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
- #define EXP1_03_PIN 44
- #define EXP1_04_PIN 42
- #define EXP1_05_PIN 23
- #define EXP1_06_PIN 33
- #define EXP1_07_PIN 41
- #define EXP1_08_PIN 31
- #define EXP1_09_PIN 35
- #define EXP1_10_PIN 37
+ #define EXP1_08_PIN 44
+ #define EXP1_07_PIN 42
+ #define EXP1_06_PIN 23
+ #define EXP1_05_PIN 33
+ #define EXP1_04_PIN 41
+ #define EXP1_03_PIN 31
+ #define EXP1_02_PIN 35
+ #define EXP1_01_PIN 37
- #define EXP2_03_PIN 27
- #define EXP2_04_PIN 49
- #define EXP2_05_PIN 51
- #define EXP2_06_PIN 25
- #define EXP2_07_PIN 53
- #define EXP2_08_PIN 29
- #define EXP2_09_PIN 52
- #define EXP2_10_PIN 50
+ #define EXP2_08_PIN 27
+ #define EXP2_07_PIN 49
+ #define EXP2_06_PIN 51
+ #define EXP2_05_PIN 25
+ #define EXP2_04_PIN 53
+ #define EXP2_03_PIN 29
+ #define EXP2_02_PIN 52
+ #define EXP2_01_PIN 50
#endif
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
index 064ce2751ab..4f990a0aed4 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_11.h
@@ -146,7 +146,7 @@
// SPI for MAX Thermocouple
/*
#if DISABLED(SDSUPPORT)
- #define TEMP_0_CS_PIN EXP1_03_PIN
+ #define TEMP_0_CS_PIN EXP1_08_PIN
#else
#define TEMP_0_CS_PIN 49
#endif
@@ -185,31 +185,31 @@
/**
* ------ ------
- * (BEEPER) 62 |10 9 | 40 (BTN_ENC) (MISO) 74 |10 9 | 76 (SCK)
- * (LCD_EN) 64 | 8 7 | 63 (LCD_RS) (BTN_EN1) 44 | 8 7 | 10 (SD_SS)
- * (LCD_D4) 48 | 6 5 50 (LCD_D5) (BTN_EN2) 42 | 6 5 75 (MOSI)
- * (LCD_D6) 52 | 4 3 | 53 (LCD_D7) (SD_DETECT) 51 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) 62 | 1 2 | 40 (BTN_ENC) (MISO) 74 | 1 2 | 76 (SCK)
+ * (LCD_EN) 64 | 3 4 | 63 (LCD_RS) (BTN_EN1) 44 | 3 4 | 10 (SD_SS)
+ * (LCD_D4) 48 | 5 6 50 (LCD_D5) (BTN_EN2) 42 | 5 6 75 (MOSI)
+ * (LCD_D6) 52 | 7 8 | 53 (LCD_D7) (SD_DETECT) 51 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN 53
-#define EXP1_04_PIN 52
-#define EXP1_05_PIN 50
-#define EXP1_06_PIN 48
-#define EXP1_07_PIN 63
-#define EXP1_08_PIN 64
-#define EXP1_09_PIN 40
-#define EXP1_10_PIN 62
+#define EXP1_08_PIN 53
+#define EXP1_07_PIN 52
+#define EXP1_06_PIN 50
+#define EXP1_05_PIN 48
+#define EXP1_04_PIN 63
+#define EXP1_03_PIN 64
+#define EXP1_02_PIN 40
+#define EXP1_01_PIN 62
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN 51
-#define EXP2_05_PIN 75 // MOSI
-#define EXP2_06_PIN 42
-#define EXP2_07_PIN 10
-#define EXP2_08_PIN 44
-#define EXP2_09_PIN 76 // SCK
-#define EXP2_10_PIN 74 // MISO
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN 51
+#define EXP2_06_PIN 75 // MOSI
+#define EXP2_05_PIN 42
+#define EXP2_04_PIN 10
+#define EXP2_03_PIN 44
+#define EXP2_02_PIN 76 // SCK
+#define EXP2_01_PIN 74 // MISO
//
// LCD / Controller
@@ -217,53 +217,53 @@
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#if EITHER(RADDS_DISPLAY, IS_RRD_SC)
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
-
- #elif IS_RRD_FG_SC
-
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
+ #elif IS_RRD_FG_SC
+
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+
#elif HAS_U8GLIB_I2C_OLED
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_SDSS EXP2_07_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_SDSS EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif ENABLED(FYSETC_MINI_12864)
- #define BEEPER_PIN EXP1_10_PIN
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN // D5
+ #define RGB_LED_R_PIN EXP1_06_PIN // D5
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN // D6
+ #define RGB_LED_G_PIN EXP1_07_PIN // D6
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN // D7
+ #define RGB_LED_B_PIN EXP1_08_PIN // D7
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN // D5
+ #define NEOPIXEL_PIN EXP1_06_PIN // D5
#endif
#elif ENABLED(SPARK_FULL_GRAPHICS)
@@ -280,9 +280,9 @@
#endif // SPARK_FULL_GRAPHICS
#if IS_NEWPANEL
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
index cc919d0a4fd..37e7f209766 100644
--- a/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
+++ b/Marlin/src/pins/sam/pins_RURAMPS4D_13.h
@@ -175,31 +175,31 @@
/**
* ------ ------
- * (BEEPER) 62 |10 9 | 40 (BTN_ENC) (MISO) 74 |10 9 | 76 (SCK)
- * (LCD_EN) 64 | 8 7 | 63 (LCD_RS) (BTN_EN1) 44 | 8 7 | 10 (SD_SS)
- * (LCD_D4) 48 | 6 5 50 (LCD_D5) (BTN_EN2) 42 | 6 5 75 (MOSI)
- * (LCD_D6) 52 | 4 3 | 53 (LCD_D7) (SD_DETECT) 51 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) 62 | 1 2 | 40 (BTN_ENC) (MISO) 74 | 1 2 | 76 (SCK)
+ * (LCD_EN) 64 | 3 4 | 63 (LCD_RS) (BTN_EN1) 44 | 3 4 | 10 (SD_SS)
+ * (LCD_D4) 48 | 5 6 50 (LCD_D5) (BTN_EN2) 42 | 5 6 75 (MOSI)
+ * (LCD_D6) 52 | 7 8 | 53 (LCD_D7) (SD_DETECT) 51 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN 53
-#define EXP1_04_PIN 52
-#define EXP1_05_PIN 50
-#define EXP1_06_PIN 48
-#define EXP1_07_PIN 63
-#define EXP1_08_PIN 64
-#define EXP1_09_PIN 40
-#define EXP1_10_PIN 62
+#define EXP1_08_PIN 53
+#define EXP1_07_PIN 52
+#define EXP1_06_PIN 50
+#define EXP1_05_PIN 48
+#define EXP1_04_PIN 63
+#define EXP1_03_PIN 64
+#define EXP1_02_PIN 40
+#define EXP1_01_PIN 62
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN 51
-#define EXP2_05_PIN 75 // MOSI
-#define EXP2_06_PIN 42
-#define EXP2_07_PIN 10
-#define EXP2_08_PIN 44
-#define EXP2_09_PIN 76 // SCK
-#define EXP2_10_PIN 74 // MISO
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN 51
+#define EXP2_06_PIN 75 // MOSI
+#define EXP2_05_PIN 42
+#define EXP2_04_PIN 10
+#define EXP2_03_PIN 44
+#define EXP2_02_PIN 76 // SCK
+#define EXP2_01_PIN 74 // MISO
//
// LCD / Controller
@@ -207,67 +207,67 @@
#if HAS_WIRED_LCD
#if ANY(RADDS_DISPLAY, IS_RRD_SC, IS_RRD_FG_SC)
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#if EITHER(RADDS_DISPLAY, IS_RRD_SC)
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
-
- #elif IS_RRD_FG_SC
-
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
+ #elif IS_RRD_FG_SC
+
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+
#elif HAS_U8GLIB_I2C_OLED
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_SDSS EXP2_07_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_SDSS EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif ENABLED(FYSETC_MINI_12864)
- #define BEEPER_PIN EXP1_10_PIN
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#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_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN // D5
+ #define RGB_LED_R_PIN EXP1_06_PIN // D5
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN // D6
+ #define RGB_LED_G_PIN EXP1_07_PIN // D6
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN // D7
+ #define RGB_LED_B_PIN EXP1_08_PIN // D7
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN // D5
+ #define NEOPIXEL_PIN EXP1_06_PIN // D5
#endif
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#if IS_NEWPANEL
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
index 264b2e80c6b..a9199ba84c1 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_LITE_V1_0.h
@@ -166,33 +166,33 @@
* BTN_ENCODER 40 KILL_PIN 49
*/
-#define EXP1_03_PIN 39
-#define EXP1_04_PIN 38
-#define EXP1_05_PIN 37
-#define EXP1_06_PIN 36
-#define EXP1_07_PIN 34
-#define EXP1_08_PIN 35
-#define EXP1_09_PIN 40
-#define EXP1_10_PIN 41
+#define EXP1_08_PIN 39
+#define EXP1_07_PIN 38
+#define EXP1_06_PIN 37
+#define EXP1_05_PIN 36
+#define EXP1_04_PIN 34
+#define EXP1_03_PIN 35
+#define EXP1_02_PIN 40
+#define EXP1_01_PIN 41
-#define EXP2_01_PIN 49
-#define EXP2_04_PIN 44
-#define EXP2_05_PIN 51
-#define EXP2_06_PIN 42
-#define EXP2_07_PIN 53
-#define EXP2_08_PIN 43
-#define EXP2_09_PIN 52
-#define EXP2_10_PIN 50
+#define EXP2_10_PIN 49
+#define EXP2_07_PIN 44
+#define EXP2_06_PIN 51
+#define EXP2_05_PIN 42
+#define EXP2_04_PIN 53
+#define EXP2_03_PIN 43
+#define EXP2_02_PIN 52
+#define EXP2_01_PIN 50
#if ENABLED(CR10_STOCKDISPLAY)
- #define EXP3_03_PIN EXP1_03_PIN
- #define EXP3_04_PIN EXP1_04_PIN
- #define EXP3_05_PIN EXP1_05_PIN
- #define EXP3_06_PIN EXP1_06_PIN
- #define EXP3_07_PIN EXP1_07_PIN
- #define EXP3_08_PIN EXP1_08_PIN
- #define EXP3_09_PIN EXP1_09_PIN
- #define EXP3_10_PIN EXP1_10_PIN
+ #define EXP3_03_PIN EXP1_08_PIN
+ #define EXP3_04_PIN EXP1_07_PIN
+ #define EXP3_05_PIN EXP1_06_PIN
+ #define EXP3_06_PIN EXP1_05_PIN
+ #define EXP3_07_PIN EXP1_04_PIN
+ #define EXP3_08_PIN EXP1_03_PIN
+ #define EXP3_09_PIN EXP1_02_PIN
+ #define EXP3_10_PIN EXP1_01_PIN
#endif
/************************************/
@@ -222,30 +222,30 @@
#endif
// DWIN Encoder
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_04_PIN
#ifndef BEEPER_PIN
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#undef SPEAKER
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
// TO TEST
- //#define LCD_PINS_RS EXP2_01_PIN // CS chip select /SS chip slave select
- //#define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
- //#define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
+ //#define LCD_PINS_RS EXP2_10_PIN // CS chip select /SS chip slave select
+ //#define LCD_PINS_ENABLE EXP2_06_PIN // SID (MOSI)
+ //#define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
// TO TEST
- //#define LCD_PINS_RS EXP1_09_PIN
- //#define LCD_PINS_ENABLE EXP2_06_PIN
+ //#define LCD_PINS_RS EXP1_02_PIN
+ //#define LCD_PINS_ENABLE EXP2_05_PIN
//#define LCD_PINS_D4 57 // Mega/Due:65 - AGCM4:57
//#define LCD_PINS_D5 58 // Mega/Due:66 - AGCM4:58
- //#define LCD_PINS_D6 EXP2_04_PIN
+ //#define LCD_PINS_D6 EXP2_07_PIN
//#define LCD_PINS_D7 56 // Mega/Due:64 - AGCM4:56
#else
@@ -266,10 +266,10 @@
// TO TEST
//#define LCD_PINS_RS 56 // Mega/Due:64 - AGCM4:56
- //#define LCD_PINS_ENABLE EXP2_04_PIN
+ //#define LCD_PINS_ENABLE EXP2_07_PIN
//#define LCD_PINS_D4 55 // Mega/Due:63 - AGCM4:55
- //#define LCD_PINS_D5 EXP1_09_PIN
- //#define LCD_PINS_D6 EXP2_06_PIN
+ //#define LCD_PINS_D5 EXP1_02_PIN
+ //#define LCD_PINS_D6 EXP2_05_PIN
//#define LCD_PINS_D7 57 // Mega/Due:65 - AGCM4:57
#else
@@ -287,17 +287,17 @@
#else
// Definitions for any standard Display
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
#endif
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if !IS_NEWPANEL
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#endif
#endif
@@ -305,9 +305,9 @@
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK_PIN EXP1_04_PIN
- //#define SHIFT_LD_PIN EXP2_06_PIN
- //#define SHIFT_OUT_PIN EXP1_09_PIN
+ //#define SHIFT_CLK_PIN EXP1_07_PIN
+ //#define SHIFT_LD_PIN EXP2_05_PIN
+ //#define SHIFT_OUT_PIN EXP1_02_PIN
//#define SHIFT_EN_PIN 17
#endif
@@ -320,7 +320,7 @@
#if IS_RRD_SC
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY)
// TO TEST
@@ -329,21 +329,21 @@
#else
// Definitions for any standard Display
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
#endif
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
- #define KILL_PIN EXP2_01_PIN
+ #define KILL_PIN EXP2_10_PIN
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
- //#define LCD_BACKLIGHT_PIN EXP1_03_PIN // TO TEST
+ //#define LCD_BACKLIGHT_PIN EXP1_08_PIN // TO TEST
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -352,41 +352,41 @@
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
//#define BTN_ENC 55
- //#define SD_DETECT_PIN EXP2_06_PIN
+ //#define SD_DETECT_PIN EXP2_05_PIN
#elif ENABLED(LCD_I2C_PANELOLU2)
// TO TEST
//#define BTN_EN1 47
- //#define BTN_EN2 EXP2_08_PIN
+ //#define BTN_EN2 EXP2_03_PIN
//#define BTN_ENC 32
//#define LCD_SDSS SDSS
- //#define KILL_PIN EXP1_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#elif ENABLED(LCD_I2C_VIKI)
// TO TEST
- //#define BTN_EN1 EXP1_09_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- //#define BTN_EN2 EXP2_06_PIN
+ //#define BTN_EN1 EXP1_02_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ //#define BTN_EN2 EXP2_05_PIN
//#define BTN_ENC -1
//#define LCD_SDSS SDSS
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
#elif EITHER(VIKI2, miniVIKI)
// TO TEST
//#define DOGLCD_CS 45
- //#define DOGLCD_A0 EXP2_04_PIN
+ //#define DOGLCD_A0 EXP2_07_PIN
//#define LCD_SCREEN_ROT_180
//#define BEEPER_PIN 33
//#define STAT_LED_RED_PIN 32
- //#define STAT_LED_BLUE_PIN EXP1_08_PIN
+ //#define STAT_LED_BLUE_PIN EXP1_03_PIN
//#define BTN_EN1 22
//#define BTN_EN2 7
- //#define BTN_ENC EXP1_03_PIN
+ //#define BTN_ENC EXP1_08_PIN
//#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
//#define KILL_PIN 31
@@ -400,23 +400,23 @@
//#define BEEPER_PIN 23
//#define LCD_BACKLIGHT_PIN 33
- //#define BTN_EN1 EXP1_08_PIN
- //#define BTN_EN2 EXP1_05_PIN
+ //#define BTN_EN1 EXP1_03_PIN
+ //#define BTN_EN2 EXP1_06_PIN
//#define BTN_ENC 31
//#define LCD_SDSS SDSS
- //#define SD_DETECT_PIN EXP2_01_PIN
- //#define KILL_PIN EXP1_10_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
// TO TEST
- //#define BEEPER_PIN EXP1_05_PIN
- //#define BTN_ENC EXP1_08_PIN
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define BEEPER_PIN EXP1_06_PIN
+ //#define BTN_ENC EXP1_03_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
//#ifndef KILL_PIN
- // #define KILL_PIN EXP1_10_PIN
+ // #define KILL_PIN EXP1_01_PIN
//#endif
#if ENABLED(MKS_MINI_12864)
@@ -476,11 +476,11 @@
#elif ENABLED(MINIPANEL)
// TO TEST
- //#define BEEPER_PIN EXP2_06_PIN
+ //#define BEEPER_PIN EXP2_05_PIN
// not connected to a pin
//#define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
- //#define DOGLCD_A0 EXP2_04_PIN
+ //#define DOGLCD_A0 EXP2_07_PIN
//#define DOGLCD_CS 58 // Mega/Due:66 - AGCM4:58
// GLCD features
@@ -489,11 +489,11 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- //#define BTN_EN1 EXP1_09_PIN
+ //#define BTN_EN1 EXP1_02_PIN
//#define BTN_EN2 55 // Mega/Due:63 - AGCM4:55
//#define BTN_ENC 72 // Mega/Due:59 - AGCM4:72
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
//#define KILL_PIN 56 // Mega/Due:64 - AGCM4:56
#elif ENABLED(ZONESTAR_LCD)
@@ -513,9 +513,9 @@
// Buttons are directly attached to AUX-2
#if IS_RRW_KEYPAD
// TO TEST
- //#define SHIFT_OUT_PIN EXP1_09_PIN
- //#define SHIFT_CLK_PIN EXP2_04_PIN
- //#define SHIFT_LD_PIN EXP2_06_PIN
+ //#define SHIFT_OUT_PIN EXP1_02_PIN
+ //#define SHIFT_CLK_PIN EXP2_07_PIN
+ //#define SHIFT_LD_PIN EXP2_05_PIN
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
//#define BTN_ENC 55 // Mega/Due:63 - AGCM4:55
@@ -523,18 +523,18 @@
// TO TEST
//#define BTN_EN1 72 // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
//#define BTN_EN2 55 // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
- //#define BTN_ENC EXP2_01_PIN // AUX3 PIN 7
+ //#define BTN_ENC EXP2_10_PIN // AUX3 PIN 7
#else
// TO TEST
- //#define BTN_EN1 EXP1_05_PIN
- //#define BTN_EN2 EXP1_08_PIN
+ //#define BTN_EN1 EXP1_06_PIN
+ //#define BTN_EN2 EXP1_03_PIN
//#define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
// TO TEST
- //#define SD_DETECT_PIN EXP2_01_PIN
- //#define KILL_PIN EXP1_10_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#endif
#endif
@@ -565,7 +565,7 @@
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 95
#else
- #define SDSS EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#endif
#if HAS_TMC_UART
diff --git a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
index e90be4eda1e..991b4e1ad83 100644
--- a/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
+++ b/Marlin/src/pins/samd/pins_BRICOLEMON_V1_0.h
@@ -218,33 +218,33 @@
* BTN_ENCODER 40
*/
-#define EXP1_03_PIN 39
-#define EXP1_04_PIN 38
-#define EXP1_05_PIN 37
-#define EXP1_06_PIN 36
-#define EXP1_07_PIN 34
-#define EXP1_08_PIN 35
-#define EXP1_09_PIN 40
-#define EXP1_10_PIN 41
+#define EXP1_08_PIN 39
+#define EXP1_07_PIN 38
+#define EXP1_06_PIN 37
+#define EXP1_05_PIN 36
+#define EXP1_04_PIN 34
+#define EXP1_03_PIN 35
+#define EXP1_02_PIN 40
+#define EXP1_01_PIN 41
-#define EXP2_01_PIN 49
-#define EXP2_04_PIN 44
-#define EXP2_05_PIN 51
-#define EXP2_06_PIN 42
-#define EXP2_07_PIN 53
-#define EXP2_08_PIN 43
-#define EXP2_09_PIN 52
-#define EXP2_10_PIN 50
+#define EXP2_10_PIN 49
+#define EXP2_07_PIN 44
+#define EXP2_06_PIN 51
+#define EXP2_05_PIN 42
+#define EXP2_04_PIN 53
+#define EXP2_03_PIN 43
+#define EXP2_02_PIN 52
+#define EXP2_01_PIN 50
#if ENABLED(CR10_STOCKDISPLAY)
- #define EXP3_03_PIN EXP1_03_PIN
- #define EXP3_04_PIN EXP1_04_PIN
- #define EXP3_05_PIN EXP1_05_PIN
- #define EXP3_06_PIN EXP1_06_PIN
- #define EXP3_07_PIN EXP1_07_PIN
- #define EXP3_08_PIN EXP1_08_PIN
- #define EXP3_09_PIN EXP1_09_PIN
- #define EXP3_10_PIN EXP1_10_PIN
+ #define EXP3_03_PIN EXP1_08_PIN
+ #define EXP3_04_PIN EXP1_07_PIN
+ #define EXP3_05_PIN EXP1_06_PIN
+ #define EXP3_06_PIN EXP1_05_PIN
+ #define EXP3_07_PIN EXP1_04_PIN
+ #define EXP3_08_PIN EXP1_03_PIN
+ #define EXP3_09_PIN EXP1_02_PIN
+ #define EXP3_10_PIN EXP1_01_PIN
#endif
/************************************/
@@ -275,30 +275,30 @@
#endif
// DWIN Encoder
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_04_PIN
#ifndef BEEPER_PIN
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#undef SPEAKER
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
// TO TEST
- //#define LCD_PINS_RS EXP2_01_PIN // CS chip select /SS chip slave select
- //#define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
- //#define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
+ //#define LCD_PINS_RS EXP2_10_PIN // CS chip select /SS chip slave select
+ //#define LCD_PINS_ENABLE EXP2_06_PIN // SID (MOSI)
+ //#define LCD_PINS_D4 EXP2_02_PIN // SCK (CLK) clock
#elif BOTH(IS_NEWPANEL, PANEL_ONE)
// TO TEST
- //#define LCD_PINS_RS EXP1_09_PIN
- //#define LCD_PINS_ENABLE EXP2_06_PIN
+ //#define LCD_PINS_RS EXP1_02_PIN
+ //#define LCD_PINS_ENABLE EXP2_05_PIN
//#define LCD_PINS_D4 57 // Mega/Due:65 - AGCM4:57
//#define LCD_PINS_D5 58 // Mega/Due:66 - AGCM4:58
- //#define LCD_PINS_D6 EXP2_04_PIN
+ //#define LCD_PINS_D6 EXP2_07_PIN
//#define LCD_PINS_D7 56 // Mega/Due:64 - AGCM4:56
#else
@@ -319,10 +319,10 @@
// TO TEST
//#define LCD_PINS_RS 56 // Mega/Due:64 - AGCM4:56
- //#define LCD_PINS_ENABLE EXP2_04_PIN
+ //#define LCD_PINS_ENABLE EXP2_07_PIN
//#define LCD_PINS_D4 55 // Mega/Due:63 - AGCM4:55
- //#define LCD_PINS_D5 EXP1_09_PIN
- //#define LCD_PINS_D6 EXP2_06_PIN
+ //#define LCD_PINS_D5 EXP1_02_PIN
+ //#define LCD_PINS_D6 EXP2_05_PIN
//#define LCD_PINS_D7 57 // Mega/Due:65 - AGCM4:57
#else
@@ -339,17 +339,17 @@
#else
// Definitions for any standard Display
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
#endif
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if !IS_NEWPANEL
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#endif
#endif
@@ -357,9 +357,9 @@
#if !IS_NEWPANEL
// Buttons attached to a shift register
// Not wired yet
- //#define SHIFT_CLK_PIN EXP1_04_PIN
- //#define SHIFT_LD_PIN EXP2_06_PIN
- //#define SHIFT_OUT_PIN EXP1_09_PIN
+ //#define SHIFT_CLK_PIN EXP1_07_PIN
+ //#define SHIFT_LD_PIN EXP2_05_PIN
+ //#define SHIFT_OUT_PIN EXP1_02_PIN
//#define SHIFT_EN_PIN 17
#endif
@@ -372,29 +372,29 @@
#if IS_RRD_SC
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#if ENABLED(CR10_STOCKDISPLAY)
// TO TEST
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#else
// Definitions fpr any standard Display
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
#endif
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_ENC EXP1_02_PIN
#ifndef SD_DETECT_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
- #define KILL_PIN EXP2_01_PIN
+ #define KILL_PIN EXP2_10_PIN
#if ENABLED(BQ_LCD_SMART_CONTROLLER)
- //#define LCD_BACKLIGHT_PIN EXP1_03_PIN // TO TEST
+ //#define LCD_BACKLIGHT_PIN EXP1_08_PIN // TO TEST
#endif
#elif ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
@@ -403,41 +403,41 @@
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
//#define BTN_ENC 55
- //#define SD_DETECT_PIN EXP2_06_PIN
+ //#define SD_DETECT_PIN EXP2_05_PIN
#elif ENABLED(LCD_I2C_PANELOLU2)
// TO TEST
//#define BTN_EN1 47
- //#define BTN_EN2 EXP2_08_PIN
+ //#define BTN_EN2 EXP2_03_PIN
//#define BTN_ENC 32
//#define LCD_SDSS SDSS
- //#define KILL_PIN EXP1_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#elif ENABLED(LCD_I2C_VIKI)
// TO TEST
- //#define BTN_EN1 EXP1_09_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
- //#define BTN_EN2 EXP2_06_PIN
+ //#define BTN_EN1 EXP1_02_PIN // https://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
+ //#define BTN_EN2 EXP2_05_PIN
//#define BTN_ENC -1
//#define LCD_SDSS SDSS
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
#elif EITHER(VIKI2, miniVIKI)
// TO TEST
//#define DOGLCD_CS 45
- //#define DOGLCD_A0 EXP2_04_PIN
+ //#define DOGLCD_A0 EXP2_07_PIN
//#define LCD_SCREEN_ROT_180
//#define BEEPER_PIN 33
//#define STAT_LED_RED_PIN 32
- //#define STAT_LED_BLUE_PIN EXP1_08_PIN
+ //#define STAT_LED_BLUE_PIN EXP1_03_PIN
//#define BTN_EN1 22
//#define BTN_EN2 7
- //#define BTN_ENC EXP1_03_PIN
+ //#define BTN_ENC EXP1_08_PIN
//#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
//#define KILL_PIN 31
@@ -451,23 +451,23 @@
//#define BEEPER_PIN 23
//#define LCD_BACKLIGHT_PIN 33
- //#define BTN_EN1 EXP1_08_PIN
- //#define BTN_EN2 EXP1_05_PIN
+ //#define BTN_EN1 EXP1_03_PIN
+ //#define BTN_EN2 EXP1_06_PIN
//#define BTN_ENC 31
//#define LCD_SDSS SDSS
- //#define SD_DETECT_PIN EXP2_01_PIN
- //#define KILL_PIN EXP1_10_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
// TO TEST
- //#define BEEPER_PIN EXP1_05_PIN
- //#define BTN_ENC EXP1_08_PIN
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define BEEPER_PIN EXP1_06_PIN
+ //#define BTN_ENC EXP1_03_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
//#ifndef KILL_PIN
- // #define KILL_PIN EXP1_10_PIN
+ // #define KILL_PIN EXP1_01_PIN
//#endif
#if ENABLED(MKS_MINI_12864)
@@ -527,11 +527,11 @@
#elif ENABLED(MINIPANEL)
// TO TEST
- //#define BEEPER_PIN EXP2_06_PIN
+ //#define BEEPER_PIN EXP2_05_PIN
// not connected to a pin
//#define LCD_BACKLIGHT_PIN 57 // backlight LED on A11/D? (Mega/Due:65 - AGCM4:57)
- //#define DOGLCD_A0 EXP2_04_PIN
+ //#define DOGLCD_A0 EXP2_07_PIN
//#define DOGLCD_CS 58 // Mega/Due:66 - AGCM4:58
// GLCD features
@@ -540,11 +540,11 @@
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
- //#define BTN_EN1 EXP1_09_PIN
+ //#define BTN_EN1 EXP1_02_PIN
//#define BTN_EN2 55 // Mega/Due:63 - AGCM4:55
//#define BTN_ENC 72 // Mega/Due:59 - AGCM4:72
- //#define SD_DETECT_PIN EXP2_01_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
//#define KILL_PIN 56 // Mega/Due:64 - AGCM4:56
#elif ENABLED(ZONESTAR_LCD)
@@ -564,9 +564,9 @@
// Buttons are directly attached to AUX-2
#if IS_RRW_KEYPAD
// TO TEST
- //#define SHIFT_OUT_PIN EXP1_09_PIN
- //#define SHIFT_CLK_PIN EXP2_04_PIN
- //#define SHIFT_LD_PIN EXP2_06_PIN
+ //#define SHIFT_OUT_PIN EXP1_02_PIN
+ //#define SHIFT_CLK_PIN EXP2_07_PIN
+ //#define SHIFT_LD_PIN EXP2_05_PIN
//#define BTN_EN1 56 // Mega/Due:64 - AGCM4:56
//#define BTN_EN2 72 // Mega/Due:59 - AGCM4:72
//#define BTN_ENC 55 // Mega/Due:63 - AGCM4:55
@@ -574,18 +574,18 @@
// TO TEST
//#define BTN_EN1 72 // AUX2 PIN 3 (Mega/Due:59 - AGCM4:72)
//#define BTN_EN2 55 // AUX2 PIN 4 (Mega/Due:63 - AGCM4:55)
- //#define BTN_ENC EXP2_01_PIN // AUX3 PIN 7
+ //#define BTN_ENC EXP2_10_PIN // AUX3 PIN 7
#else
// TO TEST
- //#define BTN_EN1 EXP1_05_PIN
- //#define BTN_EN2 EXP1_08_PIN
+ //#define BTN_EN1 EXP1_06_PIN
+ //#define BTN_EN2 EXP1_03_PIN
//#define BTN_ENC 31
#endif
#if ENABLED(G3D_PANEL)
// TO TEST
- //#define SD_DETECT_PIN EXP2_01_PIN
- //#define KILL_PIN EXP1_10_PIN
+ //#define SD_DETECT_PIN EXP2_10_PIN
+ //#define KILL_PIN EXP1_01_PIN
#endif
#endif
@@ -616,7 +616,7 @@
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 95
#else
- #define SDSS EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#endif
#if HAS_TMC_UART
diff --git a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
index a450515a79f..83aa5317f93 100644
--- a/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
+++ b/Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
@@ -132,10 +132,10 @@
/**
* EXP1 Connector EXP1 as CR10 STOCKDISPLAY
* ------ ------
- * PA4 |10 9 | PC0 BEEPER_PIN |10 9 | BTN_ENC
- * PD3 | 8 7 | RESET BTN_EN1 | 8 7 | RESET
- * PD2 6 5 | PA1 BTN_EN2 6 5 | LCD_PINS_D4 (ST9720 CLK)
- * PA3 | 4 3 | PC1 (ST9720 CS) LCD_PINS_RS | 4 3 | LCD_PINS_ENABLE (ST9720 DAT)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * PA4 | 1 2 | PC0 BEEPER_PIN | 1 2 | BTN_ENC
+ * PD3 | 3 4 | RESET BTN_EN1 | 3 4 | RESET
+ * PD2 5 6 | PA1 BTN_EN2 5 6 | LCD_PINS_D4 (ST9720 CLK)
+ * PA3 | 7 8 | PC1 (ST9720 CS) LCD_PINS_RS | 7 8 | LCD_PINS_ENABLE (ST9720 DAT)
+ * GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
*/
diff --git a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
index 0a8143c3760..f61f7dc6bb8 100644
--- a/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
+++ b/Marlin/src/pins/sanguino/pins_ZMIB_V2.h
@@ -164,25 +164,25 @@
/** EXP1
* ------
- * (MOSI) D5 |10 9 | D7 (SCK)
- * (CS) D11 | 8 7 | D10 (DC/D4)
- * (EN2) D12 6 5 | D4 or D3 (EN/RS)
- * (ENC) D29 | 4 3 | D2 (EN1)
- * (GND) | 2 1 | (5V)
+ * (MOSI) D5 | 1 2 | D7 (SCK)
+ * (CS) D11 | 3 4 | D10 (DC/D4)
+ * (EN2) D12 5 6 | D4 or D3 (EN/RS)
+ * (ENC) D29 | 7 8 | D2 (EN1)
+ * (GND) | 9 10 | (5V)
* ------
*/
-#define EXP1_03_PIN 2
-#define EXP1_04_PIN 29
+#define EXP1_08_PIN 2
+#define EXP1_07_PIN 29
#ifndef IS_ZMIB_V2
- #define EXP1_05_PIN 4 // ZMIB V1
+ #define EXP1_06_PIN 4 // ZMIB V1
#else
- #define EXP1_05_PIN 3 // ZMIB V2
+ #define EXP1_06_PIN 3 // ZMIB V2
#endif
-#define EXP1_06_PIN 12
-#define EXP1_07_PIN 10
-#define EXP1_08_PIN 11
-#define EXP1_09_PIN 7
-#define EXP1_10_PIN 5
+#define EXP1_05_PIN 12
+#define EXP1_04_PIN 10
+#define EXP1_03_PIN 11
+#define EXP1_02_PIN 7
+#define EXP1_01_PIN 5
#if ENABLED(ZONESTAR_12864LCD)
//
@@ -190,10 +190,10 @@
//
#define LCDSCREEN_NAME "ZONESTAR_12864LCD"
#define FORCE_SOFT_SPI
- //#define LCD_SDSS EXP1_08_PIN
- #define LCD_PINS_RS EXP1_08_PIN // ST7920_CS_PIN (LCD module pin 4)
- #define LCD_PINS_ENABLE EXP1_05_PIN // ST7920_DAT_PIN (LCD module pin 5)
- #define LCD_PINS_D4 EXP1_07_PIN // ST7920_CLK_PIN (LCD module pin 6)
+ //#define LCD_SDSS EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_03_PIN // ST7920_CS_PIN (LCD module pin 4)
+ #define LCD_PINS_ENABLE EXP1_06_PIN // ST7920_DAT_PIN (LCD module pin 5)
+ #define LCD_PINS_D4 EXP1_04_PIN // ST7920_CLK_PIN (LCD module pin 6)
#define BOARD_ST7920_DELAY_1 DELAY_2_NOP
#define BOARD_ST7920_DELAY_2 DELAY_2_NOP
@@ -205,9 +205,9 @@
//
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
#define FORCE_SOFT_SPI
- #define LCD_PINS_RS EXP1_05_PIN
- #define LCD_PINS_DC EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define LCD_PINS_RS EXP1_06_PIN
+ #define LCD_PINS_DC EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
#if ENABLED(OLED_HW_IIC)
#error "Oops! can't choose HW IIC for ZMIB board!!"
@@ -224,9 +224,9 @@
// All the above are also RRDSC with rotary encoder
//
#if IS_RRD_SC
- #define BTN_EN1 EXP1_03_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_04_PIN
+ #define BTN_EN1 EXP1_08_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_07_PIN
#define BEEPER_PIN -1
#define KILL_PIN -1
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
index 06788139f01..4e4efc4f73e 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
@@ -157,11 +157,11 @@
/**
* ------
- * (BEEPER) PA15 |10 9 | PB6 (BTN_ENC)
- * (BTN_EN1) PA9 | 8 7 | RESET
- * (BTN_EN2) PA10 6 5 | PB9 (LCD_D4)
- * (LCD_RS) PB8 | 4 3 | PB7 (LCD_EN)
- * GND | 2 1 | 5V
+ * (BEEPER) PA15 | 1 2 | PB6 (BTN_ENC)
+ * (BTN_EN1) PA9 | 3 4 | RESET
+ * (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
+ * (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN)
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
@@ -198,11 +198,11 @@
/** Creality Ender-2 display pinout
* ------
- * (SCK) PA15 |10 9 | PB6 (BTN_ENC)
- * (BTN_EN1) PA9 | 8 7 | RESET
- * (BTN_EN2) PA10 6 5 | PB9 (LCD_A0)
- * (LCD_RS) PB8 | 4 3 | PB7 (MOSI)
- * GND | 2 1 | 5V
+ * (SCK) PA15 | 1 2 | PB6 (BTN_ENC)
+ * (BTN_EN1) PA9 | 3 4 | RESET
+ * (BTN_EN2) PA10 5 6 | PB9 (LCD_A0)
+ * (LCD_RS) PB8 | 7 8 | PB7 (MOSI)
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
@@ -234,11 +234,11 @@
*
* Board Display
* ------ ------
- * (SD_DET) PA15 |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 (MOSI) 6 5 | (LCD_CS)
- * (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (MOD_RESET)
- * GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
+ * (SD_DET) PA15 | 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 (MOSI) 5 6 | (LCD_CS)
+ * (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (MOD_RESET)
+ * GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
index fa7eb3dd115..a81f272f266 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
@@ -120,11 +120,11 @@
/**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* ------ ------
- * (BEEPER) PB5 |10 9 | PB6 (BTN_ENC) (BEEPER) PB5 |10 9 | PA15 (BTN_ENC)
- * (BTN_EN1) PA9 | 8 7 | RESET (BTN_EN1) PA9 | 8 7 | RESET
- * (BTN_EN2) PA10 6 5 | PB9 (LCD_D4) (BTN_EN2) PA10 6 5 | PB9 (LCD_D4)
- * (LCD_RS) PB8 | 4 3 | PB7 (LCD_EN) (LCD_RS) PB8 | 4 3 | PB15 (LCD_EN)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * (BEEPER) PB5 | 1 2 | PB6 (BTN_ENC) (BEEPER) PB5 | 1 2 | PA15 (BTN_ENC)
+ * (BTN_EN1) PA9 | 3 4 | RESET (BTN_EN1) PA9 | 3 4 | RESET
+ * (BTN_EN2) PA10 5 6 | PB9 (LCD_D4) (BTN_EN2) PA10 5 6 | PB9 (LCD_D4)
+ * (LCD_RS) PB8 | 7 8 | PB7 (LCD_EN) (LCD_RS) PB8 | 7 8 | PB15 (LCD_EN)
+ * GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP1
*/
@@ -139,11 +139,11 @@
#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)
*
@@ -214,11 +214,11 @@
*
* Board Display
* ------ ------
- * (SD_DET) PB5 |10 9 | PB6 (BEEPER) 5V |10 9 | GND
- * (MOD_RESET) PA9 | 8 7 | RESET -- | 8 7 | (SD_DET)
- * (SD_CS) PA10 6 5 | PB9 (MOSI) | 6 5 | --
- * (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (LCD_CS)
- * GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
+ * (SD_DET) PB5 | 1 2 | PB6 (BEEPER) 5V | 1 2 | GND
+ * (MOD_RESET) PA9 | 3 4 | RESET -- | 3 4 | (SD_DET)
+ * (SD_CS) PA10 5 6 | PB9 (MOSI) | 5 6 | --
+ * (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (LCD_CS)
+ * GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
@@ -253,20 +253,20 @@
*
* Board Display
* ------ ------
- * PB5 |10 9 | PA15 (BEEP) |10 9 | BTN_ENC
- * PA9 | 8 7 | RESET LCD_CS | 8 7 | LCD A0
- * PA10 | 6 5 | PB9 LCD_RST | 6 5 | RED
- * PB8 | 4 3 | PB15 (GREEN) | 4 3 | (BLUE)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * PB5 | 1 2 | PA15 (BEEP) | 1 2 | BTN_ENC
+ * PA9 | 3 4 | RESET LCD_CS | 3 4 | LCD A0
+ * PA10 | 5 6 | PB9 LCD_RST | 5 6 | RED
+ * PB8 | 7 8 | PB15 (GREEN) | 7 8 | (BLUE)
+ * GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP1
*
* --- ------
- * RST | 1 | (MISO) |10 9 | SCK
- * (RX2) PA2 | 2 | BTN_EN1 | 8 7 | (SS)
- * (TX2) PA3 | 3 | BTN_EN2 | 6 5 | MOSI
- * GND | 4 | (CD) | 4 3 | (RST)
- * 5V | 5 | (GND) | 2 1 | (KILL)
+ * RST | 1 | (MISO) | 1 2 | SCK
+ * (RX2) PA2 | 2 | BTN_EN1 | 3 4 | (SS)
+ * (TX2) PA3 | 3 | BTN_EN2 | 5 6 | MOSI
+ * GND | 4 | (CD) | 7 8 | (RST)
+ * 5V | 5 | (GND) | 9 10 | (KILL)
* --- ------
* TFT EXP2
*
@@ -325,11 +325,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 (MOSI) | 6 5 | (LCD_CS)
- * (LCD_CS) PB8 | 4 3 | PB7 (SD_CS) | 4 3 | (MOD_RESET)
- * GND | 2 1 | 5V (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 (MOSI) | 5 6 | (LCD_CS)
+ * (LCD_CS) PB8 | 7 8 | PB7 (SD_CS) | 7 8 | (MOD_RESET)
+ * GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
diff --git a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
index 1ea947ffdf1..16ea8de2f05 100644
--- a/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
+++ b/Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
@@ -111,47 +111,47 @@
#define TEMP_0_PIN PA0 // Analog Input
/** ------ ------
- * (BEEPER) PC10 |10 9 | PC11 (BTN_ENC) (MISO) PB4 |10 9 | PB3 (SCK)
- * (LCD_EN) PB6 | 8 7 | PC12 (LCD_RS) (BTN_EN1) PD2 | 8 7 | PA15 (SD_SS)
- * (LCD_D4) PC13 6 5 | PB7 (LCD_D5) (BTN_EN2) PB8 6 5 | PB5 (MOSI)
- * (LCD_D6) PC15 | 4 3 | PC14 (LCD_D7) (SD_DETECT) PB9 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PC10 | 1 2 | PC11 (BTN_ENC) (MISO) PB4 | 1 2 | PB3 (SCK)
+ * (LCD_EN) PB6 | 3 4 | PC12 (LCD_RS) (BTN_EN1) PD2 | 3 4 | PA15 (SD_SS)
+ * (LCD_D4) PC13 5 6 | PB7 (LCD_D5) (BTN_EN2) PB8 5 6 | PB5 (MOSI)
+ * (LCD_D6) PC15 | 7 8 | PC14 (LCD_D7) (SD_DETECT) PB9 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PC14
-#define EXP1_04_PIN PC15
-#define EXP1_05_PIN PB7
-#define EXP1_06_PIN PC13
-#define EXP1_07_PIN PC12
-#define EXP1_08_PIN PB6
-#define EXP1_09_PIN PC11
-#define EXP1_10_PIN PC10
+#define EXP1_08_PIN PC14
+#define EXP1_07_PIN PC15
+#define EXP1_06_PIN PB7
+#define EXP1_05_PIN PC13
+#define EXP1_04_PIN PC12
+#define EXP1_03_PIN PB6
+#define EXP1_02_PIN PC11
+#define EXP1_01_PIN PC10
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PB9
-#define EXP2_05_PIN PB5
-#define EXP2_06_PIN PB8
-#define EXP2_07_PIN PA15
-#define EXP2_08_PIN PD2
-#define EXP2_09_PIN PB3
-#define EXP2_10_PIN PB4
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PB9
+#define EXP2_06_PIN PB5
+#define EXP2_05_PIN PB8
+#define EXP2_04_PIN PA15
+#define EXP2_03_PIN PD2
+#define EXP2_02_PIN PB3
+#define EXP2_01_PIN PB4
//
// LCD / Controller
//
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif IS_TFTGLCD_PANEL
@@ -159,56 +159,56 @@
#undef BTN_ENC
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#else
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
#if ENABLED(FYSETC_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
#define FORCE_SOFT_SPI // SPI MODE3
- #define LED_PIN EXP1_05_PIN // red pwm
- //#define LED_PIN EXP1_04_PIN // green
- //#define LED_PIN EXP1_03_PIN // blue
+ #define LED_PIN EXP1_06_PIN // red pwm
+ //#define LED_PIN EXP1_07_PIN // green
+ //#define LED_PIN EXP1_08_PIN // blue
//#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
// #ifndef RGB_LED_R_PIN
- // #define RGB_LED_R_PIN EXP1_05_PIN
+ // #define RGB_LED_R_PIN EXP1_06_PIN
// #endif
// #ifndef RGB_LED_G_PIN
- // #define RGB_LED_G_PIN EXP1_04_PIN
+ // #define RGB_LED_G_PIN EXP1_07_PIN
// #endif
// #ifndef RGB_LED_B_PIN
- // #define RGB_LED_B_PIN EXP1_03_PIN
+ // #define RGB_LED_B_PIN EXP1_08_PIN
// #endif
//#elif ENABLED(FYSETC_MINI_12864_2_1)
- // #define NEOPIXEL_PIN EXP1_05_PIN
+ // #define NEOPIXEL_PIN EXP1_06_PIN
//#endif
#else // !FYSETC_MINI_12864
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -241,11 +241,11 @@
#if SD_CONNECTION_IS(LCD)
#define SPI_DEVICE 3
- #define SD_DETECT_PIN EXP2_04_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_SS_PIN EXP2_07_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_SS_PIN EXP2_04_PIN
#elif SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN PA3
#define SD_SCK_PIN PA5
diff --git a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
index 9dec1e12796..7f63cb1b24c 100644
--- a/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
+++ b/Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
@@ -123,35 +123,35 @@
/**
* ------
- * PB5 |10 9 | PB6
- * PA2 | 8 7 | RESET
- * PA3 6 5 | PB8
- * PB7 | 4 3 | PA4
- * GND | 2 1 | VCC5
+ * PB5 | 1 2 | PB6
+ * PA2 | 3 4 | RESET
+ * PA3 5 6 | PB8
+ * PB7 | 7 8 | PA4
+ * GND | 9 10 | VCC5
* ------
* EXP1
*/
-#define EXP1_03_PIN PA4
-#define EXP1_04_PIN PB7
-#define EXP1_05_PIN PB8
-#define EXP1_06_PIN PA3
-#define EXP1_07_PIN -1 // RESET
-#define EXP1_08_PIN PA2
-#define EXP1_09_PIN PB6
-#define EXP1_10_PIN PB5
+#define EXP1_08_PIN PA4
+#define EXP1_07_PIN PB7
+#define EXP1_06_PIN PB8
+#define EXP1_05_PIN PA3
+#define EXP1_04_PIN -1 // RESET
+#define EXP1_03_PIN PA2
+#define EXP1_02_PIN PB6
+#define EXP1_01_PIN PB5
//
// LCD / Controller
//
#if ENABLED(CR10_STOCKDISPLAY)
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
- #define LCD_PINS_D4 EXP1_05_PIN // SCLK
- #define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
+ #define LCD_PINS_RS EXP1_07_PIN // CS -- SOFT SPI for ENDER3 LCD
+ #define LCD_PINS_D4 EXP1_06_PIN // SCLK
+ #define LCD_PINS_ENABLE EXP1_08_PIN // DATA MOSI
#endif
// Alter timing for graphical display
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
index 7e3979b87e7..3df8ad2a8ef 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
@@ -168,11 +168,11 @@
/**
* RET6 12864 LCD
* ------
- * PC6 |10 9 | PB2
- * PB10 | 8 7 | PE8
- * PB14 6 5 | PB13
- * PB12 | 4 3 | PB15
- * GND | 2 1 | 5V
+ * PC6 | 1 2 | PB2
+ * PB10 | 3 4 | PE8
+ * PB14 5 6 | PB13
+ * PB12 | 7 8 | PB15
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
@@ -194,11 +194,11 @@
/**
* VET6 12864 LCD
* ------
- * ? |10 9 | PC5
- * PB10 | 8 7 | ?
- * PA6 6 5 | PA5
- * PA4 | 4 3 | PA7
- * GND | 2 1 | 5V
+ * ? | 1 2 | PC5
+ * PB10 | 3 4 | ?
+ * PA6 5 6 | PA5
+ * PA4 | 7 8 | PA7
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 484ff654427..699bfee5632 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -150,58 +150,58 @@
/**
* RET6 12864 LCD
* ------
- * PC6 |10 9 | PB2
- * PB10 | 8 7 | PE8
- * PB14 6 5 | PB13
- * PB12 | 4 3 | PB15
- * GND | 2 1 | 5V
+ * PC6 | 1 2 | PB2
+ * PB10 | 3 4 | PE8
+ * PB14 5 6 | PB13
+ * PB12 | 7 8 | PB15
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
- #define EXP1_03_PIN PB15
- #define EXP1_04_PIN PB12
- #define EXP1_05_PIN PB13
- #define EXP1_06_PIN PB14
- #define EXP1_07_PIN PE8
- #define EXP1_08_PIN PB10
- #define EXP1_09_PIN PB2
- #define EXP1_10_PIN PC6
+ #define EXP1_08_PIN PB15
+ #define EXP1_07_PIN PB12
+ #define EXP1_06_PIN PB13
+ #define EXP1_05_PIN PB14
+ #define EXP1_04_PIN PE8
+ #define EXP1_03_PIN PB10
+ #define EXP1_02_PIN PB2
+ #define EXP1_01_PIN PC6
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#elif ENABLED(VET6_12864_LCD)
/**
* VET6 12864 LCD
* ------
- * ? |10 9 | PC5
- * PB10 | 8 7 | ?
- * PA6 6 5 | PA5
- * PA4 | 4 3 | PA7
- * GND | 2 1 | 5V
+ * ? | 1 2 | PC5
+ * PB10 | 3 4 | ?
+ * PA6 5 6 | PA5
+ * PA4 | 7 8 | PA7
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
- #define EXP1_03_PIN PA7
- #define EXP1_04_PIN PA4
- #define EXP1_05_PIN PA5
- #define EXP1_06_PIN PA6
- #define EXP1_07_PIN -1
- #define EXP1_08_PIN PB10
- #define EXP1_09_PIN PC5
- #define EXP1_10_PIN -1
+ #define EXP1_08_PIN PA7
+ #define EXP1_07_PIN PA4
+ #define EXP1_06_PIN PA5
+ #define EXP1_05_PIN PA6
+ #define EXP1_04_PIN -1
+ #define EXP1_03_PIN PB10
+ #define EXP1_02_PIN PC5
+ #define EXP1_01_PIN -1
#else
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
diff --git a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
index 952b40c1ded..5326611672b 100644
--- a/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
+++ b/Marlin/src/pins/stm32f1/pins_FLY_MINI.h
@@ -85,13 +85,13 @@
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI EXP2_05_PIN
+ #define TMC_SW_MOSI EXP2_06_PIN
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO EXP2_10_PIN
+ #define TMC_SW_MISO EXP2_01_PIN
#endif
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK EXP2_09_PIN
+ #define TMC_SW_SCK EXP2_02_PIN
#endif
#endif
@@ -123,31 +123,31 @@
#define TEMP_0_PIN PC1 // Analog Input
/** ------ ------
- * (BEEPER) PC14 |10 9 | PC13 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SD_SCK)
- * (LCD_EN) PB9 | 8 7 | PB8 (LCD_RS) (BTN_EN1) PB3 | 8 7 | PB12 (SD_CS2)
- * (LCD_D4) PB7 6 5 | PB6 (LCD_D5) (BTN_EN2) PD2 6 5 | PB15 (SD_MOSI)
- * (LCD_D6) PB5 | 4 3 | PB4 (LCD_D7) (SD_DETECT) PB11 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PC14 | 1 2 | PC13 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK)
+ * (LCD_EN) PB9 | 3 4 | PB8 (LCD_RS) (BTN_EN1) PB3 | 3 4 | PB12 (SD_CS2)
+ * (LCD_D4) PB7 5 6 | PB6 (LCD_D5) (BTN_EN2) PD2 5 6 | PB15 (SD_MOSI)
+ * (LCD_D6) PB5 | 7 8 | PB4 (LCD_D7) (SD_DETECT) PB11 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PB4
-#define EXP1_04_PIN PB5
-#define EXP1_05_PIN PB6
-#define EXP1_06_PIN PB7
-#define EXP1_07_PIN PB8
-#define EXP1_08_PIN PB9
-#define EXP1_09_PIN PC13
-#define EXP1_10_PIN PC14
+#define EXP1_08_PIN PB4
+#define EXP1_07_PIN PB5
+#define EXP1_06_PIN PB6
+#define EXP1_05_PIN PB7
+#define EXP1_04_PIN PB8
+#define EXP1_03_PIN PB9
+#define EXP1_02_PIN PC13
+#define EXP1_01_PIN PC14
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PB11
-#define EXP2_05_PIN PB15
-#define EXP2_06_PIN PD2
-#define EXP2_07_PIN PB12
-#define EXP2_08_PIN PB3
-#define EXP2_09_PIN PB13
-#define EXP2_10_PIN PB14
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PB11
+#define EXP2_06_PIN PB15
+#define EXP2_05_PIN PD2
+#define EXP2_04_PIN PB12
+#define EXP2_03_PIN PB3
+#define EXP2_02_PIN PB13
+#define EXP2_01_PIN PB14
//
// LCD / Controller
@@ -155,26 +155,26 @@
#if HAS_WIRED_LCD
#define SPI_DEVICE 2
- #define SD_SS_PIN EXP2_07_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
+ #define SD_SS_PIN EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
#define SDSS SD_SS_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index beda50d29b1..7b790ef157f 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -133,11 +133,11 @@
/**
* EXP1 pinout for the LCD according to FYSETC's Cheetah board schematic
* ------
- * (BEEPER) PC9 |10 9 | PC12 (BTN_ENC)
- * (BTN_EN2) PC11 | 8 7 | PB14 (LCD_RS / MISO)
- * (BTN_EN1) PC10 6 5 | PB13 (SCK)
- * (LCD_EN) PB12 | 4 3 | PB15 (MOSI)
- * GND | 2 1 | 5V
+ * (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
+ * (BTN_EN2) PC11 | 3 4 | PB14 (LCD_RS / MISO)
+ * (BTN_EN1) PC10 5 6 | PB13 (SCK)
+ * (LCD_EN) PB12 | 7 8 | PB15 (MOSI)
+ * GND | 9 10 | 5V
* ------
* EXP1
*
@@ -146,23 +146,23 @@
* - Functionally the pins are assigned in the same order as on the Ender-3 board.
* - Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
*/
-#define EXP1_03_PIN PB15
-#define EXP1_04_PIN PB12
-#define EXP1_05_PIN PB13
-#define EXP1_06_PIN PC10
-#define EXP1_07_PIN PB14
-#define EXP1_08_PIN PC11
-#define EXP1_09_PIN PC12
-#define EXP1_10_PIN PC9
+#define EXP1_08_PIN PB15
+#define EXP1_07_PIN PB12
+#define EXP1_06_PIN PB13
+#define EXP1_05_PIN PC10
+#define EXP1_04_PIN PB14
+#define EXP1_03_PIN PC11
+#define EXP1_02_PIN PC12
+#define EXP1_01_PIN PC9
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#if HAS_MARLINUI_U8GLIB
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_SCK EXP1_05_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_SCK EXP1_06_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#if EITHER(FYSETC_MINI_12864, U8GLIB_ST7920)
#define FORCE_SOFT_SPI
@@ -170,30 +170,30 @@
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#endif
- #define LCD_PINS_RS EXP1_04_PIN // CS -- SOFT SPI for ENDER3 LCD
- #define LCD_PINS_D4 EXP1_05_PIN // SCLK
- #define LCD_PINS_ENABLE EXP1_03_PIN // DATA MOSI
+ #define LCD_PINS_RS EXP1_07_PIN // CS -- SOFT SPI for ENDER3 LCD
+ #define LCD_PINS_D4 EXP1_06_PIN // SCLK
+ #define LCD_PINS_ENABLE EXP1_08_PIN // DATA MOSI
//#define LCD_CONTRAST_INIT 190
#if IS_NEWPANEL
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_08_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_03_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
- #define BEEPER_PIN EXP1_10_PIN
- #define CLCD_MOD_RESET EXP1_08_PIN
- #define CLCD_SPI_CS EXP1_04_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define CLCD_MOD_RESET EXP1_03_PIN
+ #define CLCD_SPI_CS EXP1_07_PIN
//#define CLCD_USE_SOFT_SPI // the Cheetah can use hardware-SPI so we do not really need this
#if ENABLED(CLCD_USE_SOFT_SPI)
- #define CLCD_SOFT_SPI_MOSI EXP1_03_PIN
- #define CLCD_SOFT_SPI_MISO EXP1_07_PIN
- #define CLCD_SOFT_SPI_SCLK EXP1_05_PIN
+ #define CLCD_SOFT_SPI_MOSI EXP1_08_PIN
+ #define CLCD_SOFT_SPI_MISO EXP1_04_PIN
+ #define CLCD_SOFT_SPI_SCLK EXP1_06_PIN
#else
#define CLCD_SPI_BUS 2
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
index 38f10f67135..b6f5dfa87ec 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
@@ -207,31 +207,31 @@
/**
* ------ ------
- * PC5 |10 9 | PE13 PA6 |10 9 | PA5
- * PD13 | 8 7 | PC6 PE8 | 8 7 | PE10
- * PE14 | 6 5 PE15 PE11 | 6 5 PA7
- * PD11 | 4 3 | PD10 PE12 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * PC5 | 1 2 | PE13 PA6 | 1 2 | PA5
+ * PD13 | 3 4 | PC6 PE8 | 3 4 | PE10
+ * PE14 | 5 6 PE15 PE11 | 5 6 PA7
+ * PD11 | 7 8 | PD10 PE12 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PD10
-#define EXP1_04_PIN PD11
-#define EXP1_05_PIN PE15
-#define EXP1_06_PIN PE14
-#define EXP1_07_PIN PC6
-#define EXP1_08_PIN PD13
-#define EXP1_09_PIN PE13
-#define EXP1_10_PIN PC5
+#define EXP1_08_PIN PD10
+#define EXP1_07_PIN PD11
+#define EXP1_06_PIN PE15
+#define EXP1_05_PIN PE14
+#define EXP1_04_PIN PC6
+#define EXP1_03_PIN PD13
+#define EXP1_02_PIN PE13
+#define EXP1_01_PIN PC5
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PE12
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PE11
-#define EXP2_07_PIN PE10
-#define EXP2_08_PIN PE8
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PE12
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PE11
+#define EXP2_04_PIN PE10
+#define EXP2_03_PIN PE8
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// SD Card
@@ -247,11 +247,11 @@
#define ONBOARD_SD_CS_PIN PC11
#elif SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
- #define SDSS EXP2_07_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
//
@@ -268,25 +268,25 @@
// Shared SPI TFT
- #define LCD_BACKLIGHT_PIN EXP1_08_PIN
+ #define LCD_BACKLIGHT_PIN EXP1_03_PIN
- #define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
- #define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
- #define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
- #define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
+ #define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
+ #define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
+ #define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
+ #define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
- #define TFT_DC_PIN EXP1_03_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@@ -298,22 +298,22 @@
#if ENABLED(TFT_CLASSIC_UI)
// Emulated DOGM SPI
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#elif ENABLED(TFT_COLOR_UI)
#define TFT_BUFFER_SIZE 14400
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1
#if ENABLED(MKS_MINI_12864)
@@ -323,18 +323,18 @@
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
#elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define PIN_SPI_SCK EXP2_09_PIN
- #define PIN_TFT_MISO EXP2_10_PIN
- #define PIN_TFT_MOSI EXP2_05_PIN
- #define TFTGLCD_CS EXP2_08_PIN
+ #define PIN_SPI_SCK EXP2_02_PIN
+ #define PIN_TFT_MISO EXP2_01_PIN
+ #define PIN_TFT_MOSI EXP2_06_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#ifndef BEEPER_PIN
@@ -342,14 +342,14 @@
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define LCD_PINS_DC EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define LCD_PINS_DC EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN
- #define NEOPIXEL_PIN EXP1_05_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@@ -357,11 +357,11 @@
#else // !MKS_MINI_12864
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -387,7 +387,7 @@
#endif
#ifndef BEEPER_PIN
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#endif
#if ENABLED(SPEAKER) && BEEPER_PIN == PC5
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
index 4af88c18482..a25c8950cba 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
@@ -141,82 +141,82 @@
/**
* ------ ------ ------
- * (BEEPER) PC1 |10 9 | PC3 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SD_SCK) (BEEPER) PC1 |10 9 | PC3 (BTN_ENC)
- * (LCD_EN) PA4 | 8 7 | PA5 (LCD_RS) (BTN_EN1) PB11 | 8 7 | PA15 (SD_SS) (BTN_EN1) PB11 | 8 7 | RESET
- * (LCD_D4) PA6 6 5 | PA7 (LCD_D5) (BTN_EN2) PB0 6 5 | PB15 (SD_MOSI) (BTN_EN2) PB0 6 5 | PA6 (LCD_D4)
- * (LCD_D6) PC4 | 4 3 | PC5 (LCD_D7) (SD_DETECT) PC10 | 4 3 | RESET (LCD_RS) PA5 | 4 3 | PA4 (LCD_EN)
- * GND | 2 1 | 5V GND | 2 1 | -- GND | 2 1 | 5V
+ * (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC)
+ * (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (BTN_EN1) PB11 | 3 4 | RESET
+ * (LCD_D4) PA6 5 6 | PA7 (LCD_D5) (BTN_EN2) PB0 5 6 | PB15 (SD_MOSI) (BTN_EN2) PB0 5 6 | PA6 (LCD_D4)
+ * (LCD_D6) PC4 | 7 8 | PC5 (LCD_D7) (SD_DETECT) PC10 | 7 8 | RESET (LCD_RS) PA5 | 7 8 | PA4 (LCD_EN)
+ * GND | 9 10 | 5V GND | 9 10 | -- GND | 9 10 | 5V
* ------ ------ ------
* EXP1 EXP2 "Ender-3 EXP1"
*/
-#define EXP1_03_PIN PC5
-#define EXP1_04_PIN PC4
-#define EXP1_05_PIN PA7
-#define EXP1_06_PIN PA6
-#define EXP1_07_PIN PA5
-#define EXP1_08_PIN PA4
-#define EXP1_09_PIN PC3
-#define EXP1_10_PIN PC1
+#define EXP1_08_PIN PC5
+#define EXP1_07_PIN PC4
+#define EXP1_06_PIN PA7
+#define EXP1_05_PIN PA6
+#define EXP1_04_PIN PA5
+#define EXP1_03_PIN PA4
+#define EXP1_02_PIN PC3
+#define EXP1_01_PIN PC1
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PC10
-#define EXP2_05_PIN PB15
-#define EXP2_06_PIN PB0
-#define EXP2_07_PIN PA15
-#define EXP2_08_PIN PB11
-#define EXP2_09_PIN PB13
-#define EXP2_10_PIN PB14
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PC10
+#define EXP2_06_PIN PB15
+#define EXP2_05_PIN PB0
+#define EXP2_04_PIN PA15
+#define EXP2_03_PIN PB11
+#define EXP2_02_PIN PB13
+#define EXP2_01_PIN PB14
// "Ender-3 EXP1"
-#define E3_EXP1_03_PIN PA4
-#define E3_EXP1_04_PIN PA5
-#define E3_EXP1_05_PIN PA6
-#define E3_EXP1_06_PIN PB0
-#define E3_EXP1_07_PIN -1 // RESET
-#define E3_EXP1_08_PIN PB11
-#define E3_EXP1_09_PIN PC3
-#define E3_EXP1_10_PIN PC1
+#define EXP3_08_PIN PA4
+#define EXP3_07_PIN PA5
+#define EXP3_06_PIN PA6
+#define EXP3_05_PIN PB0
+#define EXP3_04_PIN -1 // RESET
+#define EXP3_03_PIN PB11
+#define EXP3_02_PIN PC3
+#define EXP3_01_PIN PC1
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define LCD_PINS_DC EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define LCD_PINS_DC EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN
- #define NEOPIXEL_PIN EXP1_05_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
#define FORCE_SOFT_SPI
#define SOFTWARE_SPI
//#define LCD_SCREEN_ROTATE 180 // 0, 90, 180, 270
#else
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if !defined(BTN_ENC_EN) && ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -254,12 +254,12 @@
#define ONBOARD_SPI_DEVICE 2
#define SDSS SD_SS_PIN
#define ONBOARD_SD_CS_PIN SD_SS_PIN
-#define SD_DETECT_PIN PC10 // EXP2_04_PIN
+#define SD_DETECT_PIN PC10 // EXP2_07_PIN
#define NO_SD_HOST_DRIVE
// TODO: This is the only way to set SPI for SD on STM32 (for now)
#define ENABLE_SPI2
-#define SD_SCK_PIN EXP2_09_PIN
-#define SD_MISO_PIN EXP2_10_PIN
-#define SD_MOSI_PIN EXP2_05_PIN
-#define SD_SS_PIN EXP2_07_PIN
+#define SD_SCK_PIN EXP2_02_PIN
+#define SD_MISO_PIN EXP2_01_PIN
+#define SD_MOSI_PIN EXP2_06_PIN
+#define SD_SS_PIN EXP2_04_PIN
diff --git a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
index bc42bd02eba..227db4b15c2 100644
--- a/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
+++ b/Marlin/src/pins/stm32f1/pins_MKS_ROBIN_LITE.h
@@ -80,50 +80,50 @@
#define FIL_RUNOUT_PIN PB8 // MT_DET
/** ------
- * (BEEPER) PD2 |10 9 | PB3 (BTN_ENC)
- * (BTN_EN1) PB5 | 8 7 | PA11 (RESET?)
- * (BTN_EN2) PB4 6 5 | PC1 (LCD_D4)
- * (LCD_RS) PC3 | 4 3 | PC2 (LCD_EN)
- * GND | 2 1 | 5V
+ * (BEEPER) PD2 | 1 2 | PB3 (BTN_ENC)
+ * (BTN_EN1) PB5 | 3 4 | PA11 (RESET?)
+ * (BTN_EN2) PB4 5 6 | PC1 (LCD_D4)
+ * (LCD_RS) PC3 | 7 8 | PC2 (LCD_EN)
+ * GND | 9 10 | 5V
* ------
* "E3" EXP1
*/
-#define E3_EXP1_01_PIN -1 // 5V
-#define E3_EXP1_02_PIN -1 // GND
-#define E3_EXP1_03_PIN PC2
-#define E3_EXP1_04_PIN PC3
-#define E3_EXP1_05_PIN PC1
-#define E3_EXP1_06_PIN PB4
-#define E3_EXP1_07_PIN PA11 // RESET?
-#define E3_EXP1_08_PIN PB5
-#define E3_EXP1_09_PIN PB3
-#define E3_EXP1_10_PIN PD2
+#define EXP3_10_PIN -1 // 5V
+#define EXP3_09_PIN -1 // GND
+#define EXP3_08_PIN PC2
+#define EXP3_07_PIN PC3
+#define EXP3_06_PIN PC1
+#define EXP3_05_PIN PB4
+#define EXP3_04_PIN PA11 // RESET?
+#define EXP3_03_PIN PB5
+#define EXP3_02_PIN PB3
+#define EXP3_01_PIN PD2
//
// LCD Pins
//
#if HAS_WIRED_LCD
- #define BEEPER_PIN E3_EXP1_10_PIN
- #define BTN_ENC E3_EXP1_09_PIN
- #define LCD_PINS_RS E3_EXP1_04_PIN
+ #define BEEPER_PIN EXP3_01_PIN
+ #define BTN_ENC EXP3_02_PIN
+ #define LCD_PINS_RS EXP3_07_PIN
- #define BTN_EN1 E3_EXP1_08_PIN
- #define BTN_EN2 E3_EXP1_06_PIN
+ #define BTN_EN1 EXP3_03_PIN
+ #define BTN_EN2 EXP3_05_PIN
- #define LCD_PINS_ENABLE E3_EXP1_03_PIN
+ #define LCD_PINS_ENABLE EXP3_08_PIN
#if ENABLED(MKS_MINI_12864)
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN -1
- #define DOGLCD_A0 E3_EXP1_05_PIN
- #define DOGLCD_CS E3_EXP1_03_PIN
+ #define DOGLCD_A0 EXP3_06_PIN
+ #define DOGLCD_CS EXP3_08_PIN
#define DOGLCD_SCK PB13
#define DOGLCD_MOSI PB15
#else // !MKS_MINI_12864
- #define LCD_PINS_D4 E3_EXP1_05_PIN
+ #define LCD_PINS_D4 EXP3_06_PIN
#if IS_ULTIPANEL
#define LCD_PINS_D5 -1
#define LCD_PINS_D6 -1
@@ -164,12 +164,12 @@
// EXP1 replace LCD with keys for EasyThreeD ET4000+ Mainboard
#if ENABLED(EASYTHREED_UI)
- #define BTN_HOME E3_EXP1_04_PIN // INPUT_PULLUP (unused)
- #define BTN_FEED E3_EXP1_09_PIN // Run E Forward
- #define BTN_RETRACT E3_EXP1_08_PIN // Run E Backward
- #define BTN_PRINT E3_EXP1_07_PIN // Start File Print
- #define BTN_HOME_GND E3_EXP1_03_PIN // OUTPUT (LOW)
- #define BTN_FEED_GND E3_EXP1_06_PIN // OUTPUT (LOW)
- #define BTN_RETRACT_GND E3_EXP1_05_PIN // OUTPUT (LOW)
- #define EASYTHREED_LED_PIN E3_EXP1_10_PIN // Indicator LED
+ #define BTN_HOME EXP3_07_PIN // INPUT_PULLUP (unused)
+ #define BTN_FEED EXP3_02_PIN // Run E Forward
+ #define BTN_RETRACT EXP3_03_PIN // Run E Backward
+ #define BTN_PRINT EXP3_04_PIN // Start File Print
+ #define BTN_HOME_GND EXP3_08_PIN // OUTPUT (LOW)
+ #define BTN_FEED_GND EXP3_05_PIN // OUTPUT (LOW)
+ #define BTN_RETRACT_GND EXP3_06_PIN // OUTPUT (LOW)
+ #define EASYTHREED_LED_PIN EXP3_01_PIN // Indicator LED
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
index f1f03a7dd78..ed0f00591f9 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E2_V1_0.h
@@ -72,14 +72,14 @@
// 2 +5V
// 1 GND
-#define EXP1_03_PIN PB11
-#define EXP1_04_PIN PB10
-#define EXP1_05_PIN PB2
-#define EXP1_06_PIN PC5
-#define EXP1_07_PIN PA10
-#define EXP1_08_PIN PA9
-#define EXP1_09_PIN PB0
-#define EXP1_10_PIN PB1
+#define EXP1_08_PIN PB11
+#define EXP1_07_PIN PB10
+#define EXP1_06_PIN PB2
+#define EXP1_05_PIN PC5
+#define EXP1_04_PIN PA10
+#define EXP1_03_PIN PA9
+#define EXP1_02_PIN PB0
+#define EXP1_01_PIN PB1
// AUX1 connector
// 1 +5V
@@ -193,14 +193,14 @@
// 1 GND
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
- #define LCD_PINS_RS EXP1_08_PIN
- #define LCD_PINS_ENABLE EXP1_05_PIN
- #define LCD_PINS_D4 EXP1_07_PIN
- //#define KILL_PIN EXP1_10_PIN
- #define BEEPER_PIN EXP1_09_PIN
- #define BTN_EN1 EXP1_03_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_03_PIN
+ #define LCD_PINS_ENABLE EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_04_PIN
+ //#define KILL_PIN EXP1_01_PIN
+ #define BEEPER_PIN EXP1_02_PIN
+ #define BTN_EN1 EXP1_08_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_07_PIN
#define BOARD_ST7920_DELAY_1 125
#define BOARD_ST7920_DELAY_2 200
#define BOARD_ST7920_DELAY_3 125
@@ -221,15 +221,15 @@
#define FORCE_SOFT_SPI
#define LCDSCREEN_NAME "ZONESTAR 12864OLED"
- #define LCD_PINS_RS EXP1_05_PIN // = LCD_RESET_PIN
- #define LCD_PINS_DC EXP1_07_PIN // DC
- #define DOGLCD_CS EXP1_08_PIN // CS
+ #define LCD_PINS_RS EXP1_06_PIN // = LCD_RESET_PIN
+ #define LCD_PINS_DC EXP1_04_PIN // DC
+ #define DOGLCD_CS EXP1_03_PIN // CS
#define DOGLCD_A0 LCD_PINS_DC
- #define DOGLCD_MOSI EXP1_10_PIN // SDA
- #define DOGLCD_SCK EXP1_09_PIN // SCK
+ #define DOGLCD_MOSI EXP1_01_PIN // SDA
+ #define DOGLCD_SCK EXP1_02_PIN // SCK
// Encoder
- #define BTN_EN1 EXP1_03_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_04_PIN
+ #define BTN_EN1 EXP1_08_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_07_PIN
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
index 17e13bdc87b..f59d61434ed 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V1_0.h
@@ -89,14 +89,14 @@
// 2 +5V +5V
// 1 GND GND
-#define EXP1_03_PIN PE14
-#define EXP1_04_PIN PE15
-#define EXP1_05_PIN PE9
-#define EXP1_06_PIN PE8
-#define EXP1_07_PIN PE10
-#define EXP1_08_PIN PE12
-#define EXP1_09_PIN PE11
-#define EXP1_10_PIN PE13
+#define EXP1_08_PIN PE14
+#define EXP1_07_PIN PE15
+#define EXP1_06_PIN PE9
+#define EXP1_05_PIN PE8
+#define EXP1_04_PIN PE10
+#define EXP1_03_PIN PE12
+#define EXP1_02_PIN PE11
+#define EXP1_01_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
@@ -111,12 +111,12 @@
// 2 +5V +5V
// 1 GND GND
-#define EXP2_03_PIN PB3
-#define EXP2_04_PIN PB5
-#define EXP2_05_PIN PB4
-#define EXP2_06_PIN PA15
-#define EXP2_07_PIN PA10
-#define EXP2_08_PIN PA9
+#define EXP2_08_PIN PB3
+#define EXP2_07_PIN PB5
+#define EXP2_06_PIN PB4
+#define EXP2_05_PIN PA15
+#define EXP2_04_PIN PA10
+#define EXP2_03_PIN PA9
// AUX1 connector
// 1 +5V
@@ -279,55 +279,55 @@
//
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
- #define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
- #define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
- #define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
- #define BEEPER_PIN EXP1_09_PIN
- #define KILL_PIN -1 // EXP1_10_PIN
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_03_PIN
- #define BTN_ENC EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
+ #define LCD_PINS_ENABLE EXP1_06_PIN // 6 DATA make sure for zonestar zm3e4!
+ #define LCD_PINS_D4 EXP1_04_PIN // 8 SCK make sure for zonestar zm3e4!
+ #define BEEPER_PIN EXP1_02_PIN
+ #define KILL_PIN -1 // EXP1_01_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_08_PIN
+ #define BTN_ENC EXP1_07_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
- #define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
- #define LCD_PINS_ENABLE EXP1_07_PIN // 6 DATA make sure for zonestar zm3e4!
- #define LCD_PINS_D4 EXP1_05_PIN // 8 SCK make sure for zonestar zm3e4!
- #define BEEPER_PIN EXP1_09_PIN
- #define KILL_PIN EXP2_04_PIN
- #define BTN_EN1 EXP2_05_PIN
- #define BTN_EN2 EXP2_07_PIN
- #define BTN_ENC EXP1_10_PIN
+ #define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
+ #define LCD_PINS_ENABLE EXP1_04_PIN // 6 DATA make sure for zonestar zm3e4!
+ #define LCD_PINS_D4 EXP1_06_PIN // 8 SCK make sure for zonestar zm3e4!
+ #define BEEPER_PIN EXP1_02_PIN
+ #define KILL_PIN EXP2_07_PIN
+ #define BTN_EN1 EXP2_06_PIN
+ #define BTN_EN2 EXP2_04_PIN
+ #define BTN_ENC EXP1_01_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
- #define BEEPER_PIN EXP2_06_PIN
+ #define BEEPER_PIN EXP2_05_PIN
#define KILL_PIN PC0
- #define BTN_EN1 EXP2_03_PIN
- #define BTN_EN2 EXP2_04_PIN
- #define BTN_ENC EXP2_05_PIN
+ #define BTN_EN1 EXP2_08_PIN
+ #define BTN_EN2 EXP2_07_PIN
+ #define BTN_ENC EXP2_06_PIN
#endif
#if ENABLED(ZONESTAR_LCD2004_KNOB)
#define LCDSCREEN_NAME "LCD2004 KNOB"
- #define LCD_PINS_RS EXP1_08_PIN
- #define LCD_PINS_ENABLE EXP1_07_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
- #define LCD_PINS_D5 EXP1_06_PIN
- #define LCD_PINS_D6 EXP1_03_PIN
- #define LCD_PINS_D7 EXP1_04_PIN
- #define BTN_EN1 EXP2_07_PIN
- #define BTN_EN2 EXP2_05_PIN
- #define BTN_ENC EXP1_10_PIN
- #define BEEPER_PIN EXP1_09_PIN
- #define KILL_PIN EXP2_04_PIN
+ #define LCD_PINS_RS EXP1_03_PIN
+ #define LCD_PINS_ENABLE EXP1_04_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D5 EXP1_05_PIN
+ #define LCD_PINS_D6 EXP1_08_PIN
+ #define LCD_PINS_D7 EXP1_07_PIN
+ #define BTN_EN1 EXP2_04_PIN
+ #define BTN_EN2 EXP2_06_PIN
+ #define BTN_ENC EXP1_01_PIN
+ #define BEEPER_PIN EXP1_02_PIN
+ #define KILL_PIN EXP2_07_PIN
#elif ENABLED(ZONESTAR_LCD2004_ADCKEY)
#define LCDSCREEN_NAME "LCD2004 5KEY"
- #define LCD_PINS_RS EXP1_08_PIN
- #define LCD_PINS_ENABLE EXP1_07_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
- #define LCD_PINS_D5 EXP1_06_PIN
- #define LCD_PINS_D6 EXP1_03_PIN
- #define LCD_PINS_D7 EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_03_PIN
+ #define LCD_PINS_ENABLE EXP1_04_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D5 EXP1_05_PIN
+ #define LCD_PINS_D6 EXP1_08_PIN
+ #define LCD_PINS_D7 EXP1_07_PIN
#define ADC_KEYPAD_PIN PC0 // PIN6 of AUX1
#endif
@@ -341,16 +341,16 @@
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
- #define BLTOUCH_PROBE_PIN EXP1_06_PIN
- #define BLTOUCH_GND_PIN EXP1_04_PIN
+ #define BLTOUCH_PROBE_PIN EXP1_05_PIN
+ #define BLTOUCH_GND_PIN EXP1_07_PIN
#undef SERVO0_PIN
- #define SERVO0_PIN EXP1_03_PIN
+ #define SERVO0_PIN EXP1_08_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
- #define BLTOUCH_PROBE_PIN EXP2_03_PIN
- #define BLTOUCH_GND_PIN EXP2_04_PIN
+ #define BLTOUCH_PROBE_PIN EXP2_08_PIN
+ #define BLTOUCH_GND_PIN EXP2_07_PIN
#undef SERVO0_PIN
- #define SERVO0_PIN EXP2_06_PIN
+ #define SERVO0_PIN EXP2_05_PIN
#else
#define BLTOUCH_PROBE_PIN PB13
#endif
diff --git a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
index df0eb9c3d81..f83ce52fe9a 100644
--- a/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
+++ b/Marlin/src/pins/stm32f1/pins_ZM3E4_V2_0.h
@@ -90,14 +90,14 @@
// 2 +5V
// 1 GND
-#define EXP1_03_PIN PE14
-#define EXP1_04_PIN PE15
-#define EXP1_05_PIN PE9
-#define EXP1_06_PIN PE8
-#define EXP1_07_PIN PE10
-#define EXP1_08_PIN PE12
-#define EXP1_09_PIN PE11
-#define EXP1_10_PIN PE13
+#define EXP1_08_PIN PE14
+#define EXP1_07_PIN PE15
+#define EXP1_06_PIN PE9
+#define EXP1_05_PIN PE8
+#define EXP1_04_PIN PE10
+#define EXP1_03_PIN PE12
+#define EXP1_02_PIN PE11
+#define EXP1_01_PIN PE13
// EXP2 connector
// MARK I/O ZONESTAR_LCD12864 REPRAPDISCOUNT_LCD12864
@@ -112,14 +112,14 @@
// 2 +5V
// 1 GND
-#define EXP2_03_PIN PB3
-#define EXP2_04_PIN PB5
-#define EXP2_05_PIN PB4
-#define EXP2_06_PIN PA15
-#define EXP2_07_PIN PA10
-#define EXP2_08_PIN PA9
-#define EXP2_09_PIN PE7
-#define EXP2_10_PIN PC0
+#define EXP2_08_PIN PB3
+#define EXP2_07_PIN PB5
+#define EXP2_06_PIN PB4
+#define EXP2_05_PIN PA15
+#define EXP2_04_PIN PA10
+#define EXP2_03_PIN PA9
+#define EXP2_02_PIN PE7
+#define EXP2_01_PIN PC0
// AUX1 connector
// 1 +5V
@@ -276,32 +276,32 @@
#if ENABLED(ZONESTAR_12864LCD)
#define LCDSCREEN_NAME "ZONESTAR LCD12864"
- #define LCD_PINS_RS EXP1_08_PIN // 7 CS make sure for zonestar zm3e4!
- #define LCD_PINS_ENABLE EXP1_05_PIN // 6 DATA make sure for zonestar zm3e4!
- #define LCD_PINS_D4 EXP1_07_PIN // 8 SCK make sure for zonestar zm3e4!
- #define BEEPER_PIN EXP1_09_PIN
- #define KILL_PIN -1 // EXP1_10_PIN
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_03_PIN
- #define BTN_ENC EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_03_PIN // 7 CS make sure for zonestar zm3e4!
+ #define LCD_PINS_ENABLE EXP1_06_PIN // 6 DATA make sure for zonestar zm3e4!
+ #define LCD_PINS_D4 EXP1_04_PIN // 8 SCK make sure for zonestar zm3e4!
+ #define BEEPER_PIN EXP1_02_PIN
+ #define KILL_PIN -1 // EXP1_01_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_08_PIN
+ #define BTN_ENC EXP1_07_PIN
#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define LCDSCREEN_NAME "REPRAPDISCOUNT LCD12864"
- #define LCD_PINS_RS EXP2_08_PIN // 7 CS make sure for zonestar zm3e4!
- #define LCD_PINS_ENABLE EXP2_05_PIN // 6 DATA make sure for zonestar zm3e4!
- #define LCD_PINS_D4 EXP2_07_PIN // 8 SCK make sure for zonestar zm3e4!
- #define BEEPER_PIN EXP2_10_PIN
- #define KILL_PIN EXP2_09_PIN
- #define BTN_EN1 EXP2_03_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP2_04_PIN
+ #define LCD_PINS_RS EXP2_03_PIN // 7 CS make sure for zonestar zm3e4!
+ #define LCD_PINS_ENABLE EXP2_06_PIN // 6 DATA make sure for zonestar zm3e4!
+ #define LCD_PINS_D4 EXP2_04_PIN // 8 SCK make sure for zonestar zm3e4!
+ #define BEEPER_PIN EXP2_01_PIN
+ #define KILL_PIN EXP2_02_PIN
+ #define BTN_EN1 EXP2_08_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP2_07_PIN
#elif ENABLED(ZONESTAR_DWIN_LCD)
// Connect to EXP2 connector
#define LCDSCREEN_NAME "ZONESTAR DWIN LCD"
- #define BEEPER_PIN EXP2_06_PIN // PE11
- #define KILL_PIN -1 // EXP1_10_PIN
- #define BTN_EN2 EXP2_04_PIN // PE8
- #define BTN_EN1 EXP2_03_PIN // PE14
- #define BTN_ENC EXP2_05_PIN // PE15
+ #define BEEPER_PIN EXP2_05_PIN // PE11
+ #define KILL_PIN -1 // EXP1_01_PIN
+ #define BTN_EN2 EXP2_07_PIN // PE8
+ #define BTN_EN1 EXP2_08_PIN // PE14
+ #define BTN_ENC EXP2_06_PIN // PE15
#endif
// Alter timing for graphical display
@@ -314,16 +314,16 @@
// Remap SERVO0 PIN for BLTouch
#if ENABLED(BLTOUCH_ON_EXP1)
// BLTouch connected to EXP1
- #define BLTOUCH_PROBE_PIN EXP1_06_PIN
- #define BLTOUCH_GND_PIN EXP1_04_PIN
+ #define BLTOUCH_PROBE_PIN EXP1_05_PIN
+ #define BLTOUCH_GND_PIN EXP1_07_PIN
#undef SERVO0_PIN
- #define SERVO0_PIN EXP1_03_PIN
+ #define SERVO0_PIN EXP1_08_PIN
#elif ENABLED(BLTOUCH_ON_EXP2)
// BLTouch connected to EXP2
- #define BLTOUCH_PROBE_PIN EXP2_03_PIN
- #define BLTOUCH_GND_PIN EXP2_04_PIN
+ #define BLTOUCH_PROBE_PIN EXP2_08_PIN
+ #define BLTOUCH_GND_PIN EXP2_07_PIN
#undef SERVO0_PIN
- #define SERVO0_PIN EXP2_06_PIN
+ #define SERVO0_PIN EXP2_05_PIN
#else
#define BLTOUCH_PROBE_PIN PB13 // Z1_MAX
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
index 531ab7a9581..aadce03c56c 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_BTT002_V1_0.h
@@ -199,109 +199,109 @@
/**
* ---------------------------------BTT002 V1.0---------------------------------
* ------ ------ |
- * (BEEPER) PE7 |10 9 | PB1 (BTN_ENC) (MISO) PA6 |10 9 | PA5 (SCK) |
- * (LCD_EN) PE9 | 8 7 | PE8 (LCD_RS) (BTN_EN1) PC5 | 8 7 | PA4 (SD_SS) |
- * (LCD_D4) PE10 6 5 | PE11 (LCD_D5) (BTN_EN2) PB0 6 5 | PA7 (MOSI) |
- * (LCD_D6) PE12 | 4 3 | PE13 (LCD_D7) (SD_DET) PC4 | 4 3 | RESET |
- * GND | 2 1 | 5V GND | 2 1 | PA3 |
+ * (BEEPER) PE7 | 1 2 | PB1 (BTN_ENC) (MISO) PA6 | 1 2 | PA5 (SCK) |
+ * (LCD_EN) PE9 | 3 4 | PE8 (LCD_RS) (BTN_EN1) PC5 | 3 4 | PA4 (SD_SS) |
+ * (LCD_D4) PE10 5 6 | PE11 (LCD_D5) (BTN_EN2) PB0 5 6 | PA7 (MOSI) |
+ * (LCD_D6) PE12 | 7 8 | PE13 (LCD_D7) (SD_DET) PC4 | 7 8 | RESET |
+ * GND | 9 10 | 5V GND | 9 10 | PA3 |
* ------ ------ |
* EXP1 EXP2 |
* ------------------------------------------------------------------------------
*/
-#define EXP1_03_PIN PE13
-#define EXP1_04_PIN PE12
-#define EXP1_05_PIN PE11
-#define EXP1_06_PIN PE10
-#define EXP1_07_PIN PE8
-#define EXP1_08_PIN PE9
-#define EXP1_09_PIN PB1
-#define EXP1_10_PIN PE7
+#define EXP1_08_PIN PE13
+#define EXP1_07_PIN PE12
+#define EXP1_06_PIN PE11
+#define EXP1_05_PIN PE10
+#define EXP1_04_PIN PE8
+#define EXP1_03_PIN PE9
+#define EXP1_02_PIN PB1
+#define EXP1_01_PIN PE7
-#define EXP2_01_PIN PA3
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PC4
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PB0
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PC5
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_10_PIN PA3
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PC4
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PB0
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PC5
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
// HAL SPI1 pins
-#define SD_SCK_PIN EXP2_09_PIN // SPI1 SCLK
-#define SD_SS_PIN EXP2_07_PIN // SPI1 SSEL
-#define SD_MISO_PIN EXP2_10_PIN // SPI1 MISO
-#define SD_MOSI_PIN EXP2_05_PIN // SPI1 MOSI
+#define SD_SCK_PIN EXP2_02_PIN // SPI1 SCLK
+#define SD_SS_PIN EXP2_04_PIN // SPI1 SSEL
+#define SD_MISO_PIN EXP2_01_PIN // SPI1 MISO
+#define SD_MOSI_PIN EXP2_06_PIN // SPI1 MOSI
-#define SDSS EXP2_07_PIN
+#define SDSS EXP2_04_PIN
//
// LCDs and Controllers
//
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
-
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
-
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
-
- #elif ENABLED(MKS_MINI_12864)
-
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
-
- #else
-
#define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
+ #elif ENABLED(MKS_MINI_12864)
+
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #else
+
+ #define LCD_PINS_RS EXP1_04_PIN
+
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
- #define DOGLCD_MISO EXP2_10_PIN
- #define DOGLCD_SCK EXP2_09_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
+ #define DOGLCD_MISO EXP2_01_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
#define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
index c7cd35c7ad8..ca257d257b5 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
@@ -186,11 +186,11 @@
/**
* BTT E3 RRF
* ------
- * (BEEPER) PE8 |10 9 | PE9 (BTN_ENC)
- * (BTN_EN1) PE7 | 8 7 | RESET
- * (BTN_EN2) PB2 6 5 | PE10 (LCD_D4)
- * (LCD_RS) PB1 | 4 3 | PE11 (LCD_EN)
- * GND | 2 1 | 5V
+ * (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC)
+ * (BTN_EN1) PE7 | 3 4 | RESET
+ * (BTN_EN2) PB2 5 6 | PE10 (LCD_D4)
+ * (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN)
+ * GND | 9 10 | 5V
* ------
* EXP1
*/
@@ -219,11 +219,11 @@
*
* BTT E3 RRF Display Ribbon
* ------ ------
- * (BEEPER) PE8 |10 9 | PE9 (BTN_ENC) GND |10 9 | 5V
- * (BTN_EN1) PE7 | 8 7 | RESET BEEPER | 8 7 | ESTOP (RESET)
- * (BTN_EN2) PB2 6 5 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 6 5 | LCD_SCLK (LCD_D4)
- * (LCD_RS) PB1 | 4 3 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 4 3 | LCD_DATA (LCD_EN)
- * GND | 2 1 | 5V (BTN_EN1) ENC_B | 2 1 | LCD_CS (LCD_RS)
+ * (BEEPER) PE8 | 1 2 | PE9 (BTN_ENC) GND | 1 2 | 5V
+ * (BTN_EN1) PE7 | 3 4 | RESET BEEPER | 3 4 | ESTOP (RESET)
+ * (BTN_EN2) PB2 5 6 | PE10 (LCD_D4) (BTN_ENC) ENC_BTN | 5 6 | LCD_SCLK (LCD_D4)
+ * (LCD_RS) PB1 | 7 8 | PE11 (LCD_EN) (BTN_EN2) ENC_A | 7 8 | LCD_DATA (LCD_EN)
+ * GND | 9 10 | 5V (BTN_EN1) ENC_B | 9 10 | LCD_CS (LCD_RS)
* ------ ------
* EXP1 Ribbon
*
@@ -286,11 +286,11 @@
*
* Board Display
* ------ ------
- * (SD_DET) PE8 |10 9 | PE9 (BEEPER) 5V |10 9 | GND
- * (MOD_RESET) PE7 | 8 7 | RESET -- | 8 7 | (SD_DET)
- * (SD_CS) PB2 6 5 | PE10 (MOSI) 6 5 | --
- * (LCD_CS) PB1 | 4 3 | PE11 (SD_CS) | 4 3 | (LCD_CS)
- * GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
+ * (SD_DET) PE8 | 1 2 | PE9 (BEEPER) 5V | 1 2 | GND
+ * (MOD_RESET) PE7 | 3 4 | RESET -- | 3 4 | (SD_DET)
+ * (SD_CS) PB2 5 6 | PE10 (MOSI) 5 6 | --
+ * (LCD_CS) PB1 | 7 8 | PE11 (SD_CS) | 7 8 | (LCD_CS)
+ * GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
@@ -341,11 +341,11 @@
*
* Board Display
* ------ ------
- * (SD_DET) PE8 |10 9 | PE9 (BEEPER) 5V |10 9 | GND
- * (MOD_RESET) PE7 | 8 7 | RESET RESET | 8 7 | (SD_DET)
- * (SD_CS) PB2 6 5 | PE10 (MOSI) | 6 5 | (LCD_CS)
- * (LCD_CS) PB1 | 4 3 | PE11 (SD_CS) | 4 3 | (MOD_RESET)
- * GND | 2 1 | 5V (SCK) | 2 1 | (MISO)
+ * (SD_DET) PE8 | 1 2 | PE9 (BEEPER) 5V | 1 2 | GND
+ * (MOD_RESET) PE7 | 3 4 | RESET RESET | 3 4 | (SD_DET)
+ * (SD_CS) PB2 5 6 | PE10 (MOSI) | 5 6 | (LCD_CS)
+ * (LCD_CS) PB1 | 7 8 | PE11 (SD_CS) | 7 8 | (MOD_RESET)
+ * GND | 9 10 | 5V (SCK) | 9 10 | (MISO)
* ------ ------
* EXP1 EXP1
*
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
index b9525a9267a..b341f3ae074 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_GTR_V1_0.h
@@ -348,8 +348,8 @@
//
#if SD_CONNECTION_IS(LCD)
- #define SD_DETECT_PIN EXP2_04_PIN
- #define SDSS EXP2_07_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#elif SD_CONNECTION_IS(ONBOARD)
@@ -366,112 +366,112 @@
/**
* ------ ------
- * (BEEPER) PC11 |10 9 | PA15 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SCK)
- * (LCD_EN) PC10 | 8 7 | PA8 (LCD_RS) (BTN_EN1) PD10 | 8 7 | PB12 (SD_SS)
- * (LCD_D4) PG8 6 5 | PG7 (LCD_D5) (BTN_EN2) PH10 6 5 | PB15 (MOSI)
- * (LCD_D6) PG6 | 4 3 | PG5 (LCD_D7) (SD_DETECT) PB10 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PC11 | 1 2 | PA15 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SCK)
+ * (LCD_EN) PC10 | 3 4 | PA8 (LCD_RS) (BTN_EN1) PD10 | 3 4 | PB12 (SD_SS)
+ * (LCD_D4) PG8 5 6 | PG7 (LCD_D5) (BTN_EN2) PH10 5 6 | PB15 (MOSI)
+ * (LCD_D6) PG6 | 7 8 | PG5 (LCD_D7) (SD_DETECT) PB10 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PG5
-#define EXP1_04_PIN PG6
-#define EXP1_05_PIN PG7
-#define EXP1_06_PIN PG8
-#define EXP1_07_PIN PA8
-#define EXP1_08_PIN PC10
-#define EXP1_09_PIN PA15
-#define EXP1_10_PIN PC11
+#define EXP1_08_PIN PG5
+#define EXP1_07_PIN PG6
+#define EXP1_06_PIN PG7
+#define EXP1_05_PIN PG8
+#define EXP1_04_PIN PA8
+#define EXP1_03_PIN PC10
+#define EXP1_02_PIN PA15
+#define EXP1_01_PIN PC11
-#define EXP2_04_PIN PB10
-#define EXP2_05_PIN PB15
-#define EXP2_06_PIN PH10
-#define EXP2_07_PIN PB12
-#define EXP2_08_PIN PD10
-#define EXP2_09_PIN PB13
-#define EXP2_10_PIN PB14
+#define EXP2_07_PIN PB10
+#define EXP2_06_PIN PB15
+#define EXP2_05_PIN PH10
+#define EXP2_04_PIN PB12
+#define EXP2_03_PIN PD10
+#define EXP2_02_PIN PB13
+#define EXP2_01_PIN PB14
//
// LCDs and Controllers
//
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
- #define TFT_CS_PIN EXP2_07_PIN
- #define TFT_A0_PIN EXP2_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
+ #define TFT_CS_PIN EXP2_04_PIN
+ #define TFT_A0_PIN EXP2_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
- #define TOUCH_INT_PIN EXP1_04_PIN
- #define TOUCH_MISO_PIN EXP1_05_PIN
- #define TOUCH_MOSI_PIN EXP1_08_PIN
- #define TOUCH_SCK_PIN EXP1_06_PIN
- #define TOUCH_CS_PIN EXP1_07_PIN
- #define BTN_ENC EXP1_09_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define TOUCH_INT_PIN EXP1_07_PIN
+ #define TOUCH_MISO_PIN EXP1_06_PIN
+ #define TOUCH_MOSI_PIN EXP1_03_PIN
+ #define TOUCH_SCK_PIN EXP1_05_PIN
+ #define TOUCH_CS_PIN EXP1_04_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define SOFTWARE_SPI
#endif
#else
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define SOFTWARE_SPI
#endif
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
index 4255881baf8..8f04ae1d73c 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
@@ -322,31 +322,31 @@
#endif
/** ------ ------
- * (BEEPER) PE8 |10 9 | PE7 (BTN_ENC) (MISO) PA6 |10 9 | PA5 (SCK)
- * (LCD_EN) PE9 | 8 7 | PE10 (LCD_RS) (BTN_EN1) PB2 | 8 7 | PA4 (SD_SS)
- * (LCD_D4) PE12 6 5 | PE13 (LCD_D5) (BTN_EN2) PB1 6 5 | PA7 (MOSI)
- * (LCD_D6) PE14 | 4 3 | PE15 (LCD_D7) (SD_DETECT) PC15 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PE8 | 1 2 | PE7 (BTN_ENC) (MISO) PA6 | 1 2 | PA5 (SCK)
+ * (LCD_EN) PE9 | 3 4 | PE10 (LCD_RS) (BTN_EN1) PB2 | 3 4 | PA4 (SD_SS)
+ * (LCD_D4) PE12 5 6 | PE13 (LCD_D5) (BTN_EN2) PB1 5 6 | PA7 (MOSI)
+ * (LCD_D6) PE14 | 7 8 | PE15 (LCD_D7) (SD_DETECT) PC15 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PE15
-#define EXP1_04_PIN PE14
-#define EXP1_05_PIN PE13
-#define EXP1_06_PIN PE12
-#define EXP1_07_PIN PE10
-#define EXP1_08_PIN PE9
-#define EXP1_09_PIN PE7
-#define EXP1_10_PIN PE8
+#define EXP1_08_PIN PE15
+#define EXP1_07_PIN PE14
+#define EXP1_06_PIN PE13
+#define EXP1_05_PIN PE12
+#define EXP1_04_PIN PE10
+#define EXP1_03_PIN PE9
+#define EXP1_02_PIN PE7
+#define EXP1_01_PIN PE8
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PC15
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PB2
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PB1
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PC15
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PB2
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PB1
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// Onboard SD card
@@ -376,45 +376,45 @@
#if ENABLED(BTT_MOTOR_EXPANSION)
/**
* ------ ------
- * M3DIAG |10 9 | M3RX M3STP |10 9 | M3DIR
- * M2DIAG | 8 7 | M2RX M2STP | 8 7 | M2DIR
- * M1DIAG 6 5 | M1RX M1DIR 6 5 | M1STP
- * M3EN | 4 3 | M2EN M1EN | 4 3 | --
- * GND | 2 1 | -- GND | 2 1 | --
+ * M3DIAG | 1 2 | M3RX M3STP | 1 2 | M3DIR
+ * M2DIAG | 3 4 | M2RX M2STP | 3 4 | M2DIR
+ * M1DIAG 5 6 | M1RX M1DIR 5 6 | M1STP
+ * M3EN | 7 8 | M2EN M1EN | 7 8 | --
+ * GND | 9 10 | -- GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
// M1 on Driver Expansion Module
- #define E4_STEP_PIN EXP2_05_PIN
- #define E4_DIR_PIN EXP2_06_PIN
- #define E4_ENABLE_PIN EXP2_04_PIN
- #define E4_DIAG_PIN EXP1_06_PIN
- #define E4_CS_PIN EXP1_05_PIN
+ #define E4_STEP_PIN EXP2_06_PIN
+ #define E4_DIR_PIN EXP2_05_PIN
+ #define E4_ENABLE_PIN EXP2_07_PIN
+ #define E4_DIAG_PIN EXP1_05_PIN
+ #define E4_CS_PIN EXP1_06_PIN
#if HAS_TMC_UART
- #define E4_SERIAL_TX_PIN EXP1_05_PIN
+ #define E4_SERIAL_TX_PIN EXP1_06_PIN
#define E4_SERIAL_RX_PIN E4_SERIAL_TX_PIN
#endif
// M2 on Driver Expansion Module
- #define E5_STEP_PIN EXP2_08_PIN
- #define E5_DIR_PIN EXP2_07_PIN
- #define E5_ENABLE_PIN EXP1_03_PIN
- #define E5_DIAG_PIN EXP1_08_PIN
- #define E5_CS_PIN EXP1_07_PIN
+ #define E5_STEP_PIN EXP2_03_PIN
+ #define E5_DIR_PIN EXP2_04_PIN
+ #define E5_ENABLE_PIN EXP1_08_PIN
+ #define E5_DIAG_PIN EXP1_03_PIN
+ #define E5_CS_PIN EXP1_04_PIN
#if HAS_TMC_UART
- #define E5_SERIAL_TX_PIN EXP1_07_PIN
+ #define E5_SERIAL_TX_PIN EXP1_04_PIN
#define E5_SERIAL_RX_PIN E5_SERIAL_TX_PIN
#endif
// M3 on Driver Expansion Module
- #define E6_STEP_PIN EXP2_10_PIN
- #define E6_DIR_PIN EXP2_09_PIN
- #define E6_ENABLE_PIN EXP1_04_PIN
- #define E6_DIAG_PIN EXP1_10_PIN
- #define E6_CS_PIN EXP1_09_PIN
+ #define E6_STEP_PIN EXP2_01_PIN
+ #define E6_DIR_PIN EXP2_02_PIN
+ #define E6_ENABLE_PIN EXP1_07_PIN
+ #define E6_DIAG_PIN EXP1_01_PIN
+ #define E6_CS_PIN EXP1_02_PIN
#if HAS_TMC_UART
- #define E6_SERIAL_TX_PIN EXP1_09_PIN
+ #define E6_SERIAL_TX_PIN EXP1_02_PIN
#define E6_SERIAL_RX_PIN E6_SERIAL_TX_PIN
#endif
@@ -426,58 +426,58 @@
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
-
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
-
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
-
- #else
-
#define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
+ #else
+
+ #define LCD_PINS_RS EXP1_04_PIN
+
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -496,21 +496,21 @@
#endif
#if HAS_SPI_TFT
- #define TFT_CS_PIN EXP2_07_PIN
- #define TFT_A0_PIN EXP2_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
+ #define TFT_CS_PIN EXP2_04_PIN
+ #define TFT_A0_PIN EXP2_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
- #define TOUCH_INT_PIN EXP1_04_PIN
- #define TOUCH_MISO_PIN EXP1_05_PIN
- #define TOUCH_MOSI_PIN EXP1_08_PIN
- #define TOUCH_SCK_PIN EXP1_06_PIN
- #define TOUCH_CS_PIN EXP1_07_PIN
+ #define TOUCH_INT_PIN EXP1_07_PIN
+ #define TOUCH_MISO_PIN EXP1_06_PIN
+ #define TOUCH_MOSI_PIN EXP1_03_PIN
+ #define TOUCH_SCK_PIN EXP1_05_PIN
+ #define TOUCH_CS_PIN EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
//
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
index 7c902b008cf..9b49f27670c 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
@@ -313,31 +313,31 @@
#endif
/** ------ ------
- * (BEEPER) PG4 |10 9 | PA8 (BTN_ENC) (MISO) PB14 |10 9 | PB13 (SCK)
- * (LCD_EN) PD11 | 8 7 | PD10 (LCD_RS) (BTN_EN1) PG10 | 8 7 | PB12 (SD_SS)
- * (LCD_D4) PG2 6 5 | PG3 (LCD_D5) (BTN_EN2) PF11 6 5 | PB15 (MOSI)
- * (LCD_D6) PG6 | 4 3 | PG7 (LCD_D7) (SD_DETECT) PF12 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PG4 | 1 2 | PA8 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SCK)
+ * (LCD_EN) PD11 | 3 4 | PD10 (LCD_RS) (BTN_EN1) PG10 | 3 4 | PB12 (SD_SS)
+ * (LCD_D4) PG2 5 6 | PG3 (LCD_D5) (BTN_EN2) PF11 5 6 | PB15 (MOSI)
+ * (LCD_D6) PG6 | 7 8 | PG7 (LCD_D7) (SD_DETECT) PF12 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PG7
-#define EXP1_04_PIN PG6
-#define EXP1_05_PIN PG3
-#define EXP1_06_PIN PG2
-#define EXP1_07_PIN PD10
-#define EXP1_08_PIN PD11
-#define EXP1_09_PIN PA8
-#define EXP1_10_PIN PG4
+#define EXP1_08_PIN PG7
+#define EXP1_07_PIN PG6
+#define EXP1_06_PIN PG3
+#define EXP1_05_PIN PG2
+#define EXP1_04_PIN PD10
+#define EXP1_03_PIN PD11
+#define EXP1_02_PIN PA8
+#define EXP1_01_PIN PG4
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PF12
-#define EXP2_05_PIN PB15
-#define EXP2_06_PIN PF11
-#define EXP2_07_PIN PB12
-#define EXP2_08_PIN PG10
-#define EXP2_09_PIN PB13
-#define EXP2_10_PIN PB14
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PF12
+#define EXP2_06_PIN PB15
+#define EXP2_05_PIN PF11
+#define EXP2_04_PIN PB12
+#define EXP2_03_PIN PG10
+#define EXP2_02_PIN PB13
+#define EXP2_01_PIN PB14
//
// Onboard SD card
@@ -345,8 +345,8 @@
//
#if SD_CONNECTION_IS(LCD)
- #define SD_DETECT_PIN EXP2_04_PIN
- #define SDSS EXP2_07_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#elif SD_CONNECTION_IS(ONBOARD)
@@ -379,46 +379,46 @@
*/
// M1 on Driver Expansion Module
- #define E3_STEP_PIN EXP2_05_PIN
- #define E3_DIR_PIN EXP2_06_PIN
- #define E3_ENABLE_PIN EXP2_04_PIN
+ #define E3_STEP_PIN EXP2_06_PIN
+ #define E3_DIR_PIN EXP2_05_PIN
+ #define E3_ENABLE_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E3_DIAG_PIN EXP1_06_PIN
- #define E3_CS_PIN EXP1_05_PIN
+ #define E3_DIAG_PIN EXP1_05_PIN
+ #define E3_CS_PIN EXP1_06_PIN
#if HAS_TMC_UART
- #define E3_SERIAL_TX_PIN EXP1_05_PIN
- #define E3_SERIAL_RX_PIN EXP1_05_PIN
+ #define E3_SERIAL_TX_PIN EXP1_06_PIN
+ #define E3_SERIAL_RX_PIN EXP1_06_PIN
#endif
#endif
// M2 on Driver Expansion Module
- #define E4_STEP_PIN EXP2_08_PIN
- #define E4_DIR_PIN EXP2_07_PIN
+ #define E4_STEP_PIN EXP2_03_PIN
+ #define E4_DIR_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E4_ENABLE_PIN EXP1_03_PIN
- #define E4_DIAG_PIN EXP1_08_PIN
- #define E4_CS_PIN EXP1_07_PIN
+ #define E4_ENABLE_PIN EXP1_08_PIN
+ #define E4_DIAG_PIN EXP1_03_PIN
+ #define E4_CS_PIN EXP1_04_PIN
#if HAS_TMC_UART
- #define E4_SERIAL_TX_PIN EXP1_07_PIN
- #define E4_SERIAL_RX_PIN EXP1_07_PIN
+ #define E4_SERIAL_TX_PIN EXP1_04_PIN
+ #define E4_SERIAL_RX_PIN EXP1_04_PIN
#endif
#else
- #define E4_ENABLE_PIN EXP2_04_PIN
+ #define E4_ENABLE_PIN EXP2_07_PIN
#endif
// M3 on Driver Expansion Module
- #define E5_STEP_PIN EXP2_10_PIN
- #define E5_DIR_PIN EXP2_09_PIN
+ #define E5_STEP_PIN EXP2_01_PIN
+ #define E5_DIR_PIN EXP2_02_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E5_ENABLE_PIN EXP1_04_PIN
- #define E5_DIAG_PIN EXP1_10_PIN
- #define E5_CS_PIN EXP1_09_PIN
+ #define E5_ENABLE_PIN EXP1_07_PIN
+ #define E5_DIAG_PIN EXP1_01_PIN
+ #define E5_CS_PIN EXP1_02_PIN
#if HAS_TMC_UART
- #define E5_SERIAL_TX_PIN EXP1_09_PIN
- #define E5_SERIAL_RX_PIN EXP1_09_PIN
+ #define E5_SERIAL_TX_PIN EXP1_02_PIN
+ #define E5_SERIAL_RX_PIN EXP1_02_PIN
#endif
#else
- #define E5_ENABLE_PIN EXP2_04_PIN
+ #define E5_ENABLE_PIN EXP2_07_PIN
#endif
#endif // BTT_MOTOR_EXPANSION
@@ -429,30 +429,30 @@
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#elif ENABLED(WYH_L12864)
@@ -470,59 +470,59 @@
*
* BEFORE AFTER
* ------ ------
- * -- |10 9 | MOSI -- |10 9 | MOSI
- * BTN_ENC | 8 7 | SCK BTN_ENC | 8 7 | SCK
- * BTN_EN1 | 6 5 SID BTN_EN1 | 6 5 SID
- * BTN_EN2 | 4 3 | CS BTN_EN2 | 4 3 | CS
- * 5V | 2 1 | GND GND | 2 1 | 5V
+ * -- | 1 2 | MOSI -- | 1 2 | MOSI
+ * 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
* ------ ------
* LCD LCD
*/
#undef BEEPER_PIN
#undef BTN_ENC
- #define BTN_EN1 EXP1_06_PIN
- #define BTN_EN2 EXP1_04_PIN
- #define BTN_ENC EXP1_08_PIN
- #define DOGLCD_CS EXP1_03_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_07_PIN
- #define DOGLCD_MOSI EXP1_09_PIN
+ #define BTN_EN1 EXP1_05_PIN
+ #define BTN_EN2 EXP1_07_PIN
+ #define BTN_ENC EXP1_03_PIN
+ #define DOGLCD_CS EXP1_08_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_04_PIN
+ #define DOGLCD_MOSI EXP1_02_PIN
#define LCD_BACKLIGHT_PIN -1
#else
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -553,10 +553,10 @@
/**
* ------
- * RX | 8 7 | 3.3V GPIO0 PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
- * GPIO0 | 6 5 | Reset GPIO2 PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
- * GPIO2 | 4 3 | Enable Reset PG0 ... active low, probably OK to leave floating
- * GND | 2 1 | TX Enable PG1 ... Must be high for module to run
+ * RX | 3 4 | 3.3V GPIO0 PF14 ... Leave as unused (ESP3D software configures this with a pullup so OK to leave as floating)
+ * GPIO0 | 5 6 | Reset GPIO2 PF15 ... must be high (ESP3D software configures this with a pullup so OK to leave as floating)
+ * GPIO2 | 7 8 | Enable Reset PG0 ... active low, probably OK to leave floating
+ * GND | 9 10 | TX Enable PG1 ... Must be high for module to run
* ------
* W1
*/
diff --git a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
index 4e311d48628..9c22ac804da 100644
--- a/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
+++ b/Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
@@ -336,43 +336,43 @@
/**
* ------ ------
- * (BEEPER) PC5 |10 9 | PB0 (BTN_ENC) (MISO) PA6 |10 9 | PA5 (SCK)
- * (LCD_EN) PB1 | 8 7 | PE9 (LCD_RS) (BTN_EN1) PE7 | 8 7 | PA4 (SD_SS)
- * (LCD_D4) PE10 | 6 5 PE11 (LCD_D5) (BTN_EN2) PB2 | 6 5 PA7 (MOSI)
- * (LCD_D6) PE12 | 4 3 | PE13 (LCD_D7) (SD_DETECT) PC4 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PC5 | 1 2 | PB0 (BTN_ENC) (MISO) PA6 | 1 2 | PA5 (SCK)
+ * (LCD_EN) PB1 | 3 4 | PE9 (LCD_RS) (BTN_EN1) PE7 | 3 4 | PA4 (SD_SS)
+ * (LCD_D4) PE10 | 5 6 PE11 (LCD_D5) (BTN_EN2) PB2 | 5 6 PA7 (MOSI)
+ * (LCD_D6) PE12 | 7 8 | PE13 (LCD_D7) (SD_DETECT) PC4 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PE13
-#define EXP1_04_PIN PE12
-#define EXP1_05_PIN PE11
-#define EXP1_06_PIN PE10
-#define EXP1_07_PIN PE9
-#define EXP1_08_PIN PB1
-#define EXP1_09_PIN PB0
-#define EXP1_10_PIN PC5
+#define EXP1_08_PIN PE13
+#define EXP1_07_PIN PE12
+#define EXP1_06_PIN PE11
+#define EXP1_05_PIN PE10
+#define EXP1_04_PIN PE9
+#define EXP1_03_PIN PB1
+#define EXP1_02_PIN PB0
+#define EXP1_01_PIN PC5
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PC4
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PB2
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PE7
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PC4
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PB2
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PE7
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// Onboard SD card
// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
//
#if SD_CONNECTION_IS(LCD)
- #define SDSS EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#define SD_SS_PIN SDSS
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif SD_CONNECTION_IS(ONBOARD)
#define SDIO_SUPPORT // Use SDIO for onboard SD
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
@@ -393,46 +393,46 @@
*/
// M1 on Driver Expansion Module
- #define E2_STEP_PIN EXP2_05_PIN
- #define E2_DIR_PIN EXP2_06_PIN
- #define E2_ENABLE_PIN EXP2_04_PIN
+ #define E2_STEP_PIN EXP2_06_PIN
+ #define E2_DIR_PIN EXP2_05_PIN
+ #define E2_ENABLE_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E2_DIAG_PIN EXP1_06_PIN
- #define E2_CS_PIN EXP1_05_PIN
+ #define E2_DIAG_PIN EXP1_05_PIN
+ #define E2_CS_PIN EXP1_06_PIN
#if HAS_TMC_UART
- #define E2_SERIAL_TX_PIN EXP1_05_PIN
- #define E2_SERIAL_RX_PIN EXP1_05_PIN
+ #define E2_SERIAL_TX_PIN EXP1_06_PIN
+ #define E2_SERIAL_RX_PIN EXP1_06_PIN
#endif
#endif
// M2 on Driver Expansion Module
- #define E3_STEP_PIN EXP2_08_PIN
- #define E3_DIR_PIN EXP2_07_PIN
+ #define E3_STEP_PIN EXP2_03_PIN
+ #define E3_DIR_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E3_ENABLE_PIN EXP1_03_PIN
- #define E3_DIAG_PIN EXP1_08_PIN
- #define E3_CS_PIN EXP1_07_PIN
+ #define E3_ENABLE_PIN EXP1_08_PIN
+ #define E3_DIAG_PIN EXP1_03_PIN
+ #define E3_CS_PIN EXP1_04_PIN
#if HAS_TMC_UART
- #define E3_SERIAL_TX_PIN EXP1_07_PIN
- #define E3_SERIAL_RX_PIN EXP1_07_PIN
+ #define E3_SERIAL_TX_PIN EXP1_04_PIN
+ #define E3_SERIAL_RX_PIN EXP1_04_PIN
#endif
#else
- #define E3_ENABLE_PIN EXP2_04_PIN
+ #define E3_ENABLE_PIN EXP2_07_PIN
#endif
// M3 on Driver Expansion Module
- #define E4_STEP_PIN EXP2_10_PIN
- #define E4_DIR_PIN EXP2_09_PIN
+ #define E4_STEP_PIN EXP2_01_PIN
+ #define E4_DIR_PIN EXP2_02_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E4_ENABLE_PIN EXP1_04_PIN
- #define E4_DIAG_PIN EXP1_10_PIN
- #define E4_CS_PIN EXP1_09_PIN
+ #define E4_ENABLE_PIN EXP1_07_PIN
+ #define E4_DIAG_PIN EXP1_01_PIN
+ #define E4_CS_PIN EXP1_02_PIN
#if HAS_TMC_UART
- #define E4_SERIAL_TX_PIN EXP1_09_PIN
- #define E4_SERIAL_RX_PIN EXP1_09_PIN
+ #define E4_SERIAL_TX_PIN EXP1_02_PIN
+ #define E4_SERIAL_RX_PIN EXP1_02_PIN
#endif
#else
- #define E4_ENABLE_PIN EXP2_04_PIN
+ #define E4_ENABLE_PIN EXP2_07_PIN
#endif
#endif // BTT_MOTOR_EXPANSION
@@ -443,65 +443,65 @@
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
-
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
-
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
-
- #elif ENABLED(MKS_MINI_12864)
-
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
-
- #else
-
#define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
+ #elif ENABLED(MKS_MINI_12864)
+
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #else
+
+ #define LCD_PINS_RS EXP1_04_PIN
+
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -528,24 +528,24 @@
#if HAS_SPI_TFT
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
//
// e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
//
- #define TFT_CS_PIN EXP2_07_PIN
- #define TFT_A0_PIN EXP2_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
+ #define TFT_CS_PIN EXP2_04_PIN
+ #define TFT_A0_PIN EXP2_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
- #define TOUCH_INT_PIN EXP1_04_PIN
- #define TOUCH_MISO_PIN EXP1_05_PIN
- #define TOUCH_MOSI_PIN EXP1_08_PIN
- #define TOUCH_SCK_PIN EXP1_06_PIN
- #define TOUCH_CS_PIN EXP1_07_PIN
+ #define TOUCH_INT_PIN EXP1_07_PIN
+ #define TOUCH_MISO_PIN EXP1_06_PIN
+ #define TOUCH_MOSI_PIN EXP1_03_PIN
+ #define TOUCH_SCK_PIN EXP1_05_PIN
+ #define TOUCH_CS_PIN EXP1_04_PIN
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
index 11b5dbbb6cc..b98dcbf5d77 100644
--- a/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
+++ b/Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
@@ -177,31 +177,31 @@
/**
* ------ ------
- * PB10 |10 9 | PE15 PB14 |10 9 | PB13
- * PE14 | 8 7 | PE12 PC5 | 8 7 | PF11
- * PE10 6 5 | PE9 PC4 6 5 | PB15
- * PE8 | 4 3 | PE7 PB2 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * PB10 | 1 2 | PE15 PB14 | 1 2 | PB13
+ * PE14 | 3 4 | PE12 PC5 | 3 4 | PF11
+ * PE10 5 6 | PE9 PC4 5 6 | PB15
+ * PE8 | 7 8 | PE7 PB2 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PE7
-#define EXP1_04_PIN PE8
-#define EXP1_05_PIN PE9
-#define EXP1_06_PIN PE10
-#define EXP1_07_PIN PE12
-#define EXP1_08_PIN PE14
-#define EXP1_09_PIN PE15
-#define EXP1_10_PIN PB10
+#define EXP1_08_PIN PE7
+#define EXP1_07_PIN PE8
+#define EXP1_06_PIN PE9
+#define EXP1_05_PIN PE10
+#define EXP1_04_PIN PE12
+#define EXP1_03_PIN PE14
+#define EXP1_02_PIN PE15
+#define EXP1_01_PIN PB10
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PB2
-#define EXP2_05_PIN PB15
-#define EXP2_06_PIN PC4
-#define EXP2_07_PIN PF11
-#define EXP2_08_PIN PC5
-#define EXP2_09_PIN PB13
-#define EXP2_10_PIN PB14
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PB2
+#define EXP2_06_PIN PB15
+#define EXP2_05_PIN PC4
+#define EXP2_04_PIN PF11
+#define EXP2_03_PIN PC5
+#define EXP2_02_PIN PB13
+#define EXP2_01_PIN PB14
//
// Onboard SD support
@@ -226,11 +226,11 @@
#elif SD_CONNECTION_IS(LCD)
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SDSS EXP2_07_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
@@ -239,13 +239,13 @@
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_SCK
- #define TMC_SW_SCK EXP2_09_PIN
+ #define TMC_SW_SCK EXP2_02_PIN
#endif
#ifndef TMC_SW_MISO
- #define TMC_SW_MISO EXP2_10_PIN
+ #define TMC_SW_MISO EXP2_01_PIN
#endif
#ifndef TMC_SW_MOSI
- #define TMC_SW_MOSI EXP2_05_PIN
+ #define TMC_SW_MOSI EXP2_06_PIN
#endif
#endif
@@ -286,16 +286,16 @@
// LCD / Controller
//
#if IS_RRD_SC
- #define BEEPER_PIN EXP1_10_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
//
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
index 29aff20ffd4..f59c6718d56 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
@@ -140,100 +140,100 @@
/**
* ------ ------
- * (SD_MISO) PA6 |10 9 | PA5 (SD_SCK) (BEEPER) PC9 |10 9 | PC12 (BTN_ENC)
- * (BTN_EN1) PC10 | 8 7 | PA4 (SD_SS) (LCD_EN) PB15 | 8 7 | PB12 (LCD_RS)
- * (BTN_EN2) PC11 6 5 | PA7 (SD_MOSI) (LCD_D4) PB13 6 5 | PB14 (LCD_D5)
- * (SD_DETECT) PC3 | 4 3 | RESET (LCD_D6) PB6 | 4 3 | PB7 (LCD_D7)
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * (SD_MISO) PA6 | 1 2 | PA5 (SD_SCK) (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
+ * (BTN_EN1) PC10 | 3 4 | PA4 (SD_SS) (LCD_EN) PB15 | 3 4 | PB12 (LCD_RS)
+ * (BTN_EN2) PC11 5 6 | PA7 (SD_MOSI) (LCD_D4) PB13 5 6 | PB14 (LCD_D5)
+ * (SD_DETECT) PC3 | 7 8 | RESET (LCD_D6) PB6 | 7 8 | PB7 (LCD_D7)
+ * GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP2 EXP1
*/
/**
* ------
- * 5V |10 9 | GND
- * (LCD_EN/MOSI) PB15 | 8 7 | PB12 (LCD_RS)
- * (LCD_D4/SCK) PB13 6 5 | PC11 (BTN_EN2)
- * (LCD_D5/MISO) PB14 | 4 3 | PC10 (BTN_EN1)
- * (BTN_ENC) PC12 | 2 1 | PC9 (BEEPER)
+ * 5V | 1 2 | GND
+ * (LCD_EN/MOSI) PB15 | 3 4 | PB12 (LCD_RS)
+ * (LCD_D4/SCK) PB13 5 6 | PC11 (BTN_EN2)
+ * (LCD_D5/MISO) PB14 | 7 8 | PC10 (BTN_EN1)
+ * (BTN_ENC) PC12 | 9 10 | PC9 (BEEPER)
* ------
* EXP3
*/
-#define EXP1_03_PIN PB7
-#define EXP1_04_PIN PB6
-#define EXP1_05_PIN PB14
-#define EXP1_06_PIN PB13
-#define EXP1_07_PIN PB12
-#define EXP1_08_PIN PB15
-#define EXP1_09_PIN PC12
-#define EXP1_10_PIN PC9
+#define EXP1_08_PIN PB7
+#define EXP1_07_PIN PB6
+#define EXP1_06_PIN PB14
+#define EXP1_05_PIN PB13
+#define EXP1_04_PIN PB12
+#define EXP1_03_PIN PB15
+#define EXP1_02_PIN PC12
+#define EXP1_01_PIN PC9
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PC3
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PC11
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PC10
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PC3
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PC11
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PC10
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
#if HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#elif ENABLED(MKS_MINI_12864)
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#else
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define BTN_EN1 EXP2_06_PIN
- #define BTN_EN2 EXP2_08_PIN
+ #define BTN_EN1 EXP2_05_PIN
+ #define BTN_EN2 EXP2_03_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -253,7 +253,7 @@
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
- #define BEEPER_PIN EXP1_10_PIN
- #define CLCD_MOD_RESET EXP2_08_PIN
- #define CLCD_SPI_CS EXP2_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define CLCD_MOD_RESET EXP2_03_PIN
+ #define CLCD_SPI_CS EXP2_05_PIN
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 3ed18f9abc6..e770140dbbc 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -199,117 +199,117 @@
/**
* ------ ------
- * PC9 |10 9 | PA8 PA6 |10 9 | PA5
- * PC11 | 8 7 | PD2 PC6 | 8 7 | PA4
- * PC10 6 5 | PC12 PC7 6 5 | PA7
- * PD0 | 4 3 | PD1 PB10 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 5V
+ * PC9 | 1 2 | PA8 PA6 | 1 2 | PA5
+ * PC11 | 3 4 | PD2 PC6 | 3 4 | PA4
+ * PC10 5 6 | PC12 PC7 5 6 | PA7
+ * PD0 | 7 8 | PD1 PB10 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 5V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PD1
-#define EXP1_04_PIN PD0
-#define EXP1_05_PIN PC12
-#define EXP1_06_PIN PC10
-#define EXP1_07_PIN PD2
-#define EXP1_08_PIN PC11
-#define EXP1_09_PIN PA8
-#define EXP1_10_PIN PC9
+#define EXP1_08_PIN PD1
+#define EXP1_07_PIN PD0
+#define EXP1_06_PIN PC12
+#define EXP1_05_PIN PC10
+#define EXP1_04_PIN PD2
+#define EXP1_03_PIN PC11
+#define EXP1_02_PIN PA8
+#define EXP1_01_PIN PC9
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PB10
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PC7
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PC6
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PB10
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PC7
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PC6
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// SPI / SD Card
//
-#define SD_SCK_PIN EXP2_09_PIN
-#define SD_MISO_PIN EXP2_10_PIN
-#define SD_MOSI_PIN EXP2_05_PIN
+#define SD_SCK_PIN EXP2_02_PIN
+#define SD_MISO_PIN EXP2_01_PIN
+#define SD_MOSI_PIN EXP2_06_PIN
-#define SDSS EXP2_07_PIN
-#define SD_DETECT_PIN EXP2_04_PIN
+#define SDSS EXP2_04_PIN
+#define SD_DETECT_PIN EXP2_07_PIN
//
// LCD / Controller
//
#if ENABLED(FYSETC_242_OLED_12864)
- #define BTN_EN1 EXP1_10_PIN
- #define BTN_EN2 EXP1_03_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_01_PIN
+ #define BTN_EN2 EXP1_08_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define BEEPER_PIN EXP2_08_PIN
+ #define BEEPER_PIN EXP2_03_PIN
- #define LCD_PINS_DC EXP1_05_PIN
- #define LCD_PINS_RS EXP2_06_PIN // LCD_RST
- #define DOGLCD_CS EXP1_07_PIN
- #define DOGLCD_MOSI EXP1_06_PIN
- #define DOGLCD_SCK EXP1_08_PIN
+ #define LCD_PINS_DC EXP1_06_PIN
+ #define LCD_PINS_RS EXP2_05_PIN // LCD_RST
+ #define DOGLCD_CS EXP1_04_PIN
+ #define DOGLCD_MOSI EXP1_05_PIN
+ #define DOGLCD_SCK EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define FORCE_SOFT_SPI
#define KILL_PIN -1 // NC
- #define NEOPIXEL_PIN EXP1_04_PIN
+ #define NEOPIXEL_PIN EXP1_07_PIN
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
-
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
-
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
-
- #else
-
#define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
-
- #define LCD_SDSS EXP2_07_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
+ #else
+
+ #define LCD_PINS_RS EXP1_04_PIN
+
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #define LCD_SDSS EXP2_04_PIN
+
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+
#if ENABLED(FYSETC_MINI_12864)
// See https://wiki.fysetc.com/Mini12864_Panel
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
#if ENABLED(FYSETC_GENERIC_12864_1_1)
- #define LCD_BACKLIGHT_PIN EXP1_04_PIN
+ #define LCD_BACKLIGHT_PIN EXP1_07_PIN
#endif
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
index cc02ac3097e..676333b89c2 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8_common.h
@@ -213,31 +213,31 @@
/**
* ------ ------
- * (BEEPER) PB2 |10 9 | PE10 (BTN_ENC) (SPI1 MISO) PA6 |10 9 | PA5 (SPI1 SCK)
- * (LCD_EN) PE11 | 8 7 | PD10 (LCD_RS) (BTN_EN1) PE9 | 8 7 | PA4 (SPI1 CS)
- * (LCD_D4) PD9 6 5 | PD8 (LCD_D5) (BTN_EN2) PE8 6 5 | PA7 (SPI1 MOSI)
- * (LCD_D6) PE15 | 4 3 | PE7 (LCD_D7) (SPI1_RS) PB11 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * (BEEPER) PB2 | 1 2 | PE10 (BTN_ENC) (SPI1 MISO) PA6 | 1 2 | PA5 (SPI1 SCK)
+ * (LCD_EN) PE11 | 3 4 | PD10 (LCD_RS) (BTN_EN1) PE9 | 3 4 | PA4 (SPI1 CS)
+ * (LCD_D4) PD9 5 6 | PD8 (LCD_D5) (BTN_EN2) PE8 5 6 | PA7 (SPI1 MOSI)
+ * (LCD_D6) PE15 | 7 8 | PE7 (LCD_D7) (SPI1_RS) PB11 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PE7
-#define EXP1_04_PIN PE15
-#define EXP1_05_PIN PD8
-#define EXP1_06_PIN PD9
-#define EXP1_07_PIN PD10
-#define EXP1_08_PIN PE11
-#define EXP1_09_PIN PE10
-#define EXP1_10_PIN PB2
+#define EXP1_08_PIN PE7
+#define EXP1_07_PIN PE15
+#define EXP1_06_PIN PD8
+#define EXP1_05_PIN PD9
+#define EXP1_04_PIN PD10
+#define EXP1_03_PIN PE11
+#define EXP1_02_PIN PE10
+#define EXP1_01_PIN PB2
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PB11
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PE8
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PE9
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PB11
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PE8
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PE9
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
#if ENABLED(SDSUPPORT)
#ifndef SDCARD_CONNECTION
@@ -253,25 +253,25 @@
#define SD_DETECT_PIN PC4 // SD_DETECT_PIN doesn't work with NO_SD_HOST_DRIVE disabled
#elif SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
- #define SDSS EXP2_07_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
#endif
#if EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI)
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
- #define TFT_DC_PIN EXP1_03_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
- #define LCD_BACKLIGHT_PIN EXP1_08_PIN
+ #define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@@ -284,10 +284,10 @@
#define TFT_HEIGHT 320
#endif
- #define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
- #define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
- #define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
- #define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
+ #define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
+ #define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
+ #define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
+ #define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
@@ -312,8 +312,8 @@
#elif HAS_WIRED_LCD
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
#define LCD_BACKLIGHT_PIN -1
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@@ -321,23 +321,23 @@
#define ENABLE_SPI1
#define FORCE_SOFT_SPI
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
//#define LCD_BACKLIGHT_PIN -1
//#define LCD_RESET_PIN -1
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define LCD_PINS_DC EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define LCD_PINS_DC EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN
- #define NEOPIXEL_PIN EXP1_05_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@@ -345,11 +345,11 @@
#else
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#endif
#define BOARD_ST7920_DELAY_1 96
@@ -361,8 +361,8 @@
#endif // HAS_WIRED_LCD
#if ANY(TFT_COLOR_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
index 989010e47f3..011d56dfe7a 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3_common.h
@@ -236,58 +236,58 @@
/**
* ------ ------
- * (BEEPER) PC5 |10 9 | PE13 (BTN_ENC) (SPI1 MISO) PA6 |10 9 | PA5 (SPI1 SCK)
- * (LCD_EN) PD13 | 8 7 | PC6 (LCD_RS) (BTN_EN1) PE8 | 8 7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14 6 5 | PE15 (LCD_D5) (BTN_EN2) PE11 6 5 | PA7 (SPI1 MOSI)
- * (LCD_D6) PD11 | 4 3 | PD10 (LCD_D7) (SPI1_RS) PE12 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * (BEEPER) PC5 | 1 2 | PE13 (BTN_ENC) (SPI1 MISO) PA6 | 1 2 | PA5 (SPI1 SCK)
+ * (LCD_EN) PD13 | 3 4 | PC6 (LCD_RS) (BTN_EN1) PE8 | 3 4 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14 5 6 | PE15 (LCD_D5) (BTN_EN2) PE11 5 6 | PA7 (SPI1 MOSI)
+ * (LCD_D6) PD11 | 7 8 | PD10 (LCD_D7) (SPI1_RS) PE12 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PD10
-#define EXP1_04_PIN PD11
-#define EXP1_05_PIN PE15
-#define EXP1_06_PIN PE14
-#define EXP1_07_PIN PC6
-#define EXP1_08_PIN PD13
-#define EXP1_09_PIN PE13
-#define EXP1_10_PIN PC5
+#define EXP1_08_PIN PD10
+#define EXP1_07_PIN PD11
+#define EXP1_06_PIN PE15
+#define EXP1_05_PIN PE14
+#define EXP1_04_PIN PC6
+#define EXP1_03_PIN PD13
+#define EXP1_02_PIN PE13
+#define EXP1_01_PIN PC5
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PE12
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PE11
-#define EXP2_07_PIN PE10
-#define EXP2_08_PIN PE8
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PE12
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PE11
+#define EXP2_04_PIN PE10
+#define EXP2_03_PIN PE8
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// SPI SD Card
//
#if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
- #define SDSS EXP2_07_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
//
// LCD / Controller
//
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
- #define TFT_DC_PIN EXP1_03_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
- #define LCD_BACKLIGHT_PIN EXP1_08_PIN
+ #define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@@ -300,10 +300,10 @@
#define TFT_HEIGHT 320
#endif
- #define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
- #define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
- #define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
- #define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
+ #define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
+ #define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
+ #define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
+ #define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
@@ -328,32 +328,32 @@
#elif HAS_WIRED_LCD
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
#define LCD_BACKLIGHT_PIN -1
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
//#define LCD_BACKLIGHT_PIN -1
//#define LCD_RESET_PIN -1
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- //#define DOGLCD_SCK EXP2_09_PIN
- //#define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ //#define DOGLCD_SCK EXP2_02_PIN
+ //#define DOGLCD_MOSI EXP2_06_PIN
// Required for MKS_MINI_12864 with this board
//#define MKS_LCD12864B
//#undef SHOW_BOOTSCREEN
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define LCD_PINS_DC EXP1_07_PIN
- #define DOGLCD_CS EXP1_08_PIN
+ #define LCD_PINS_DC EXP1_04_PIN
+ #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN
- #define NEOPIXEL_PIN EXP1_05_PIN
- #define DOGLCD_MOSI EXP2_05_PIN
- #define DOGLCD_SCK EXP2_09_PIN
+ #define LCD_RESET_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
+ #define DOGLCD_MOSI EXP2_06_PIN
+ #define DOGLCD_SCK EXP2_02_PIN
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@@ -361,11 +361,11 @@
#else // !MKS_MINI_12864
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#endif
#define BOARD_ST7920_DELAY_1 96
@@ -382,10 +382,10 @@
#endif
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI, HAS_WIRED_LCD)
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
#if DISABLED(USE_SPI_DMA_TC)
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
index 1627bb909b4..9b50705a905 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -230,31 +230,31 @@
#endif
/** ------ ------
- * (BEEPER) PC5 |10 9 | PE13 (BTN_ENC) (SPI1 MISO) PA6 |10 9 | PA5 (SPI1 SCK)
- * (LCD_EN) PD13 | 8 7 | PC6 (LCD_RS) (BTN_EN1) PE8 | 8 7 | PE10 (SPI1 CS)
- * (LCD_D4) PE14 6 5 | PE15 (LCD_D5) (BTN_EN2) PE11 6 5 | PA7 (SPI1 MOSI)
- * (LCD_D6) PD11 | 4 3 | PD10 (LCD_D7) (SPI DET) PE12 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * (BEEPER) PC5 | 1 2 | PE13 (BTN_ENC) (SPI1 MISO) PA6 | 1 2 | PA5 (SPI1 SCK)
+ * (LCD_EN) PD13 | 3 4 | PC6 (LCD_RS) (BTN_EN1) PE8 | 3 4 | PE10 (SPI1 CS)
+ * (LCD_D4) PE14 5 6 | PE15 (LCD_D5) (BTN_EN2) PE11 5 6 | PA7 (SPI1 MOSI)
+ * (LCD_D6) PD11 | 7 8 | PD10 (LCD_D7) (SPI DET) PE12 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PD10
-#define EXP1_04_PIN PD11
-#define EXP1_05_PIN PE15
-#define EXP1_06_PIN PE14
-#define EXP1_07_PIN PC6
-#define EXP1_08_PIN PD13
-#define EXP1_09_PIN PE13
-#define EXP1_10_PIN PC5
+#define EXP1_08_PIN PD10
+#define EXP1_07_PIN PD11
+#define EXP1_06_PIN PE15
+#define EXP1_05_PIN PE14
+#define EXP1_04_PIN PC6
+#define EXP1_03_PIN PD13
+#define EXP1_02_PIN PE13
+#define EXP1_01_PIN PC5
-#define EXP2_03_PIN -1 // RESET
-#define EXP2_04_PIN PE12
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PE11
-#define EXP2_07_PIN PE10
-#define EXP2_08_PIN PE8
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1 // RESET
+#define EXP2_07_PIN PE12
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PE11
+#define EXP2_04_PIN PE10
+#define EXP2_03_PIN PE8
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// LCD SD
@@ -262,11 +262,11 @@
/*
#if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
- #define SDSS EXP2_07_PIN
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SDSS EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#endif
*/
@@ -300,15 +300,15 @@
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
- #define TFT_CS_PIN EXP1_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
- #define TFT_DC_PIN EXP1_03_PIN
+ #define TFT_CS_PIN EXP1_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
+ #define TFT_DC_PIN EXP1_08_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_RESET_PIN EXP1_07_PIN
- #define LCD_BACKLIGHT_PIN EXP1_08_PIN
+ #define TFT_RESET_PIN EXP1_04_PIN
+ #define LCD_BACKLIGHT_PIN EXP1_03_PIN
#define TFT_BACKLIGHT_PIN LCD_BACKLIGHT_PIN
#define TOUCH_BUTTONS_HW_SPI
@@ -321,15 +321,15 @@
#define TFT_HEIGHT 320
#endif
- #define TOUCH_CS_PIN EXP1_06_PIN // SPI1_NSS
- #define TOUCH_SCK_PIN EXP2_09_PIN // SPI1_SCK
- #define TOUCH_MISO_PIN EXP2_10_PIN // SPI1_MISO
- #define TOUCH_MOSI_PIN EXP2_05_PIN // SPI1_MOSI
+ #define TOUCH_CS_PIN EXP1_05_PIN // SPI1_NSS
+ #define TOUCH_SCK_PIN EXP2_02_PIN // SPI1_SCK
+ #define TOUCH_MISO_PIN EXP2_01_PIN // SPI1_MISO
+ #define TOUCH_MOSI_PIN EXP2_06_PIN // SPI1_MOSI
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
@@ -339,22 +339,22 @@
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
#if ENABLED(MKS_MINI_12864)
//#define LCD_BACKLIGHT_PIN -1
//#define LCD_RESET_PIN -1
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- //#define DOGLCD_SCK EXP2_09_PIN
- //#define DOGLCD_MOSI EXP2_05_PIN
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ //#define DOGLCD_SCK EXP2_02_PIN
+ //#define DOGLCD_MOSI EXP2_06_PIN
// Required for MKS_MINI_12864 with this board
//#define MKS_LCD12864B
@@ -362,11 +362,11 @@
#else // !MKS_MINI_12864
- #define LCD_PINS_D4 EXP1_06_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#endif
#define BOARD_ST7920_DELAY_1 96
diff --git a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
index 1439e6de651..65a396ad3fe 100644
--- a/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_TH3D_EZBOARD_V2.h
@@ -199,11 +199,11 @@
/**
* ------
- * PA14 |10 9 | PB0
- * PC4 | 8 7 | --
- * PC5 | 6 5 PB13
- * PB12 | 4 3 | PB15
- * GND | 2 1 | 5V
+ * PA14 | 1 2 | PB0
+ * PC4 | 3 4 | --
+ * PC5 | 5 6 PB13
+ * PB12 | 7 8 | PB15
+ * GND | 9 10 | 5V
* ------
* EXP1
*
@@ -213,30 +213,30 @@
* A remote SD card is currently not supported because the pins routed to the EXP2
* connector are shared with the onboard SD card.
*/
-#define EXP1_03_PIN PB15
-#define EXP1_04_PIN PB12
-#define EXP1_05_PIN PB13
-#define EXP1_06_PIN PC5
-//#define EXP1_07_PIN -1
-#define EXP1_08_PIN PC4
-#define EXP1_09_PIN PB0
-#define EXP1_10_PIN PA14
+#define EXP1_08_PIN PB15
+#define EXP1_07_PIN PB12
+#define EXP1_06_PIN PB13
+#define EXP1_05_PIN PC5
+//#define EXP1_04_PIN -1
+#define EXP1_03_PIN PC4
+#define EXP1_02_PIN PB0
+#define EXP1_01_PIN PA14
#if ENABLED(CR10_STOCKDISPLAY)
/** ------
- * BEEPER |10 9 | ENC
- * EN1 | 8 7 | RESET
- * EN2 | 6 5 LCD_D4
- * LCD_RS | 4 3 | LCD_EN
- * GND | 2 1 | 5V
+ * BEEPER | 1 2 | ENC
+ * EN1 | 3 4 | RESET
+ * EN2 | 5 6 LCD_D4
+ * LCD_RS | 7 8 | LCD_EN
+ * GND | 9 10 | 5V
* ------
*/
#ifdef DISABLE_JTAGSWD
- #define BEEPER_PIN EXP1_10_PIN // Not connected in dev board
+ #define BEEPER_PIN EXP1_01_PIN // Not connected in dev board
#endif
- #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_08_PIN
+ #define LCD_PINS_D4 EXP1_06_PIN
//#define KILL_PIN -1
#define BOARD_ST7920_DELAY_1 600
@@ -245,17 +245,17 @@
#elif ENABLED(MKS_MINI_12864)
/** ------
- * SCK |10 9 | ENC
- * EN1 | 8 7 | --
- * EN2 | 6 5 A0
- * CS | 4 3 | MOSI
- * GND | 2 1 | 5V
+ * SCK | 1 2 | ENC
+ * EN1 | 3 4 | --
+ * EN2 | 5 6 A0
+ * CS | 7 8 | MOSI
+ * GND | 9 10 | 5V
* ------
*/
- #define DOGLCD_CS EXP1_04_PIN
- #define DOGLCD_A0 EXP1_05_PIN
- #define DOGLCD_SCK EXP1_10_PIN
- #define DOGLCD_MOSI EXP1_03_PIN
+ #define DOGLCD_CS EXP1_07_PIN
+ #define DOGLCD_A0 EXP1_06_PIN
+ #define DOGLCD_SCK EXP1_01_PIN
+ #define DOGLCD_MOSI EXP1_08_PIN
#define LCD_CONTRAST_INIT 160
#define LCD_CONTRAST_MIN 120
#define LCD_CONTRAST_MAX 180
@@ -269,7 +269,7 @@
#endif
#if EITHER(CR10_STOCKDISPLAY, MKS_MINI_12864)
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_VAKE403D.h b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
index 66caec588f6..e395ee62ddc 100644
--- a/Marlin/src/pins/stm32f4/pins_VAKE403D.h
+++ b/Marlin/src/pins/stm32f4/pins_VAKE403D.h
@@ -161,37 +161,37 @@
#define POWER_LOSS_PIN PA4 // ?? Power loss / nAC_FAULT
#if ENABLED(SDSUPPORT)
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#define SD_SS_PIN PB15 // USD_CS -> CS for onboard SD
#endif
/**
* ------ ------
- * PC9 |10 9 | PB12 ? |10 9 | ?
- * PD7 | 8 7 | PC12 PD6 | 8 7 | ?
- * PD1 | 6 5 PD2 PD0 | 6 5 ?
- * PD3 | 4 3 | PD4 PB7 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | 3.3V
+ * PC9 | 1 2 | PB12 ? | 1 2 | ?
+ * PD7 | 3 4 | PC12 PD6 | 3 4 | ?
+ * PD1 | 5 6 PD2 PD0 | 5 6 ?
+ * PD3 | 7 8 | PD4 PB7 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | 3.3V
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PD4
-#define EXP1_04_PIN PD3
-#define EXP1_05_PIN PD2
-#define EXP1_06_PIN PD1
-#define EXP1_07_PIN PC12
-#define EXP1_08_PIN PD7
-#define EXP1_09_PIN PB12
-#define EXP1_10_PIN PC9
+#define EXP1_08_PIN PD4
+#define EXP1_07_PIN PD3
+#define EXP1_06_PIN PD2
+#define EXP1_05_PIN PD1
+#define EXP1_04_PIN PC12
+#define EXP1_03_PIN PD7
+#define EXP1_02_PIN PB12
+#define EXP1_01_PIN PC9
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PB7
-//#define EXP2_05_PIN ?
-#define EXP2_06_PIN PD0
-//#define EXP2_07_PIN ?
-#define EXP2_08_PIN PD6
-//#define EXP2_09_PIN ?
-//#define EXP2_10_PIN ?
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PB7
+//#define EXP2_06_PIN ?
+#define EXP2_05_PIN PD0
+//#define EXP2_04_PIN ?
+#define EXP2_03_PIN PD6
+//#define EXP2_02_PIN ?
+//#define EXP2_01_PIN ?
//
// LCD / Controller
@@ -202,19 +202,19 @@
#define SDSS PB6 // CS for SD card in LCD
#endif
- #define BEEPER_PIN EXP1_10_PIN
+ #define BEEPER_PIN EXP1_01_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
- #define LCD_PINS_ENABLE EXP1_08_PIN
- #define LCD_PINS_RS EXP1_07_PIN
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_RS EXP1_04_PIN
- #define LCD_PINS_D4 EXP1_06_PIN
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#endif
diff --git a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
index 769f10c8a48..f35bdb227fb 100644
--- a/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
+++ b/Marlin/src/pins/stm32g0/pins_BTT_SKR_MINI_E3_V3_0.h
@@ -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
diff --git a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
index 02e195a1852..f2f1fa255ab 100644
--- a/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
+++ b/Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
@@ -326,43 +326,43 @@
/**
* ------ ------
- * (BEEPER) PC5 |10 9 | PB0 (BTN_ENC) (MISO) PA6 |10 9 | PA5 (SCK)
- * (LCD_EN) PB1 | 8 7 | PE8 (LCD_RS) (BTN_EN1) PE7 | 8 7 | PA4 (SD_SS)
- * (LCD_D4) PE9 | 6 5 PE10 (LCD_D5) (BTN_EN2) PB2 | 6 5 PA7 (MOSI)
- * (LCD_D6) PE11 | 4 3 | PE12 (LCD_D7) (SD_DETECT) PC4 | 4 3 | RESET
- * GND | 2 1 | 5V GND | 2 1 | --
+ * (BEEPER) PC5 | 1 2 | PB0 (BTN_ENC) (MISO) PA6 | 1 2 | PA5 (SCK)
+ * (LCD_EN) PB1 | 3 4 | PE8 (LCD_RS) (BTN_EN1) PE7 | 3 4 | PA4 (SD_SS)
+ * (LCD_D4) PE9 | 5 6 PE10 (LCD_D5) (BTN_EN2) PB2 | 5 6 PA7 (MOSI)
+ * (LCD_D6) PE11 | 7 8 | PE12 (LCD_D7) (SD_DETECT) PC4 | 7 8 | RESET
+ * GND | 9 10 | 5V GND | 9 10 | --
* ------ ------
* EXP1 EXP2
*/
-#define EXP1_03_PIN PE12
-#define EXP1_04_PIN PE11
-#define EXP1_05_PIN PE10
-#define EXP1_06_PIN PE9
-#define EXP1_07_PIN PE8
-#define EXP1_08_PIN PB1
-#define EXP1_09_PIN PB0
-#define EXP1_10_PIN PC5
+#define EXP1_08_PIN PE12
+#define EXP1_07_PIN PE11
+#define EXP1_06_PIN PE10
+#define EXP1_05_PIN PE9
+#define EXP1_04_PIN PE8
+#define EXP1_03_PIN PB1
+#define EXP1_02_PIN PB0
+#define EXP1_01_PIN PC5
-#define EXP2_03_PIN -1
-#define EXP2_04_PIN PC4
-#define EXP2_05_PIN PA7
-#define EXP2_06_PIN PB2
-#define EXP2_07_PIN PA4
-#define EXP2_08_PIN PE7
-#define EXP2_09_PIN PA5
-#define EXP2_10_PIN PA6
+#define EXP2_08_PIN -1
+#define EXP2_07_PIN PC4
+#define EXP2_06_PIN PA7
+#define EXP2_05_PIN PB2
+#define EXP2_04_PIN PA4
+#define EXP2_03_PIN PE7
+#define EXP2_02_PIN PA5
+#define EXP2_01_PIN PA6
//
// Onboard SD card
// Must use soft SPI because Marlin's default hardware SPI is tied to LCD's EXP2
//
#if SD_CONNECTION_IS(LCD)
- #define SDSS EXP2_07_PIN
+ #define SDSS EXP2_04_PIN
#define SD_SS_PIN SDSS
- #define SD_SCK_PIN EXP2_09_PIN
- #define SD_MISO_PIN EXP2_10_PIN
- #define SD_MOSI_PIN EXP2_05_PIN
- #define SD_DETECT_PIN EXP2_04_PIN
+ #define SD_SCK_PIN EXP2_02_PIN
+ #define SD_MISO_PIN EXP2_01_PIN
+ #define SD_MOSI_PIN EXP2_06_PIN
+ #define SD_DETECT_PIN EXP2_07_PIN
#elif SD_CONNECTION_IS(ONBOARD)
#define SDIO_SUPPORT
#define SDIO_CLOCK 24000000 // 24MHz
@@ -384,46 +384,46 @@
*/
// M1 on Driver Expansion Module
- #define E2_STEP_PIN EXP2_05_PIN
- #define E2_DIR_PIN EXP2_06_PIN
- #define E2_ENABLE_PIN EXP2_04_PIN
+ #define E2_STEP_PIN EXP2_06_PIN
+ #define E2_DIR_PIN EXP2_05_PIN
+ #define E2_ENABLE_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E2_DIAG_PIN EXP1_06_PIN
- #define E2_CS_PIN EXP1_05_PIN
+ #define E2_DIAG_PIN EXP1_05_PIN
+ #define E2_CS_PIN EXP1_06_PIN
#if HAS_TMC_UART
- #define E2_SERIAL_TX_PIN EXP1_05_PIN
- #define E2_SERIAL_RX_PIN EXP1_05_PIN
+ #define E2_SERIAL_TX_PIN EXP1_06_PIN
+ #define E2_SERIAL_RX_PIN EXP1_06_PIN
#endif
#endif
// M2 on Driver Expansion Module
- #define E3_STEP_PIN EXP2_08_PIN
- #define E3_DIR_PIN EXP2_07_PIN
+ #define E3_STEP_PIN EXP2_03_PIN
+ #define E3_DIR_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E3_ENABLE_PIN EXP1_03_PIN
- #define E3_DIAG_PIN EXP1_08_PIN
- #define E3_CS_PIN EXP1_07_PIN
+ #define E3_ENABLE_PIN EXP1_08_PIN
+ #define E3_DIAG_PIN EXP1_03_PIN
+ #define E3_CS_PIN EXP1_04_PIN
#if HAS_TMC_UART
- #define E3_SERIAL_TX_PIN EXP1_07_PIN
- #define E3_SERIAL_RX_PIN EXP1_07_PIN
+ #define E3_SERIAL_TX_PIN EXP1_04_PIN
+ #define E3_SERIAL_RX_PIN EXP1_04_PIN
#endif
#else
- #define E3_ENABLE_PIN EXP2_04_PIN
+ #define E3_ENABLE_PIN EXP2_07_PIN
#endif
// M3 on Driver Expansion Module
- #define E4_STEP_PIN EXP2_10_PIN
- #define E4_DIR_PIN EXP2_09_PIN
+ #define E4_STEP_PIN EXP2_01_PIN
+ #define E4_DIR_PIN EXP2_02_PIN
#if !EXP_MOT_USE_EXP2_ONLY
- #define E4_ENABLE_PIN EXP1_04_PIN
- #define E4_DIAG_PIN EXP1_10_PIN
- #define E4_CS_PIN EXP1_09_PIN
+ #define E4_ENABLE_PIN EXP1_07_PIN
+ #define E4_DIAG_PIN EXP1_01_PIN
+ #define E4_CS_PIN EXP1_02_PIN
#if HAS_TMC_UART
- #define E4_SERIAL_TX_PIN EXP1_09_PIN
- #define E4_SERIAL_RX_PIN EXP1_09_PIN
+ #define E4_SERIAL_TX_PIN EXP1_02_PIN
+ #define E4_SERIAL_RX_PIN EXP1_02_PIN
#endif
#else
- #define E4_ENABLE_PIN EXP2_04_PIN
+ #define E4_ENABLE_PIN EXP2_07_PIN
#endif
#endif // BTT_MOTOR_EXPANSION
@@ -434,65 +434,65 @@
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
- #define TFTGLCD_CS EXP2_08_PIN
+ #define TFTGLCD_CS EXP2_03_PIN
#endif
#elif HAS_WIRED_LCD
- #define BEEPER_PIN EXP1_10_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BEEPER_PIN EXP1_01_PIN
+ #define BTN_ENC EXP1_02_PIN
#if ENABLED(CR10_STOCKDISPLAY)
- #define LCD_PINS_RS EXP1_04_PIN
-
- #define BTN_EN1 EXP1_08_PIN
- #define BTN_EN2 EXP1_06_PIN
-
- #define LCD_PINS_ENABLE EXP1_03_PIN
- #define LCD_PINS_D4 EXP1_05_PIN
-
- #elif ENABLED(MKS_MINI_12864)
-
- #define DOGLCD_A0 EXP1_04_PIN
- #define DOGLCD_CS EXP1_05_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
-
- #else
-
#define LCD_PINS_RS EXP1_07_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
+ #define BTN_EN1 EXP1_03_PIN
+ #define BTN_EN2 EXP1_05_PIN
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
+ #elif ENABLED(MKS_MINI_12864)
+
+ #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_06_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #else
+
+ #define LCD_PINS_RS EXP1_04_PIN
+
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+
+ #define LCD_PINS_ENABLE EXP1_03_PIN
+ #define LCD_PINS_D4 EXP1_05_PIN
+
#if ENABLED(FYSETC_MINI_12864)
- #define DOGLCD_CS EXP1_08_PIN
- #define DOGLCD_A0 EXP1_07_PIN
+ #define DOGLCD_CS EXP1_03_PIN
+ #define DOGLCD_A0 EXP1_04_PIN
//#define LCD_BACKLIGHT_PIN -1
- #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
+ #define LCD_RESET_PIN EXP1_05_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_05_PIN
+ #define RGB_LED_R_PIN EXP1_06_PIN
#endif
#ifndef RGB_LED_G_PIN
- #define RGB_LED_G_PIN EXP1_04_PIN
+ #define RGB_LED_G_PIN EXP1_07_PIN
#endif
#ifndef RGB_LED_B_PIN
- #define RGB_LED_B_PIN EXP1_03_PIN
+ #define RGB_LED_B_PIN EXP1_08_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
- #define NEOPIXEL_PIN EXP1_05_PIN
+ #define NEOPIXEL_PIN EXP1_06_PIN
#endif
#endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL
- #define LCD_PINS_D5 EXP1_05_PIN
- #define LCD_PINS_D6 EXP1_04_PIN
- #define LCD_PINS_D7 EXP1_03_PIN
+ #define LCD_PINS_D5 EXP1_06_PIN
+ #define LCD_PINS_D6 EXP1_07_PIN
+ #define LCD_PINS_D7 EXP1_08_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@@ -521,21 +521,21 @@
//
// e.g., BTT_TFT35_SPI_V1_0 (480x320, 3.5", SPI Stock Display with Rotary Encoder in BIQU B1 SE)
//
- #define TFT_CS_PIN EXP2_07_PIN
- #define TFT_A0_PIN EXP2_04_PIN
- #define TFT_SCK_PIN EXP2_09_PIN
- #define TFT_MISO_PIN EXP2_10_PIN
- #define TFT_MOSI_PIN EXP2_05_PIN
+ #define TFT_CS_PIN EXP2_04_PIN
+ #define TFT_A0_PIN EXP2_07_PIN
+ #define TFT_SCK_PIN EXP2_02_PIN
+ #define TFT_MISO_PIN EXP2_01_PIN
+ #define TFT_MOSI_PIN EXP2_06_PIN
- #define TOUCH_INT_PIN EXP1_04_PIN
- #define TOUCH_MISO_PIN EXP1_05_PIN
- #define TOUCH_MOSI_PIN EXP1_08_PIN
- #define TOUCH_SCK_PIN EXP1_06_PIN
- #define TOUCH_CS_PIN EXP1_07_PIN
+ #define TOUCH_INT_PIN EXP1_07_PIN
+ #define TOUCH_MISO_PIN EXP1_06_PIN
+ #define TOUCH_MOSI_PIN EXP1_03_PIN
+ #define TOUCH_SCK_PIN EXP1_05_PIN
+ #define TOUCH_CS_PIN EXP1_04_PIN
- #define BTN_EN1 EXP2_08_PIN
- #define BTN_EN2 EXP2_06_PIN
- #define BTN_ENC EXP1_09_PIN
+ #define BTN_EN1 EXP2_03_PIN
+ #define BTN_EN2 EXP2_05_PIN
+ #define BTN_ENC EXP1_02_PIN
#endif
//