🚸 Renumber EXP pins to match schematics/RRF/Klipper

This commit is contained in:
Scott Lahteine
2022-07-16 16:26:36 -05:00
parent 96d3c66b64
commit 173eb3ff71
53 changed files with 2587 additions and 2589 deletions

View File

@ -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

View File

@ -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
*

View File

@ -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

View File

@ -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
//

View File

@ -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
*/

View File

@ -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

View File

@ -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
//

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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