From 6769718264d5786028e633aab96f346fedaef8f5 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <thinkyhead@users.noreply.github.com>
Date: Sun, 29 Aug 2021 13:51:57 -0500
Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20Update=20more=20EXP=20Headers?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h | 13 +-
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h | 25 ++--
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h | 9 +-
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h | 17 ++-
.../src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h | 2 +-
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h | 4 +-
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h | 12 +-
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h | 72 ++++++-----
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h | 2 +-
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h | 2 +-
.../src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h | 122 ++++++++++--------
11 files changed, 155 insertions(+), 125 deletions(-)
diff --git a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
index 9211a6a793b..ff36796207a 100644
--- a/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
+++ b/Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
@@ -27,7 +27,7 @@
#include "env_validate.h"
-#define BOARD_INFO_NAME "AZSMZ MINI"
+#define BOARD_INFO_NAME "AZSMZ Mini"
//
// Servos
@@ -76,6 +76,7 @@
//
// Heaters / Fans
//
+
// EFB
#define HEATER_0_PIN P2_04
#define HEATER_BED_PIN P2_05
@@ -117,14 +118,14 @@
//
// Ethernet pins
//
-#define ENET_MDIO P1_17
-#define ENET_RX_ER P1_14
-#define ENET_RXD1 P1_10
-#define ENET_MOC P1_16
#define REF_CLK P1_15
-#define ENET_RXD0 P1_09
+#define ENET_MDIO P1_17
+#define ENET_MOC P1_16
#define ENET_CRS P1_08
+#define ENET_RX_ER P1_14
#define ENET_TX_EN P1_04
+#define ENET_RXD0 P1_09
+#define ENET_RXD1 P1_10
#define ENET_TXD0 P1_00
#define ENET_TXD1 P1_01
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 b74870b30fe..6404fbbf253 100644
--- a/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
+++ b/Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
@@ -53,26 +53,25 @@
#define E0_ENABLE_PIN P2_12
-/**
- * ------ ------
- * NC | 1 2 | GND 5V | 1 2 | GND
- * RESET | 3 4 | 1.31 NC | 3 4 | NC
- * 0.18 | 5 6 3.25 NC | 5 6 0.15
- * 1.23 | 7 8 | 3.26 0.16 | 7 8 | 0.18
- * 0.15 | 9 10 | 0.17 2.11 | 9 10 | 1.30
- * ------ ------
- * EXP2 EXP1
+/** ------ ------
+ * 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 | NC 3.25 6 5 | 0.18
+ * NC | 4 3 | NC 1.31 | 4 3 | RESET
+ * GND | 2 1 | 5V GND | 2 1 | NC
+ * ------ ------
+ * EXP1 EXP2
*/
-#define EXP1_03_PIN -1
-#define EXP1_04_PIN -1
-#define EXP1_05_PIN -1
+#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 EXP2_03_PIN -1
+#define EXP2_03_PIN -1 // RESET
#define EXP2_04_PIN P1_31
#define EXP2_05_PIN P0_18
#define EXP2_06_PIN P3_25
diff --git a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
index d1d1eccc458..a9701bc8b52 100644
--- a/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
+++ b/Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
@@ -215,6 +215,9 @@
* that the garbage/lines are erased immediately after the SD card accesses are completed.
*/
+//
+// LCD / Controller
+//
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
@@ -341,10 +344,8 @@
#endif
// UNUSED
-#define PIN_P0_27 P0_27 // EXP2/Onboard SD
-#define PIN_P0_28 P0_28 // EXP2
-#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
-#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_02 P0_02 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
+//#define PIN_P0_03 P0_03 // AUX1 (Interrupt Capable/ADC/Serial Port 0)
/**
* PWMs
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 a8a4d2de4e2..124f0301b18 100644
--- a/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
+++ b/Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
@@ -255,15 +255,14 @@
#define LED4_PIN P1_21
#endif
-/**
- * ----- -----
- * (BEEPER) 1.31 | · · | 1.30 (BTN_ENC) (MISO) 0.8 | · · | 0.7 (SD_SCK)
- * (LCD_EN) 0.18 | · · | 0.16 (LCD_RS) (BTN_EN1) 3.25 | · · | 0.28 (SD_CS2)
- * (LCD_D4) 0.15 | · · | 0.17 (LCD_D5) (BTN_EN2) 3.26 | · · | 0.9 (SD_MOSI)
- * (LCD_D6) 1.0 | · · | 1.22 (LCD_D7) (SD_DETECT) 0.27 | · · | RST
- * GND | · · | 5V GND | · · | NC
- * ----- -----
- * EXP1 EXP2
+/** ------ ------
+ * (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 | NC
+ * ------ ------
+ * EXP1 EXP2
*/
#define EXP1_03_PIN P1_22
#define EXP1_04_PIN P1_00
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 5d23466071a..6aa3372b3fa 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
@@ -96,7 +96,7 @@
/** ------ ------
* (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_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 | NC
* ------ ------
diff --git a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
index 7694130a3ee..6062755d3c8 100644
--- a/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
+++ b/Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
@@ -165,7 +165,7 @@
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
- * PB14 | 6 5 | PB13
+ * PB14 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 5V
* ------
@@ -189,7 +189,7 @@
* ------
* ? |10 9 | PC5
* PB10 | 8 7 | ?
- * PA6 | 6 5 | PA5
+ * PA6 6 5 | PA5
* PA4 | 4 3 | PA7
* GND | 2 1 | 5V
* ------
diff --git a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
index f850b4a90b0..67174556926 100644
--- a/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
+++ b/Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
@@ -294,13 +294,14 @@
#define TFT_BACKLIGHT_PIN PD13
#define LCD_USE_DMA_FSMC // Use DMA transfers to send data to the TFT
- #define FSMC_CS_PIN PD7 // NE4
- #define FSMC_RS_PIN PD11 // A0
#define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5
- #define TFT_CS_PIN TFT_CS_PIN
- #define TFT_RS_PIN TFT_RS_PIN
+ #define FSMC_CS_PIN PD7 // NE4
+ #define FSMC_RS_PIN PD11 // A0
+
+ #define TFT_CS_PIN FSMC_CS_PIN
+ #define TFT_RS_PIN FSMC_RS_PIN
#ifdef TFT_CLASSIC_UI
#define TFT_MARLINBG_COLOR 0x3186 // Grey
@@ -309,11 +310,14 @@
#define TFT_BTOKMENU_COLOR 0x145F // Cyan
#endif
#define TFT_BUFFER_SIZE 14400
+
#elif HAS_GRAPHICAL_TFT
+
#define TFT_RESET_PIN PC6
#define TFT_BACKLIGHT_PIN PD13
#define TFT_CS_PIN PD7 // NE4
#define TFT_RS_PIN PD11 // A0
+
#endif
#if NEED_TOUCH_PINS
diff --git a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
index 2060ad86fe5..0c2f2fc5db3 100644
--- a/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
+++ b/Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
@@ -130,29 +130,39 @@
#define RGB_LED_B_PIN PB6
#endif
-/*
-* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
-* -----
-* (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
-* Note: The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
-* Note: Functionally the pins are assigned in the same order as on the Ender-3 board.
-* Note: Pin 4 on the Cheetah board is assigned to an I/O, it is assigned to RESET on the Ender-3 board.
-*/
+/**
+ * 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
+ * ------
+ * EXP1
+ *
+ * Notes:
+ * - The pin-numbers match the connector correctly and are not in reverse order like on the Ender-3 board.
+ * - 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
#if HAS_WIRED_LCD
- #define BEEPER_PIN PC9
+ #define BEEPER_PIN EXP1_10_PIN
#if HAS_MARLINUI_U8GLIB
- #define DOGLCD_A0 PB14
- #define DOGLCD_CS PB12
- #define DOGLCD_SCK PB13
- #define DOGLCD_MOSI PB15
+ #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 LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
@@ -162,30 +172,30 @@
#endif
#endif
- #define LCD_PINS_RS PB12 // CS -- SOFT SPI for ENDER3 LCD
- #define LCD_PINS_D4 PB13 // SCLK
- #define LCD_PINS_ENABLE PB15 // DATA MOSI
+ #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_CONTRAST_INIT 190
#if IS_NEWPANEL
- #define BTN_EN1 PC10
- #define BTN_EN2 PC11
- #define BTN_ENC PC12
+ #define BTN_EN1 EXP1_06_PIN
+ #define BTN_EN2 EXP1_08_PIN
+ #define BTN_ENC EXP1_09_PIN
#endif
#endif
#if ENABLED(TOUCH_UI_FTDI_EVE)
- #define BEEPER_PIN PC9
- #define CLCD_MOD_RESET PC11
- #define CLCD_SPI_CS PB12
+ #define BEEPER_PIN EXP1_10_PIN
+ #define CLCD_MOD_RESET EXP1_08_PIN
+ #define CLCD_SPI_CS EXP1_04_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 PB15
- #define CLCD_SOFT_SPI_MISO PB14
- #define CLCD_SOFT_SPI_SCLK PB13
+ #define CLCD_SOFT_SPI_MOSI EXP1_03_PIN
+ #define CLCD_SOFT_SPI_MISO EXP1_07_PIN
+ #define CLCD_SOFT_SPI_SCLK EXP1_05_PIN
#else
#define CLCD_SPI_BUS 2
#endif
diff --git a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
index 4bf8da564f5..da83ade4e09 100644
--- a/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
+++ b/Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
@@ -195,7 +195,7 @@
* ------ ------
* PC9 |10 9 | PA8 PA6 |10 9 | PA5
* PC11 | 8 7 | PD2 PC6 | 8 7 | PA4
- * PC10 | 6 5 PC12 PC7 | 6 5 PA7
+ * PC10 6 5 | PC12 PC7 6 5 | PA7
* PD0 | 4 3 | PD1 PB10 | 4 3 | RESET
* GND | 2 1 | 5V GND | 2 1 | 5V
* ------ ------
diff --git a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
index 38714d7da9c..3b6a3f74f60 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
@@ -237,7 +237,7 @@
* ------ ------
* (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_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
* ------ ------
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 88e2d1804e9..c28da713474 100644
--- a/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
+++ b/Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
@@ -215,8 +215,8 @@
// Onboard SD card
// NOT compatible with LCD
//
-// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
-#if !defined(SDCARD_CONNECTION) || SDCARD_CONNECTION == ONBOARD
+// Detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
+#if SD_CONNECTION_IS(ONBOARD)
#if USE_NEW_SPI_API
#define SD_SPI MARLIN_SPI(HardwareSPI3, PC9)
#else
@@ -230,17 +230,44 @@
#define SD_DETECT_PIN PD12
#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
+ * ------ ------
+ * 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 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
+
//
// LCD SD
//
-#if SDCARD_CONNECTION == LCD
+/*
+#if SD_CONNECTION_IS(LCD)
#define ENABLE_SPI1
- #define SDSS PE10
- #define SD_SCK_PIN PA5
- #define SD_MISO_PIN PA6
- #define SD_MOSI_PIN PA7
- #define SD_DETECT_PIN PE12
+ #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
#endif
*/
@@ -257,17 +284,6 @@
#define SPI_FLASH_SCK_PIN PB13
#endif
-/**
- * ----- -----
- * (BEEPER)PC5 | · · | PE13(BTN_ENC) (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
- * (LCD_EN)PD13 | · · | PC6(LCD_RS) (BTN_EN1) PE8 | · · | PE10 (SPI1 CS)
- * (LCD_D4)PE14 | · · | PE15(LCD_D5) (BTN_EN2) PE11 | · · | PA7 (SPI1 MOSI)
- * (LCD_D6)PD11 | · · | PD10(LCD_D7) (SPI DET) PE12 | · · | RESET
- * GND | · · | 5V GND | · · | 3.3V
- * ----- -----
- * EXP1 EXP2
- */
-
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17253
@@ -285,21 +301,21 @@
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
- #define TFT_CS_PIN PD11
- #define TFT_SCK_PIN PA5
- #define TFT_MISO_PIN PA6
- #define TFT_MOSI_PIN PA7
- #define TFT_DC_PIN PD10
- #define TFT_RST_PIN PC6
+ #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_RST_PIN EXP1_07_PIN
#define TFT_A0_PIN TFT_DC_PIN
- #define TFT_RESET_PIN PC6
- #define TFT_BACKLIGHT_PIN PD13
+ #define TFT_RESET_PIN EXP1_07_PIN
+ #define TFT_BACKLIGHT_PIN EXP1_08_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
- #define LCD_BACKLIGHT_PIN PD13
+ #define LCD_BACKLIGHT_PIN EXP1_08_PIN
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
@@ -307,15 +323,15 @@
#define TFT_HEIGHT 320
#endif
- #define TOUCH_CS_PIN PE14 // SPI1_NSS
- #define TOUCH_SCK_PIN PA5 // SPI1_SCK
- #define TOUCH_MISO_PIN PA6 // SPI1_MISO
- #define TOUCH_MOSI_PIN PA7 // SPI1_MOSI
+ #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 BTN_EN1 PE8
- #define BTN_EN2 PE11
- #define BEEPER_PIN PC5
- #define BTN_ENC PE13
+ #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 LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
@@ -325,22 +341,22 @@
#elif HAS_WIRED_LCD
- #define BEEPER_PIN PC5
- #define BTN_ENC PE13
- #define LCD_PINS_ENABLE PD13
- #define LCD_PINS_RS PC6
- #define BTN_EN1 PE8
- #define BTN_EN2 PE11
+ #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 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 PD11
- #define DOGLCD_CS PE15
- //#define DOGLCD_SCK PA5
- //#define DOGLCD_MOSI PA7
+ #define DOGLCD_A0 EXP1_04_PIN
+ #define DOGLCD_CS EXP1_05_PIN
+ //#define DOGLCD_SCK EXP2_09_PIN
+ //#define DOGLCD_MOSI EXP2_05_PIN
// Required for MKS_MINI_12864 with this board
//#define MKS_LCD12864B
@@ -348,15 +364,15 @@
#else // !MKS_MINI_12864
- #define LCD_PINS_D4 PE14
+ #define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(ULTIPANEL)
- #define LCD_PINS_D5 PE15
- #define LCD_PINS_D6 PD11
- #define LCD_PINS_D7 PD10
+ #define LCD_PINS_D5 EXP1_05_PIN
+ #define LCD_PINS_D6 EXP1_04_PIN
+ #define LCD_PINS_D7 EXP1_03_PIN
#endif
- #define BOARD_ST7920_DELAY_1 DELAY_NS(96)
- #define BOARD_ST7920_DELAY_2 DELAY_NS(48)
+ #define BOARD_ST7920_DELAY_1 DELAY_NS( 96)
+ #define BOARD_ST7920_DELAY_2 DELAY_NS( 48)
#define BOARD_ST7920_DELAY_3 DELAY_NS(600)
#endif // !MKS_MINI_12864