zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🎨 EXP1/2 headers and pins cleanup (#22628)

Browse source
This commit is contained in:
Scott Lahteine 2021-08-24 18:07:41 -05:00 committed by Scott Lahteine
parent 02ae4bc9b9
commit 95f27cf339
40 changed files with 593 additions and 496 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/STM32F1/onboard_sd.cpp
View file

@ -158,7 +158,7 @@ static void sd_power_on() {
ONBOARD_SD_SPI.begin();
ONBOARD_SD_SPI.setBitOrder(MSBFIRST);
ONBOARD_SD_SPI.setDataMode(SPI_MODE0);
OUT_WRITE(ONBOARD_SD_CS_PIN, HIGH); // Set CS# high
CS_HIGH();
}
// Disable SPI function

2
Marlin/src/pins/lpc1768/pins_AZSMZ_MINI.h
View file

@ -85,7 +85,6 @@
#define FAN1_PIN P0_26
#define LCD_SDSS P0_16 // LCD SD chip select
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if ENABLED(AZSMZ_12864)
#define BEEPER_PIN P1_30
@ -109,6 +108,7 @@
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."

3
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_1.h
View file

@ -54,7 +54,7 @@
/**
* ______ ______
* ------ ------
* 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
@ -82,7 +82,6 @@
#define EXP2_09_PIN P0_15
#define EXP2_10_PIN P0_17
/**
* LCD / Controller
*

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

@ -184,7 +184,7 @@
#endif
/**
* ______ ______
* ------ ------
* NC | 1 2 | GND 5V | 1 2 | GND
* RESET | 3 4 | 1.31 (SD_DETECT) (LCD_D7) 1.23 | 3 4 | 1.22 (LCD_D6)
* (MOSI) 0.18 | 5 6 3.25 (BTN_EN2) (LCD_D5) 1.21 | 5 6 1.20 (LCD_D4)
@ -230,7 +230,7 @@
* The ANET_FULL_GRAPHICS_LCD connector plug:
*
* BEFORE AFTER
* ______ ______
* ------ ------
* GND 1 | 1 2 | 2 5V 5V 1 | 1 2 | 2 GND
* CS 3 | 3 4 | 4 BTN_EN2 CS 3 | 3 4 | 4 BTN_EN2
* SID 5 | 5 6 6 BTN_EN1 SID 5 | 5 6 6 BTN_EN1
@ -386,11 +386,11 @@
/**
* Creality Ender-2 display pinout
* _____
* -----
* 5V | 1 2 | GND
* (MOSI) P1_23 | 3 4 | P1_22 (LCD_CS)
* (LCD_A0) P1_21 | 5 6 P1_20 (BTN_EN2)
* RESET P1_19 | 7 8 | P1_18 (BTN_EN1)
* (RESET) P1_19 | 7 8 | P1_18 (BTN_EN1)
* (BTN_ENC) P0_28 | 9 10| P1_30 (SCK)
* -----
* EXP1

38
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View file

@ -239,13 +239,13 @@
#define TMC_BAUD_RATE 19200
#endif
/* _____ _____
/** ------ ------
* NC | 1 2 | GND 5V | 1 2 | GND
* RESET | 3 4 | 1.31 1.23 | 3 4 | 1.22
* 0.18 | 5 6 3.25 1.21 | 5 6 1.20
* 0.16 | 7 8 | 3.26 1.19 | 7 8 | 1.18
* 0.15 | 9 10| 0.17 0.28 | 9 10| 1.30
* ----- -----
* ------ ------
* EXP2 EXP1
*/
@ -267,27 +267,15 @@
#define EXP2_09_PIN P0_15
#define EXP2_10_PIN P0_17
/**
* _____ _____
* NC | · · | GND 5V | · · | GND
* RESET | · · | 1.31 (SD_DETECT) (LCD_D7) 1.23 | · · | 1.22 (LCD_D6)
* (MOSI) 0.18 | · · 3.25 (BTN_EN2) (LCD_D5) 1.21 | · · 1.20 (LCD_D4)
* (SD_SS) 0.16 | · · | 3.26 (BTN_EN1) (LCD_RS) 1.19 | · · | 1.18 (LCD_EN)
* (SCK) 0.15 | · · | 0.17 (MISO) (BTN_ENC) 0.28 | · · | 1.30 (BEEPER)
* ----- -----
* EXP2 EXP1
*/
#if ENABLED(DWIN_CREALITY_LCD)
#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
// RET6 DWIN ENCODER LCD
#define BTN_ENC P1_20
#define BTN_EN1 P1_23
#define BTN_EN2 P1_22
#define BTN_ENC EXP1_06_PIN
#define BTN_EN1 EXP1_03_PIN
#define BTN_EN2 EXP1_04_PIN
#ifndef BEEPER_PIN
#define BEEPER_PIN P1_21
#undef SPEAKER
#define BEEPER_PIN EXP1_05_PIN
#endif
#elif HAS_WIRED_LCD && !BTT_MOTOR_EXPANSION
@ -304,13 +292,13 @@
* The ANET_FULL_GRAPHICS_LCD_ALT_WIRING connector plug:
*
* BEFORE AFTER
* _____ _____
* ------ ------
* GND | 1 2 | 5V 5V | 1 2 | GND
* CS | 3 4 | BTN_EN2 CS | 3 4 | BTN_EN2
* SID | 5 6 BTN_EN1 SID | 5 6 BTN_EN1
* open | 7 8 | BTN_ENC open | 7 8 | BTN_ENC
* CLK | 9 10| Beeper CLK | 9 10| Beeper
* ----- -----
* CLK | 9 10| BEEPER CLK | 9 10| BEEPER
* ------ ------
* LCD LCD
*/
@ -338,12 +326,12 @@
* The ANET_FULL_GRAPHICS_LCD connector plug:
*
* BEFORE AFTER
* ______ ______
* ------ ------
* GND | 1 2 | 5V 5V | 1 2 | GND
* CS | 3 4 | BTN_EN2 CS | 3 4 | BTN_EN2
* SID | 5 6 BTN_EN1 SID | 5 6 BTN_EN1
* open | 7 8 | BTN_ENC CLK | 7 8 | BTN_ENC
* CLK | 9 10 | Beeper open | 9 10 | Beeper
* CLK | 9 10 | BEEPER open | 9 10 | BEEPER
* ------ ------
* LCD LCD
*/
@ -372,7 +360,7 @@
#elif ENABLED(ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* ______
* ------
* 5V | 1 2 | GND
* (MOSI) 1.23 | 3 4 | 1.22 (LCD_RS)
* (LCD_A0) 1.21 | 5 6 1.20 (BTN_EN2)

5
Marlin/src/pins/lpc1768/pins_BTT_SKR_common.h
View file

@ -126,8 +126,6 @@
#endif
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) && ENABLED(SKR_USE_LCD_SD_CARD_PINS_FOR_CS)
#error "SDCARD_CONNECTION must not be 'LCD' with SKR_USE_LCD_SD_CARD_PINS_FOR_CS."
#endif
@ -145,13 +143,14 @@
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
#if ENABLED(BTT_MOTOR_EXPANSION)
/** ______ ______
/** ------ ------
* NC | 1 2 | GND NC | 1 2 | GND
* NC | 3 4 | M1EN M2EN | 3 4 | M3EN
* M1STP | 5 6 M1DIR M1RX | 5 6 M1DIAG

3
Marlin/src/pins/lpc1768/pins_GMARSH_X6_REV1.h
View file

@ -155,8 +155,6 @@
#define SDCARD_CONNECTION LCD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15
#define SD_MISO_PIN P0_17
@ -167,5 +165,6 @@
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#endif

3
Marlin/src/pins/lpc1768/pins_MKS_SBASE.h
View file

@ -165,8 +165,6 @@
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(CUSTOM_CABLE)
/**
@ -199,6 +197,7 @@
#define SD_SS_PIN P0_28
#else
#define SD_DETECT_PIN P0_27
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#endif
#endif

165
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View file

@ -215,7 +215,7 @@
// Power Supply Control
//
#if ENABLED(MKS_PWC)
#define PS_ON_PIN P2_00 // SERVO
#define PS_ON_PIN P2_00 // SERVO1
#define KILL_PIN P1_24 // Z+
#define KILL_PIN_STATE HIGH
#endif
@ -228,42 +228,79 @@
#define LED3_PIN P1_20
#define LED4_PIN P1_21
/**
* _____ _____
* (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
* ----- -----
/** ------ ------
* (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 | NC
* ------ ------
* 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 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
#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
#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
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
#if HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS P1_00
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 P0_18
#define BTN_EN2 P0_15
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define LCD_PINS_ENABLE P1_22
#define LCD_PINS_D4 P0_17
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_CS_PIN P1_00
#define TFT_A0_PIN P1_22
#define TFT_DC_PIN P1_22
#define TFT_MISO_PIN P0_08
#define TFT_BACKLIGHT_PIN P0_18
#define TFT_RESET_PIN P0_16
#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 LCD_USE_DMA_SPI
#define TOUCH_INT_PIN P0_17
#define TOUCH_CS_PIN P0_15
#define TOUCH_INT_PIN EXP1_05_PIN
#define TOUCH_CS_PIN EXP1_06_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
@ -278,8 +315,8 @@
#define TFT_QUEUE_SIZE 6144
#endif
#define BTN_EN1 P3_25
#define BTN_EN2 P3_26
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#elif IS_TFTGLCD_PANEL
@ -287,74 +324,74 @@
#undef BTN_ENC
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS P3_25
#define TFTGLCD_CS EXP2_08_PIN
#endif
#else
#define BTN_EN1 P3_25
#define BTN_EN2 P3_26
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define LCD_SDSS P0_28
#define LCD_SDSS EXP2_07_PIN
#if ENABLED(MKS_12864OLED_SSD1306)
#define LCD_PINS_DC P0_17
#define DOGLCD_CS P0_16
#define LCD_PINS_DC EXP1_05_PIN
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18
#define DOGLCD_SCK EXP1_06_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define LCD_PINS_RS P1_00
#define LCD_PINS_D7 P1_22
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define KILL_PIN -1 // NC
#else // !MKS_12864OLED_SSD1306
#define LCD_PINS_RS P0_16
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS P0_18
#define DOGLCD_A0 P0_16
#define DOGLCD_SCK P0_07
#define DOGLCD_MOSI P0_09
#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 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 P0_15 // 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 P0_17
#define RGB_LED_R_PIN EXP1_05_PIN
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_00
#define RGB_LED_G_PIN EXP1_04_PIN
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_22
#define RGB_LED_B_PIN EXP1_03_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P0_17
#define NEOPIXEL_PIN EXP1_05_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P0_17
#define DOGLCD_A0 P1_00
#define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_A0 EXP1_04_PIN
#endif
#if IS_ULTIPANEL
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -370,29 +407,9 @@
#endif // HAS_WIRED_LCD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN P0_27
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#if SD_CONNECTION_IS(ONBOARD)
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#else
#define SD_SS_PIN P0_28
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
#endif
//
// Other Pins
//
//#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 PS_ON_PIN P1_23 // SERVO P1.23
//#define PS_ON_PIN P1_23 // SERVO0 P1.23

3
Marlin/src/pins/lpc1768/pins_RAMPS_RE_ARM.h
View file

@ -455,8 +455,6 @@
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15 // (52) system defined J3-9 & AUX-3
#define SD_MISO_PIN P0_17 // (50) system defined J3-10 & AUX-3
@ -467,6 +465,7 @@
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."

3
Marlin/src/pins/lpc1769/pins_AZTEEG_X5_MINI.h
View file

@ -198,8 +198,6 @@
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN P0_15
#define SD_MISO_PIN P0_17
@ -210,6 +208,7 @@
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."

4
Marlin/src/pins/lpc1769/pins_BTT_SKR_E3_TURBO.h
View file

@ -179,7 +179,7 @@
#endif
/**
* ______
* ------
* 5V | 1 2 | GND
* (LCD_EN) P0_18 | 3 4 | P0_17 (LCD_RS)
* (LCD_D4) P0_15 | 5 6 P0_20 (BTN_EN2)
@ -203,7 +203,7 @@
/**
* Ender 3 V2 display SKR E3 Turbo (EXP1) Ender 3 V2 display --> SKR E3 Turbo
* ______ ______ RX 8 --> 5 P0_15
* ------ ------ RX 8 --> 5 P0_15
* 5V | 1 2 | GND 5V | 1 2 | GND TX 7 --> 9 P0_16
* (BTN_E1) A | 3 4 | B (BTN_E2) (LCD_EN) P0_18 | 3 4 | P0_17 (LCD_RS) BEEPER 5 --> 10 P2_08
* BEEPER | 5 6 ENT (BTN_ENC) (LCD_D4) P0_15 | 5 6 P0_20 (BTN_EN2)

3
Marlin/src/pins/lpc1769/pins_COHESION3D_REMIX.h
View file

@ -229,8 +229,6 @@
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
#define SD_SCK_PIN P0_07 // (52) system defined J3-9 & AUX-3
#define SD_MISO_PIN P0_08 // (50) system defined J3-10 & AUX-3
@ -239,6 +237,7 @@
#define SD_SS_PIN P1_23 // (53) system defined J3-5 & AUX-3 (Sometimes called SDSS) - CS used by Marlin
#else
#undef SD_DETECT_PIN
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#define SD_SS_PIN ONBOARD_SD_CS_PIN
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)

123
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
View file

@ -231,7 +231,7 @@
// Power Supply Control
//
#if ENABLED(MKS_PWC)
#define PS_ON_PIN P2_00 // SERVO
#define PS_ON_PIN P2_00 // SERVO1
#define KILL_PIN P1_24 // Z+
#define KILL_PIN_STATE HIGH
#endif
@ -256,7 +256,7 @@
#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)
@ -265,60 +265,78 @@
* ----- -----
* 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 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
#if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS P3_25
#define TFTGLCD_CS EXP2_08_PIN
#endif
#define SD_DETECT_PIN P0_27
#define SD_DETECT_PIN EXP2_04_PIN
#elif HAS_WIRED_LCD
#define BEEPER_PIN P1_31
#define BTN_ENC P1_30
#define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXP1_09_PIN
#if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS P1_00
#define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 P0_18
#define BTN_EN2 P0_15
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define LCD_PINS_ENABLE P1_22
#define LCD_PINS_D4 P0_17
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
#else
#define BTN_EN1 P3_25
#define BTN_EN2 P3_26
#define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXP2_06_PIN
#define LCD_SDSS P0_28
#define LCD_SDSS EXP2_07_PIN
#if ENABLED(MKS_12864OLED_SSD1306)
#define LCD_PINS_DC P0_17
#define DOGLCD_CS P0_16
#define LCD_PINS_DC EXP1_05_PIN
#define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_SCK P0_15
#define DOGLCD_MOSI P0_18
#define DOGLCD_SCK EXP1_06_PIN
#define DOGLCD_MOSI EXP1_08_PIN
#define LCD_PINS_RS P1_00
#define LCD_PINS_D7 P1_22
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#define KILL_PIN -1 // NC
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_CS_PIN P1_00
#define TFT_A0_PIN P1_22
#define TFT_DC_PIN P1_22
#define TFT_MISO_PIN P0_08
#define TFT_BACKLIGHT_PIN P0_18
#define TFT_RESET_PIN P0_16
#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 LCD_USE_DMA_SPI
#define TOUCH_INT_PIN P0_17
#define TOUCH_CS_PIN P0_15
#define TOUCH_INT_PIN EXP1_05_PIN
#define TOUCH_CS_PIN EXP1_06_PIN
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
@ -335,50 +353,50 @@
#else // !MKS_12864OLED_SSD1306
#define LCD_PINS_RS P0_16
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE P0_18
#define LCD_PINS_D4 P0_15
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS P0_18
#define DOGLCD_A0 P0_16
#define DOGLCD_SCK P0_07
#define DOGLCD_MOSI P0_09
#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 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 P0_15 // 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 P0_17
#define RGB_LED_R_PIN EXP1_05_PIN
#endif
#ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN P1_00
#define RGB_LED_G_PIN EXP1_04_PIN
#endif
#ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN P1_22
#define RGB_LED_B_PIN EXP1_03_PIN
#endif
#elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN P0_17
#define NEOPIXEL_PIN EXP1_05_PIN
#endif
#else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS P0_17
#define DOGLCD_A0 P1_00
#define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_A0 EXP1_04_PIN
#endif
#if IS_ULTIPANEL
#define LCD_PINS_D5 P0_17
#define LCD_PINS_D6 P1_00
#define LCD_PINS_D7 P1_22
#define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -398,17 +416,16 @@
#define SDCARD_CONNECTION ONBOARD
#endif
#define ONBOARD_SD_CS_PIN P0_06 // Chip select for "System" SD card
#if SD_CONNECTION_IS(LCD) || SD_CONNECTION_IS(ONBOARD)
#define SD_DETECT_PIN P0_27
#define SD_SCK_PIN P0_07
#define SD_MISO_PIN P0_08
#define SD_MOSI_PIN P0_09
#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
#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 P0_28
#define SD_SS_PIN EXP2_07_PIN
#endif
#elif SD_CONNECTION_IS(CUSTOM_CABLE)
#error "No custom SD drive cable defined for this board."
@ -419,4 +436,4 @@
//
//#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 PS_ON_PIN P1_23 // SERVO P1.23
//#define PS_ON_PIN P1_23 // SERVO0 P1.23

6
Marlin/src/pins/lpc1769/pins_TH3D_EZBOARD.h
View file

@ -156,7 +156,7 @@
//
/**
* ______
* ------
* 5V | 1 2 | GND
* P0_18 | 3 4 | P0_16
* P0_15 | 5 6 P3_25
@ -181,7 +181,7 @@
#define EXP1_10_PIN P1_31
#if ENABLED(CR10_STOCKDISPLAY)
/** ______
/** ------
* 5V | 1 2 | GND
* LCD_EN | 3 4 | LCD_RS
* LCD_D4 | 5 6 EN2
@ -196,7 +196,7 @@
#define KILL_PIN EXP1_07_PIN
#elif ENABLED(MKS_MINI_12864)
/** ______
/** ------
* 5V | 1 2 | GND
* SPI-MOSI | 3 4 | SPI-CS
* A0 | 5 6 EN2

4
Marlin/src/pins/ramps/pins_RAMPS.h
View file

@ -434,7 +434,7 @@
/**
* LCD adapter. Please note: These comes in two variants. The socket keys can be
* on either side, and may be backwards on some boards / displays.
* _____ _____
* ----- -----
* D37 |10 9 | D35 (MISO) D50 |10 9 | D52 (SCK)
* D17 | 8 7 | D16 D31 | 8 7 | D53
* D23 6 5 D25 D33 6 5 D51 (MOSI)
@ -778,7 +778,7 @@
* FYSETC TFT-81050 display pinout
*
* Board Display
* _____ _____
* ----- -----
* (SCK) D52 | 1 2 | D50 (MISO) MISO | 1 2 | SCK
* (SD_CS) D53 | 3 4 | D33 (BNT_EN2) (BNT_EN2) MOD_RESET | 3 4 | SD_CS
* (MOSI) D51 | 5 6 D31 (BNT_EN1) (BNT_EN1) LCD_CS | 5 6 MOSI

2
Marlin/src/pins/sanguino/pins_MELZI_CREALITY.h
View file

@ -137,7 +137,7 @@
/**
* EXP1 Connector EXP1 as CR10 STOCKDISPLAY
* _____ _____
* ----- -----
* PA4 | 6 5 | PC0 BEEPER_PIN | 6 5 | BTN_ENC
* PD3 | 7 4 | RESET BTN_EN1 | 7 4 | RESET
* PD2 8 3 | PA1 BTN_EN2 8 3 | LCD_PINS_D4 (ST9720 CLK)

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_CR6.h
View file

@ -158,8 +158,6 @@
// SD Card
//
#define HAS_ONBOARD_SD
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif

6
Marlin/src/pins/stm32f1/pins_BTT_SKR_E3_DIP.h
View file

@ -156,7 +156,7 @@
#define USB_CONNECT_INVERTING false
/**
* _____
* -----
* 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
@ -195,7 +195,7 @@
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
/** Creality Ender-2 display pinout
* _____
* -----
* 5V | 1 2 | GND
* (MOSI) PB7 | 3 4 | PB8 (LCD_RS)
* (LCD_A0) PB9 | 5 6 PA10 (BTN_EN2)
@ -229,7 +229,7 @@
/** FYSETC TFT TFT81050 display pinout
*
* Board Display
* _____ _____
* ----- -----
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 PA10 (SD_CS) (PB8) LCD_CS | 5 6 MOSI (SPI1-MOSI)

8
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_E3_common.h
View file

@ -117,7 +117,7 @@
/**
* SKR Mini E3 V1.0, V1.2 SKR Mini E3 V2.0
* ______ ______
* ------ ------
* 5V | 1 2 | GND 5V | 1 2 | GND
* (LCD_EN) PB7 | 3 4 | PB8 (LCD_RS) (LCD_EN) PB15 | 3 4 | PB8 (LCD_RS)
* (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2) (LCD_D4) PB9 | 5 6 PA10 (BTN_EN2)
@ -134,7 +134,7 @@
#define EXP1_3 PB7
#endif
#if ENABLED(DWIN_CREALITY_LCD)
#if EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
/**
* ------ ------ ------
* VCC | 1 2 | GND VCC | 1 2 | GND GND | 2 1 | VCC
@ -205,7 +205,7 @@
* TFTGLCD_PANEL_SPI display pinout
*
* Board Display
* ______ ______
* ------ ------
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) LCD_CS | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
@ -248,7 +248,7 @@
* FYSETC TFT TFT81050 display pinout
*
* Board Display
* ______ ______
* ------ ------
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PB7 | 3 4 | PB8 (LCD_CS) (PA9) MOD_RESET | 3 4 | SD_CS (PA10)
* (FREE) PB9 | 5 6 | PA10 (SD_CS) (PB8) LCD_CS | 5 6 | MOSI (SPI1-MOSI)

2
Marlin/src/pins/stm32f1/pins_BTT_SKR_MINI_V1_1.h
View file

@ -98,7 +98,7 @@
//
/**
* _____ _____
* ----- -----
* NC | · · | GND 5V | · · | GND
* RESET | · · | PB9 (SD_DETECT) (LCD_D7) PC14 | · · | PC15 (LCD_D6)
* (MOSI) PB5 | · · | PB8 (BTN_EN2) (LCD_D5) PB7 | · · | PC13 (LCD_D4)

2
Marlin/src/pins/stm32f1/pins_CCROBOT_MEEB_3DP.h
View file

@ -122,7 +122,7 @@
#define NEOPIXEL_PIN PC7 // The NEOPIXEL LED driving pin
/**
* 1 _____ 2
* 1 ----- 2
* PB5 | · · | PB6
* PA2 | · · | RESET
* PA3 | · · | PB8

1
Marlin/src/pins/stm32f1/pins_CREALITY_V4.h
View file

@ -194,7 +194,6 @@
//#define LCD_LED_PIN PB2
#ifndef BEEPER_PIN
#define BEEPER_PIN PB13
//#undef SPEAKER
#endif
#elif ENABLED(DWIN_VET6_CREALITY_LCD)

83
Marlin/src/pins/stm32f1/pins_CREALITY_V4210.h
View file

@ -156,35 +156,67 @@
#define SDIO_SUPPORT
#define NO_SD_HOST_DRIVE // This board's SD is only seen by the printer
#if ENABLED(CR10_STOCKDISPLAY) && NONE(RET6_12864_LCD, VET6_12864_LCD)
#if ENABLED(CR10_STOCKDISPLAY)
#if ENABLED(RET6_12864_LCD)
/**
* RET6 12864 LCD
* ------
* PC6 |10 9 | PB2
* PB10 | 8 7 | PE8
* PB14 | 6 5 | PB13
* PB12 | 4 3 | PB15
* GND | 2 1 | 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 BEEPER_PIN EXP1_10_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
* ------
* 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
#else
#error "Define RET6_12864_LCD or VET6_12864_LCD to select pins for CR10_STOCKDISPLAY with the Creality V4 controller."
#endif
#endif
#if ENABLED(RET6_12864_LCD)
#define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXP1_05_PIN
// RET6 12864 LCD
#define LCD_PINS_RS PB12
#define LCD_PINS_ENABLE PB15
#define LCD_PINS_D4 PB13
#define BTN_ENC EXP1_09_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_06_PIN
#define BTN_ENC PB2
#define BTN_EN1 PB10
#define BTN_EN2 PB14
#define BEEPER_PIN PC6
#elif ENABLED(VET6_12864_LCD)
// VET6 12864 LCD
#define LCD_PINS_RS PA4
#define LCD_PINS_ENABLE PA7
#define LCD_PINS_D4 PA5
#define BTN_ENC PC5
#define BTN_EN1 PB10
#define BTN_EN2 PA6
#elif ENABLED(DWIN_CREALITY_LCD)
#elif EITHER(DWIN_CREALITY_LCD, IS_DWIN_MARLINUI)
// RET6 DWIN ENCODER LCD
#define BTN_ENC PB14
@ -194,7 +226,6 @@
//#define LCD_LED_PIN PB2
#ifndef BEEPER_PIN
#define BEEPER_PIN PB13
#undef SPEAKER
#endif
#elif ENABLED(DWIN_VET6_CREALITY_LCD)

4
Marlin/src/pins/stm32f1/pins_FYSETC_CHEETAH.h
View file

@ -132,8 +132,8 @@
/*
* EXP1 pinout for the LCD according to Fysetcs schematic for the Cheetah board
* _____
* (Beeper) PC9 | 1 2 | PC12 (BTN_ENC)
* -----
* (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)

2
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3_common.h
View file

@ -133,7 +133,7 @@
#endif
/**
* _____ _____ _____
* ----- ----- -----
* (BEEPER) PC1 | 1 2 | PC3 (BTN_ENC) (MISO) PB14 | 1 2 | PB13 (SD_SCK) 5V | 1 2 | GND
* (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS) (BTN_EN1) PB11 | 3 4 | PA15 (SD_SS) (LCD_EN) PA4 | 3 4 | PA5 (LCD_RS)
* (LCD_D4) PA6 | 5 6 PA7 (LCD_D5) (BTN_EN2) PB0 | 5 6 PB15 (SD_MOSI) (LCD_D4) PA6 | 5 6 PB0 (BTN_EN2)

12
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_PRO.h
View file

@ -299,14 +299,16 @@
#endif
#ifndef BOARD_ST7920_DELAY_1
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_2
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(125)
#endif
#ifndef BOARD_ST7920_DELAY_3
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(125)
#endif
#endif
#define HAS_SPI_FLASH 1

6
Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h
View file

@ -183,7 +183,7 @@
/**
* BTT E3 RRF
* _____
* -----
* 5V | 1 2 | GND
* (LCD_EN) PE11 | 3 4 | PB1 (LCD_RS)
* (LCD_D4) PE10 | 5 6 PB2 (BTN_EN2)
@ -248,7 +248,7 @@
* TFTGLCD_PANEL_SPI display pinout
*
* Board Display
* _____ _____
* ----- -----
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PE11 | 3 4 | PB1 (LCD_CS) (PE7) LCD_CS | 3 4 | SD_CS (PB2)
* (FREE) PE10 | 5 6 | PB2 (SD_CS) (FREE) | 5 6 | MOSI (SPI1-MOSI)
@ -303,7 +303,7 @@
/** FYSETC TFT TFT81050 display pinout
*
* Board Display
* _____ _____
* ----- -----
* 5V | 1 2 | GND (SPI1-MISO) MISO | 1 2 | SCK (SPI1-SCK)
* (FREE) PE11 | 3 4 | PB1 (LCD_CS) (PE7) MOD_RESET | 3 4 | SD_CS (PB2)
* (FREE) PE10 | 5 6 | PB2 (SD_CS) (PB1) LCD_CS | 5 6 | MOSI (SPI1-MOSI)

4
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View file

@ -311,7 +311,7 @@
#endif
/**
* ______ ______
* ------ ------
* NC | 1 2 | GND 5V | 1 2 | GND
* RESET | 3 4 | PC15 (SD_DETECT) (LCD_D7) PE15 | 3 4 | PE14 (LCD_D6)
* (MOSI) PA7 | 5 6 PB1 (BTN_EN2) (LCD_D5) PE13 | 5 6 PE12 (LCD_D4)
@ -366,7 +366,7 @@
#if ENABLED(BTT_MOTOR_EXPANSION)
/**
* ______ ______
* ------ ------
* NC | 1 2 | GND NC | 1 2 | GND
* NC | 3 4 | M1EN M2EN | 3 4 | M3EN
* M1STP | 5 6 M1DIR M1RX | 5 6 M1DIAG

2
Marlin/src/pins/stm32f4/pins_BTT_SKR_PRO_common.h
View file

@ -367,7 +367,7 @@
#endif
#if ENABLED(BTT_MOTOR_EXPANSION)
/** _____ _____
/** ----- -----
* NC | . . | GND NC | . . | GND
* NC | . . | M1EN M2EN | . . | M3EN
* M1STP | . . M1DIR M1RX | . . M1DIAG

2
Marlin/src/pins/stm32f4/pins_BTT_SKR_V2_0_common.h
View file

@ -350,7 +350,7 @@
#endif
#if ENABLED(BTT_MOTOR_EXPANSION)
/** _____ _____
/** ----- -----
* NC | . . | GND NC | . . | GND
* NC | . . | M1EN M2EN | . . | M3EN
* M1STP | . . M1DIR M1RX | . . M1DIAG

103
Marlin/src/pins/stm32f4/pins_FLYF407ZG.h
View file

@ -175,17 +175,39 @@
#define FAN4_PIN PE13
#define FAN5_PIN PB11
/**
* ------ ------
* 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 | NC
* ------ ------
* 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 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
//
// Onboard SD support
//
#define SDIO_D0_PIN PC8
#define SDIO_D1_PIN PC9
//#define SD_CARD_DETECT_PIN PC13
#define SDIO_D2_PIN PC10
#define SDIO_D3_PIN PC11
#define SDIO_CK_PIN PC12
#define SDIO_CMD_PIN PD2
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
@ -194,37 +216,37 @@
#if SD_CONNECTION_IS(ONBOARD)
#define SDIO_SUPPORT // Use SDIO for onboard SD
#ifndef SDIO_SUPPORT
#if DISABLED(SDIO_SUPPORT)
#define SOFTWARE_SPI // Use soft SPI for onboard SD
#define SDSS SDIO_D3_PIN
#define SD_SCK_PIN SDIO_CK_PIN
#define SD_MISO_PIN SDIO_D0_PIN
#define SD_MOSI_PIN SDIO_CMD_PIN
#define SDSS PC11
#define SD_SCK_PIN PC12
#define SD_MISO_PIN PC8
#define SD_MOSI_PIN PD2
#endif
#elif SD_CONNECTION_IS(LCD)
#define SD_SCK_PIN PB13
#define SD_MISO_PIN PB14
#define SD_MOSI_PIN PB15
#define SDSS PF11
#define SD_DETECT_PIN PB2
#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
#endif
//
// Trinamic Software SPI
//
#if ENABLED(TMC_USE_SW_SPI)
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI PB15
#ifndef TMC_SW_SCK
#define TMC_SW_SCK EXP2_09_PIN
#endif
#ifndef TMC_SW_MISO
#define TMC_SW_MISO PB14
#define TMC_SW_MISO EXP2_10_PIN
#endif
#ifndef TMC_SW_SCK
#define TMC_SW_SCK PB13
#ifndef TMC_SW_MOSI
#define TMC_SW_MOSI EXP2_05_PIN
#endif
#endif
@ -264,17 +286,18 @@
//
// LCD / Controller
//
#define BEEPER_PIN PB10
#define LCD_PINS_RS PE12
#define LCD_PINS_ENABLE PE14
#define LCD_PINS_D4 PE10
#define LCD_PINS_D5 PE9
#define LCD_PINS_D6 PE8
#define LCD_PINS_D7 PE7
#define BTN_EN1 PC4
#define BTN_EN2 PC5
#define BTN_ENC PE15
#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
#endif
//
// Filament runout
@ -285,12 +308,14 @@
//
// ST7920 Delays
//
#ifndef BOARD_ST7920_DELAY_1
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(715)
#endif
#endif

4
Marlin/src/pins/stm32f4/pins_FYSETC_CHEETAH_V20.h
View file

@ -138,7 +138,7 @@
#endif
/**
* _____ _____
* ----- -----
* 5V | 1 2 | GND 5V | 1 2 | GND
* RESET | 3 4 | PC3 (SD_DETECT) (LCD_D7) PB7 | 3 4 | PB6 (LCD_D6)
* (SD_MOSI) PA7 5 6 | PC11 (BTN_EN2) (LCD_D5) PB14 5 6 | PB13 (LCD_D4)
@ -149,7 +149,7 @@
*/
/**
* _____
* -----
* (BEEPER) PC9 | 1 2 | PC12 (BTN_ENC)
* (BTN_EN1) PC10 | 3 4 | PB14 (LCD_D5/MISO)
* (BTN_EN2) PC11 5 6 | PB13 (LCD_D4/SCK)

18
Marlin/src/pins/stm32f4/pins_FYSETC_S6.h
View file

@ -192,12 +192,12 @@
//#define KILL_PIN PC5
/**
* ______ ______
* 5V | 1 2 | GND 5V | 1 2 | GND
* PD1 | 3 4 | PD0 RESET | 3 4 | PB10
* PC12 | 5 6 PC10 PA7 | 5 6 PC7
* PD2 | 7 8 | PC11 PA4 | 7 8 | PC6
* PA8 | 9 10 | PC9 PA5 | 9 10 | PA6
* ------ ------
* 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
* ------ ------
* EXP1 EXP2
*/
@ -315,9 +315,15 @@
// Alter timing for graphical display
#if HAS_MARLINUI_U8GLIB
#ifndef BOARD_ST7920_DELAY_1
#define BOARD_ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef BOARD_ST7920_DELAY_2
#define BOARD_ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef BOARD_ST7920_DELAY_3
#define BOARD_ST7920_DELAY_3 DELAY_NS(640)
#endif
#endif
#ifndef RGB_LED_R_PIN

168
Marlin/src/pins/stm32f4/pins_MKS_MONSTER8.h
View file

@ -233,14 +233,38 @@
// Random Info
#define USB_SERIAL -1 // USB Serial
/**
* ------ ------
* (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
* ------ ------
* 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 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
#ifndef SDCARD_CONNECTION
#define SDCARD_CONNECTION ONBOARD
#endif
//
// Onboard SD card
//
// detect pin doesn't work when ONBOARD and NO_SD_HOST_DRIVE disabled
#if SD_CONNECTION_IS(ONBOARD)
#define ENABLE_SPI3
#define SD_SS_PIN -1
@ -248,31 +272,49 @@
#define SD_SCK_PIN PC10
#define SD_MISO_PIN PC11
#define SD_MOSI_PIN PC12
#define SD_DETECT_PIN PC4
//
// LCD SD
//
#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 PA4
#define SD_SCK_PIN PA5
#define SD_MISO_PIN PA6
#define SD_MOSI_PIN PA7
#define SD_DETECT_PIN PB11
#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
/**
* _____ _____
* (BEEPER)PB2 | · · | PE10(BTN_ENC) (SPI1 MISO) PA6 | · · | PA5 (SPI1 SCK)
* (LCD_EN)PE11 | · · | PD10(LCD_RS) (BTN_EN1) PE9 | · · | PA4 (SPI1 CS)
* (LCD_D4)PD9 | · · PD8(LCD_D5) (BTN_EN2) PE8 | · · PA7 (SPI1 MOSI)
* (LCD_D6)PE15 | · · | PE7(LCD_D7) (SPI1_RS) PB11 | · · | RESET
* GND | · · | 5V GND | · · | 3.3V
* ￣￣￣ ￣￣￣
* EXP1 EXP2
*/
#if ANY(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_RST_PIN EXP1_07_PIN
#define TFT_A0_PIN TFT_DC_PIN
#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 EXP1_08_PIN
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
#ifndef TFT_HEIGHT
#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 LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_SIZE 14400
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17253
#endif
@ -289,51 +331,10 @@
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
#define TFT_CS_PIN PE15
#define TFT_SCK_PIN PA5
#define TFT_MISO_PIN PA6
#define TFT_MOSI_PIN PA7
#define TFT_DC_PIN PE7
#define TFT_RST_PIN PD10
#define TFT_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN PD10
#define TFT_BACKLIGHT_PIN PE11
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#define LCD_BACKLIGHT_PIN PE11
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
#ifndef TFT_HEIGHT
#define TFT_HEIGHT 320
#endif
#define TOUCH_CS_PIN PD9 // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK
#define TOUCH_MISO_PIN PA6 // SPI1_MISO
#define TOUCH_MOSI_PIN PA7 // SPI1_MOSI
#define BTN_EN1 PE9
#define BTN_EN2 PE8
#define BEEPER_PIN PB2
#define BTN_ENC PE10
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_SIZE 14400
#elif HAS_WIRED_LCD
#define BEEPER_PIN PB2
#define BTN_ENC PE10
#define LCD_PINS_ENABLE PE11
#define LCD_PINS_RS PD10
#define BTN_EN1 PE9
#define BTN_EN2 PE8
#define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_PIN
#define LCD_BACKLIGHT_PIN -1
// MKS MINI12864 and MKS LCD12864B; If using MKS LCD12864A (Need to remove RPK2 resistor)
@ -341,19 +342,19 @@
//#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_CS EXP1_04_PIN
//#define DOGLCD_SCK EXP2_09_PIN
//#define DOGLCD_MOSI EXP2_05_PIN
#elif ENABLED(MKS_MINI_12864_V3)
#define DOGLCD_CS PE11
#define DOGLCD_A0 PD10
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define LCD_PINS_DC DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN PD9
#define NEOPIXEL_PIN PD8
#define DOGLCD_MOSI PA7
#define DOGLCD_SCK PA5
#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
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@ -361,11 +362,11 @@
#else
#define LCD_PINS_D4 PD9
#define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(ULTIPANEL)
#define LCD_PINS_D5 PD8
#define LCD_PINS_D6 PE15
#define LCD_PINS_D7 PE7
#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)
@ -375,3 +376,10 @@
#endif // !MKS_MINI_12864
#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
#endif

189
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_NANO_V3.h
View file

@ -41,10 +41,12 @@
// Use one of these or SDCard-based Emulation will be used
//#define SRAM_EEPROM_EMULATION // Use BackSRAM-based EEPROM emulation
//#define FLASH_EEPROM_EMULATION // Use Flash-based EEPROM emulation
#define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define I2C_SCL_PIN PB6
#define I2C_SDA_PIN PB7
#if EITHER(NO_EEPROM_SELECTED, I2C_EEPROM)
#define I2C_EEPROM
#define MARLIN_EEPROM_SIZE 0x1000 // 4KB
#define I2C_SCL_PIN PB6
#define I2C_SDA_PIN PB7
#endif
//
// Release PB4 (Z_DIR_PIN) from JTAG NRST role
@ -253,25 +255,11 @@
#define SD_DETECT_PIN PD12
#endif
//
// LCD SD
//
#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
#endif
//
// LCD / Controller
#define SPI_FLASH
#define HAS_SPI_FLASH 1
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#if ENABLED(SPI_FLASH)
#define HAS_SPI_FLASH 1
#define SPI_DEVICE 2
#define SPI_FLASH_SIZE 0x1000000
#define SPI_FLASH_CS_PIN PB12
#define SPI_FLASH_MOSI_PIN PC3
#define SPI_FLASH_MISO_PIN PC2
@ -279,17 +267,82 @@
#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) (SPI1_RS) PE12 | · · | RESET
* GND | · · | 5V GND | · · | 3.3V
* ￣￣￣ ￣￣￣
* ------ ------
* (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
* ------ ------
* 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
//
// 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
#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_RST_PIN EXP1_07_PIN
#define TFT_A0_PIN TFT_DC_PIN
#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 EXP1_08_PIN
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
#ifndef TFT_HEIGHT
#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 LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_SIZE 14400
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17253
#endif
@ -306,61 +359,20 @@
#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_A0_PIN TFT_DC_PIN
#define TFT_RESET_PIN PC6
#define TFT_BACKLIGHT_PIN PD13
#define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1
#define LCD_BACKLIGHT_PIN PD13
#ifndef TFT_WIDTH
#define TFT_WIDTH 480
#endif
#ifndef TFT_HEIGHT
#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 BTN_EN1 PE8
#define BTN_EN2 PE11
#define BEEPER_PIN PC5
#define BTN_ENC PE13
#define LCD_READ_ID 0xD3
#define LCD_USE_DMA_SPI
#define TFT_BUFFER_SIZE 14400
#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 LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_RS EXP1_07_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
@ -380,14 +392,14 @@
#endif
#elif ENABLED(MKS_MINI_12864_V3)
#define DOGLCD_CS PD13
#define DOGLCD_A0 PC6
#define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXP1_07_PIN
#define LCD_PINS_DC DOGLCD_A0
#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN PE14
#define NEOPIXEL_PIN PE15
#define DOGLCD_MOSI PA7
#define DOGLCD_SCK PA5
#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
#if SD_CONNECTION_IS(ONBOARD)
#define FORCE_SOFT_SPI
#endif
@ -395,11 +407,11 @@
#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)
@ -409,3 +421,10 @@
#endif // !MKS_MINI_12864
#endif // HAS_WIRED_LCD
#if ANY(TFT_COLOR_UI, TFT_LVGL_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
#endif

16
Marlin/src/pins/stm32f4/pins_MKS_ROBIN_PRO_V2.h
View file

@ -258,13 +258,13 @@
#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
*/
@ -355,15 +355,9 @@
#define LCD_PINS_D7 PD10
#endif
#ifndef ST7920_DELAY_1
#define ST7920_DELAY_1 DELAY_NS(96)
#endif
#ifndef ST7920_DELAY_2
#define ST7920_DELAY_2 DELAY_NS(48)
#endif
#ifndef ST7920_DELAY_3
#define ST7920_DELAY_3 DELAY_NS(600)
#endif
#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