EXP headers for RAMPS 1.x (#21054)

Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
ellensp 2021-02-16 00:15:08 +13:00 committed by GitHub
parent 9e0fc44210
commit 79ee2fa20a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 436 additions and 400 deletions

View File

@ -197,23 +197,23 @@
* EXP2 EXP1 * EXP2 EXP1
*/ */
#define EXPA1_03_PIN P1_23 #define EXP1_03_PIN P1_23
#define EXPA1_04_PIN P1_22 #define EXP1_04_PIN P1_22
#define EXPA1_05_PIN P1_21 #define EXP1_05_PIN P1_21
#define EXPA1_06_PIN P1_20 #define EXP1_06_PIN P1_20
#define EXPA1_07_PIN P1_19 #define EXP1_07_PIN P1_19
#define EXPA1_08_PIN P1_18 #define EXP1_08_PIN P1_18
#define EXPA1_09_PIN P0_28 #define EXP1_09_PIN P0_28
#define EXPA1_10_PIN P1_30 #define EXP1_10_PIN P1_30
#define EXPA2_03_PIN -1 #define EXP2_03_PIN -1
#define EXPA2_04_PIN P1_31 #define EXP2_04_PIN P1_31
#define EXPA2_05_PIN P0_18 #define EXP2_05_PIN P0_18
#define EXPA2_06_PIN P3_25 #define EXP2_06_PIN P3_25
#define EXPA2_07_PIN P0_16 #define EXP2_07_PIN P0_16
#define EXPA2_08_PIN P3_26 #define EXP2_08_PIN P3_26
#define EXPA2_09_PIN P0_15 #define EXP2_09_PIN P0_15
#define EXPA2_10_PIN P0_17 #define EXP2_10_PIN P0_17
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING) #if ENABLED(ANET_FULL_GRAPHICS_LCD_ALT_WIRING)
@ -243,25 +243,25 @@
* LCD LCD * LCD LCD
*/ */
#define LCD_PINS_RS EXPA1_03_PIN #define LCD_PINS_RS EXP1_03_PIN
#define BTN_EN1 EXPA1_06_PIN #define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXPA1_04_PIN #define BTN_EN2 EXP1_04_PIN
#define BTN_ENC EXPA1_08_PIN #define BTN_ENC EXP1_08_PIN
#define LCD_PINS_ENABLE EXPA1_05_PIN #define LCD_PINS_ENABLE EXP1_05_PIN
#define LCD_PINS_D4 EXPA1_07_PIN #define LCD_PINS_D4 EXP1_07_PIN
#elif ENABLED(CR10_STOCKDISPLAY) #elif ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXPA1_04_PIN #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXPA1_09_PIN // (58) open-drain #define BTN_ENC EXP1_09_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXPA1_03_PIN #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#elif HAS_ADC_BUTTONS #elif HAS_ADC_BUTTONS
@ -270,60 +270,60 @@
#elif IS_TFTGLCD_PANEL #elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS EXPA2_08_PIN #define TFTGLCD_CS EXP2_08_PIN
#endif #endif
#define SD_DETECT_PIN EXPA2_04_PIN #define SD_DETECT_PIN EXP2_04_PIN
#else // !CR10_STOCKDISPLAY #else // !CR10_STOCKDISPLAY
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA2_08_PIN // (31) J3-2 & AUX-4 #define BTN_EN1 EXP2_08_PIN // (31) J3-2 & AUX-4
#define BTN_EN2 EXPA2_06_PIN // (33) J3-4 & AUX-4 #define BTN_EN2 EXP2_06_PIN // (33) J3-4 & AUX-4
#define BTN_ENC EXPA1_09_PIN // (58) open-drain #define BTN_ENC EXP1_09_PIN // (58) open-drain
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
#define LCD_SDSS EXPA2_07_PIN // (16) J3-7 & AUX-4 #define LCD_SDSS EXP2_07_PIN // (16) J3-7 & AUX-4
#define SD_DETECT_PIN EXPA2_04_PIN // (49) (NOT 5V tolerant) #define SD_DETECT_PIN EXP2_04_PIN // (49) (NOT 5V tolerant)
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS EXPA1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXPA1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_SCK EXPA2_09_PIN #define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXPA2_05_PIN #define DOGLCD_MOSI EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems #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 // results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXPA1_05_PIN #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN EXPA1_04_PIN #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN EXPA1_03_PIN #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN EXPA1_05_PIN #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#else // !FYSETC_MINI_12864 #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS EXPA1_05_PIN #define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_A0 EXPA1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_SCK EXPA2_09_PIN #define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXPA2_05_PIN #define DOGLCD_MOSI EXP2_05_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY) #elif ENABLED(ENDER2_STOCKDISPLAY)
@ -339,21 +339,21 @@
* EXP1 * EXP1
*/ */
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#define DOGLCD_CS EXPA1_04_PIN #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN #define DOGLCD_A0 EXP1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN #define DOGLCD_SCK EXP1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN #define DOGLCD_MOSI EXP1_03_PIN
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#endif #endif
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 EXPA1_05_PIN #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN #define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -376,7 +376,7 @@
#endif #endif
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_SS_PIN EXPA2_07_PIN #define SD_SS_PIN EXP2_07_PIN
#endif #endif
/** /**

View File

@ -243,29 +243,29 @@
* EXP2 EXP1 * EXP2 EXP1
*/ */
#define EXPA1_03_PIN P1_23 #define EXP1_03_PIN P1_23
#define EXPA1_04_PIN P1_22 #define EXP1_04_PIN P1_22
#define EXPA1_05_PIN P1_21 #define EXP1_05_PIN P1_21
#define EXPA1_06_PIN P1_20 #define EXP1_06_PIN P1_20
#define EXPA1_07_PIN P1_19 #define EXP1_07_PIN P1_19
#define EXPA1_08_PIN P1_18 #define EXP1_08_PIN P1_18
#define EXPA1_09_PIN P0_28 #define EXP1_09_PIN P0_28
#define EXPA1_10_PIN P1_30 #define EXP1_10_PIN P1_30
#define EXPA2_03_PIN -1 #define EXP2_03_PIN -1
#define EXPA2_04_PIN P1_31 #define EXP2_04_PIN P1_31
#define EXPA2_05_PIN P0_18 #define EXP2_05_PIN P0_18
#define EXPA2_06_PIN P3_25 #define EXP2_06_PIN P3_25
#define EXPA2_07_PIN P0_16 #define EXP2_07_PIN P0_16
#define EXPA2_08_PIN P3_26 #define EXP2_08_PIN P3_26
#define EXPA2_09_PIN P0_15 #define EXP2_09_PIN P0_15
#define EXPA2_10_PIN P0_17 #define EXP2_10_PIN P0_17
// //
// SD Connection // SD Connection
// //
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_SS_PIN EXPA2_07_PIN #define SD_SS_PIN EXP2_07_PIN
#endif #endif
/** /**
@ -282,12 +282,12 @@
#if ENABLED(DWIN_CREALITY_LCD) #if ENABLED(DWIN_CREALITY_LCD)
// RET6 DWIN ENCODER LCD // RET6 DWIN ENCODER LCD
#define BTN_ENC P1_20 #define BTN_ENC P1_20
#define BTN_EN1 P1_23 #define BTN_EN1 P1_23
#define BTN_EN2 P1_22 #define BTN_EN2 P1_22
#ifndef BEEPER_PIN #ifndef BEEPER_PIN
#define BEEPER_PIN P1_21 #define BEEPER_PIN P1_21
#undef SPEAKER #undef SPEAKER
#endif #endif
@ -315,15 +315,15 @@
* LCD LCD * LCD LCD
*/ */
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA1_05_PIN #define BTN_EN1 EXP1_05_PIN
#define BTN_EN2 EXPA1_04_PIN #define BTN_EN2 EXP1_04_PIN
#define BTN_ENC EXPA1_10_PIN #define BTN_ENC EXP1_10_PIN
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
#define BEEPER_PIN EXPA1_03_PIN #define BEEPER_PIN EXP1_03_PIN
#elif ENABLED(ANET_FULL_GRAPHICS_LCD) #elif ENABLED(ANET_FULL_GRAPHICS_LCD)
#error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue." #error "CAUTION! ANET_FULL_GRAPHICS_LCD requires wiring modifications. See 'pins_BTT_SKR_V1_4.h' for details. Comment out this line to continue."
@ -349,26 +349,26 @@
* LCD LCD * LCD LCD
*/ */
#define LCD_PINS_RS EXPA1_03_PIN #define LCD_PINS_RS EXP1_03_PIN
#define BTN_EN1 EXPA1_06_PIN #define BTN_EN1 EXP1_06_PIN
#define BTN_EN2 EXPA1_04_PIN #define BTN_EN2 EXP1_04_PIN
#define BTN_ENC EXPA1_08_PIN #define BTN_ENC EXP1_08_PIN
#define LCD_PINS_ENABLE EXPA1_05_PIN #define LCD_PINS_ENABLE EXP1_05_PIN
#define LCD_PINS_D4 EXPA1_07_PIN #define LCD_PINS_D4 EXP1_07_PIN
#define BEEPER_PIN EXPA1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#elif ENABLED(CR10_STOCKDISPLAY) #elif ENABLED(CR10_STOCKDISPLAY)
#define BTN_ENC EXPA1_09_PIN // (58) open-drain #define BTN_ENC EXP1_09_PIN // (58) open-drain
#define LCD_PINS_RS EXPA1_04_PIN #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#elif ENABLED(ENDER2_STOCKDISPLAY) #elif ENABLED(ENDER2_STOCKDISPLAY)
@ -383,36 +383,36 @@
* EXP1 * EXP1
*/ */
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#define DOGLCD_CS EXPA1_04_PIN #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN #define DOGLCD_A0 EXP1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN #define DOGLCD_SCK EXP1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN #define DOGLCD_MOSI EXP1_03_PIN
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI #elif HAS_SPI_TFT // Config for Classic UI (emulated DOGM) and Color UI
#define TFT_CS_PIN EXPA1_04_PIN #define TFT_CS_PIN EXP1_04_PIN
#define TFT_A0_PIN EXPA1_03_PIN #define TFT_A0_PIN EXP1_03_PIN
#define TFT_DC_PIN EXPA1_03_PIN #define TFT_DC_PIN EXP1_03_PIN
#define TFT_MISO_PIN EXPA2_10_PIN #define TFT_MISO_PIN EXP2_10_PIN
#define TFT_BACKLIGHT_PIN EXPA1_08_PIN #define TFT_BACKLIGHT_PIN EXP1_08_PIN
#define TFT_RESET_PIN EXPA1_07_PIN #define TFT_RESET_PIN EXP1_07_PIN
#define LCD_USE_DMA_SPI #define LCD_USE_DMA_SPI
#define TOUCH_INT_PIN EXPA1_05_PIN #define TOUCH_INT_PIN EXP1_05_PIN
#define TOUCH_CS_PIN EXPA1_06_PIN #define TOUCH_CS_PIN EXP1_06_PIN
#define TOUCH_BUTTONS_HW_SPI #define TOUCH_BUTTONS_HW_SPI
#define TOUCH_BUTTONS_HW_SPI_DEVICE 1 #define TOUCH_BUTTONS_HW_SPI_DEVICE 1
// SPI 1 // SPI 1
#define SD_SCK_PIN EXPA2_09_PIN #define SD_SCK_PIN EXP2_09_PIN
#define SD_MISO_PIN EXPA2_10_PIN #define SD_MISO_PIN EXP2_10_PIN
#define SD_MOSI_PIN EXPA2_05_PIN #define SD_MOSI_PIN EXP2_05_PIN
// Disable any LCD related PINs config // Disable any LCD related PINs config
#define LCD_PINS_ENABLE -1 #define LCD_PINS_ENABLE -1
@ -423,72 +423,72 @@
#elif IS_TFTGLCD_PANEL #elif IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS EXPA2_08_PIN #define TFTGLCD_CS EXP2_08_PIN
#endif #endif
#define SD_DETECT_PIN EXPA2_04_PIN #define SD_DETECT_PIN EXP2_04_PIN
#else #else
#define BTN_ENC EXPA1_09_PIN // (58) open-drain #define BTN_ENC EXP1_09_PIN // (58) open-drain
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA2_08_PIN // (31) J3-2 & AUX-4 #define BTN_EN1 EXP2_08_PIN // (31) J3-2 & AUX-4
#define BTN_EN2 EXPA2_06_PIN // (33) J3-4 & AUX-4 #define BTN_EN2 EXP2_06_PIN // (33) J3-4 & AUX-4
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
#define LCD_SDSS EXPA2_07_PIN // (16) J3-7 & AUX-4 #define LCD_SDSS EXP2_07_PIN // (16) J3-7 & AUX-4
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN EXPA2_04_PIN // (49) (NOT 5V tolerant) #define SD_DETECT_PIN EXP2_04_PIN // (49) (NOT 5V tolerant)
#endif #endif
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS EXPA1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXPA1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_SCK EXPA2_09_PIN #define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXPA2_05_PIN #define DOGLCD_MOSI EXP2_05_PIN
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1
#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems #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 // results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXPA1_05_PIN #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN EXPA1_04_PIN #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN EXPA1_03_PIN #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN EXPA1_05_PIN #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#else // !FYSETC_MINI_12864 #else // !FYSETC_MINI_12864
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_CS EXPA1_05_PIN #define DOGLCD_CS EXP1_05_PIN
#define DOGLCD_A0 EXPA1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_SCK EXPA2_09_PIN #define DOGLCD_SCK EXP2_09_PIN
#define DOGLCD_MOSI EXPA2_05_PIN #define DOGLCD_MOSI EXP2_05_PIN
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#endif #endif
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 EXPA1_05_PIN #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN #define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN EXPA1_03_PIN // Detect the presence of the encoder #define BTN_ENC_EN EXP1_03_PIN // Detect the presence of the encoder
#endif #endif
#endif #endif

View File

@ -143,46 +143,46 @@
*/ */
// M1 on Driver Expansion Module // M1 on Driver Expansion Module
#define E2_STEP_PIN EXPA2_05_PIN #define E2_STEP_PIN EXP2_05_PIN
#define E2_DIR_PIN EXPA2_06_PIN #define E2_DIR_PIN EXP2_06_PIN
#define E2_ENABLE_PIN EXPA2_04_PIN #define E2_ENABLE_PIN EXP2_04_PIN
#if !EXP_MOT_USE_EXP2_ONLY #if !EXP_MOT_USE_EXP2_ONLY
#define E2_DIAG_PIN EXPA1_06_PIN #define E2_DIAG_PIN EXP1_06_PIN
#define E2_CS_PIN EXPA1_05_PIN #define E2_CS_PIN EXP1_05_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E2_SERIAL_TX_PIN EXPA1_05_PIN #define E2_SERIAL_TX_PIN EXP1_05_PIN
#define E2_SERIAL_RX_PIN EXPA1_05_PIN #define E2_SERIAL_RX_PIN EXP1_05_PIN
#endif #endif
#endif #endif
// M2 on Driver Expansion Module // M2 on Driver Expansion Module
#define E3_STEP_PIN EXPA2_08_PIN #define E3_STEP_PIN EXP2_08_PIN
#define E3_DIR_PIN EXPA2_07_PIN #define E3_DIR_PIN EXP2_07_PIN
#if !EXP_MOT_USE_EXP2_ONLY #if !EXP_MOT_USE_EXP2_ONLY
#define E3_ENABLE_PIN EXPA1_03_PIN #define E3_ENABLE_PIN EXP1_03_PIN
#define E3_DIAG_PIN EXPA1_08_PIN #define E3_DIAG_PIN EXP1_08_PIN
#define E3_CS_PIN EXPA1_07_PIN #define E3_CS_PIN EXP1_07_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E3_SERIAL_TX_PIN EXPA1_07_PIN #define E3_SERIAL_TX_PIN EXP1_07_PIN
#define E3_SERIAL_RX_PIN EXPA1_07_PIN #define E3_SERIAL_RX_PIN EXP1_07_PIN
#endif #endif
#else #else
#define E3_ENABLE_PIN EXPA2_04_PIN #define E3_ENABLE_PIN EXP2_04_PIN
#endif #endif
// M3 on Driver Expansion Module // M3 on Driver Expansion Module
#define E4_STEP_PIN EXPA2_10_PIN #define E4_STEP_PIN EXP2_10_PIN
#define E4_DIR_PIN EXPA2_09_PIN #define E4_DIR_PIN EXP2_09_PIN
#if !EXP_MOT_USE_EXP2_ONLY #if !EXP_MOT_USE_EXP2_ONLY
#define E4_ENABLE_PIN EXPA1_04_PIN #define E4_ENABLE_PIN EXP1_04_PIN
#define E4_DIAG_PIN EXPA1_10_PIN #define E4_DIAG_PIN EXP1_10_PIN
#define E4_CS_PIN EXPA1_09_PIN #define E4_CS_PIN EXP1_09_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E4_SERIAL_TX_PIN EXPA1_09_PIN #define E4_SERIAL_TX_PIN EXP1_09_PIN
#define E4_SERIAL_RX_PIN EXPA1_09_PIN #define E4_SERIAL_RX_PIN EXP1_09_PIN
#endif #endif
#else #else
#define E4_ENABLE_PIN EXPA2_04_PIN #define E4_ENABLE_PIN EXP2_04_PIN
#endif #endif
#endif // HAS_BTT_EXP_MOT #endif // HAS_BTT_EXP_MOT

View File

@ -190,51 +190,51 @@
* EXP * EXP
*/ */
#define EXPA1_03_PIN P0_18 #define EXP1_03_PIN P0_18
#define EXPA1_04_PIN P0_17 #define EXP1_04_PIN P0_17
#define EXPA1_05_PIN P0_15 #define EXP1_05_PIN P0_15
#define EXPA1_06_PIN P0_20 #define EXP1_06_PIN P0_20
#define EXPA1_07_PIN -1 #define EXP1_07_PIN -1
#define EXPA1_08_PIN P0_19 #define EXP1_08_PIN P0_19
#define EXPA1_09_PIN P0_16 #define EXP1_09_PIN P0_16
#define EXPA1_10_PIN P2_08 #define EXP1_10_PIN P2_08
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define BEEPER_PIN EXPA1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#define LCD_PINS_RS EXPA1_04_PIN #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
#elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD! #elif ENABLED(ZONESTAR_LCD) // ANET A8 LCD Controller - Must convert to 3.3V - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. Comment out this line to continue." #error "CAUTION! ZONESTAR_LCD requires wiring modifications. See 'pins_BTT_SKR_E3_TURBO.h' for details. Comment out this line to continue."
#define LCD_PINS_RS EXPA1_05_PIN #define LCD_PINS_RS EXP1_05_PIN
#define LCD_PINS_ENABLE EXPA1_09_PIN #define LCD_PINS_ENABLE EXP1_09_PIN
#define LCD_PINS_D4 EXPA1_04_PIN #define LCD_PINS_D4 EXP1_04_PIN
#define LCD_PINS_D5 EXPA1_06_PIN #define LCD_PINS_D5 EXP1_06_PIN
#define LCD_PINS_D6 EXPA1_08_PIN #define LCD_PINS_D6 EXP1_08_PIN
#define LCD_PINS_D7 EXPA1_10_PIN #define LCD_PINS_D7 EXP1_10_PIN
#define ADC_KEYPAD_PIN P1_23 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD! #define ADC_KEYPAD_PIN P1_23 // Repurpose servo pin for ADC - CONNECTING TO 5V WILL DAMAGE THE BOARD!
#elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY) #elif EITHER(MKS_MINI_12864, ENDER2_STOCKDISPLAY)
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#define DOGLCD_CS EXPA1_04_PIN #define DOGLCD_CS EXP1_04_PIN
#define DOGLCD_A0 EXPA1_05_PIN #define DOGLCD_A0 EXP1_05_PIN
#define DOGLCD_SCK EXPA1_10_PIN #define DOGLCD_SCK EXP1_10_PIN
#define DOGLCD_MOSI EXPA1_03_PIN #define DOGLCD_MOSI EXP1_03_PIN
#define FORCE_SOFT_SPI #define FORCE_SOFT_SPI
#define LCD_BACKLIGHT_PIN -1 #define LCD_BACKLIGHT_PIN -1

View File

@ -124,14 +124,14 @@
#define X_DIR_PIN 55 #define X_DIR_PIN 55
#define X_ENABLE_PIN 38 #define X_ENABLE_PIN 38
#ifndef X_CS_PIN #ifndef X_CS_PIN
#define X_CS_PIN 53 #define X_CS_PIN EXP2_07_PIN
#endif #endif
#define Y_STEP_PIN 60 #define Y_STEP_PIN 60
#define Y_DIR_PIN 61 #define Y_DIR_PIN 61
#define Y_ENABLE_PIN 56 #define Y_ENABLE_PIN 56
#ifndef Y_CS_PIN #ifndef Y_CS_PIN
#define Y_CS_PIN 49 #define Y_CS_PIN EXP2_04_PIN
#endif #endif
#ifndef Z_STEP_PIN #ifndef Z_STEP_PIN
@ -245,7 +245,7 @@
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 53 #define SDSS EXP2_07_PIN
#define LED_PIN 13 #define LED_PIN 13
#ifndef FILWIDTH_PIN #ifndef FILWIDTH_PIN
@ -429,10 +429,57 @@
#define E_MUX2_PIN 44 // E1_CS_PIN #define E_MUX2_PIN 44 // E1_CS_PIN
#endif #endif
//
// Aux 3 GND D52 D50 5V
// NC D53 D51 D49
//
// Aux 4 D16 D17 D23 D25 D27 D29 D31 D33 D35 D37 D39 D41 D43 D45 D47 D32 GND 5V
//
/**
* 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)
* D27 | 4 3 | D29 D49 | 4 3 | D41
* GND | 2 1 | 5V GND | 2 1 | NC
* ----- -----
* EXP1 EXP2
*/
#ifndef EXP1_03_PIN
#define EXP1_03_PIN 29
#define EXP1_04_PIN 27
#define EXP1_05_PIN 25
#define EXP1_06_PIN 23
#define EXP1_07_PIN 16
#define EXP1_08_PIN 17
#define EXP1_09_PIN 35
#define EXP1_10_PIN 37
#define EXP2_03_PIN 41
#define EXP2_04_PIN 49
#define EXP2_05_PIN 51
#define EXP2_06_PIN 33
#define EXP2_07_PIN 53
#define EXP2_08_PIN 31
#define EXP2_09_PIN 52
#define EXP2_10_PIN 50
#endif
////////////////////////// //////////////////////////
// LCDs and Controllers // // LCDs and Controllers //
////////////////////////// //////////////////////////
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
// //
@ -440,9 +487,9 @@
// //
#if ENABLED(REPRAPWORLD_GRAPHICAL_LCD) #if ENABLED(REPRAPWORLD_GRAPHICAL_LCD)
#define LCD_PINS_RS 49 // CS chip select /SS chip slave select #define LCD_PINS_RS EXP2_04_PIN // CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 51 // SID (MOSI) #define LCD_PINS_ENABLE EXP2_05_PIN // SID (MOSI)
#define LCD_PINS_D4 52 // SCK (CLK) clock #define LCD_PINS_D4 EXP2_09_PIN // SCK (CLK) clock
#elif BOTH(IS_NEWPANEL, PANEL_ONE) #elif BOTH(IS_NEWPANEL, PANEL_ONE)
@ -455,18 +502,18 @@
#elif ENABLED(TFTGLCD_PANEL_SPI) #elif ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS 33 #define TFTGLCD_CS EXP2_06_PIN
#else #else
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS 27 #define LCD_PINS_RS EXP1_04_PIN
#define LCD_PINS_ENABLE 29 #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 25 #define LCD_PINS_D4 EXP1_05_PIN
#if !IS_NEWPANEL #if !IS_NEWPANEL
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_10_PIN
#endif #endif
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
@ -482,25 +529,25 @@
#else #else
#if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306) #if EITHER(MKS_12864OLED, MKS_12864OLED_SSD1306)
#define LCD_PINS_DC 25 // Set as output on init #define LCD_PINS_DC EXP1_05_PIN // Set as output on init
#define LCD_PINS_RS 27 // Pull low for 1s to init #define LCD_PINS_RS EXP1_04_PIN // Pull low for 1s to init
// DOGM SPI LCD Support // DOGM SPI LCD Support
#define DOGLCD_A0 LCD_PINS_DC #define DOGLCD_A0 LCD_PINS_DC
#define DOGLCD_CS 16 #define DOGLCD_CS EXP1_07_PIN
#define DOGLCD_MOSI 17 #define DOGLCD_MOSI EXP1_08_PIN
#define DOGLCD_SCK 23 #define DOGLCD_SCK EXP1_06_PIN
#else #else
#define LCD_PINS_RS 16 #define LCD_PINS_RS EXP1_07_PIN
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 23 #define LCD_PINS_D4 EXP1_06_PIN
#define LCD_PINS_D5 25 #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 27 #define LCD_PINS_D6 EXP1_04_PIN
#endif #endif
#define LCD_PINS_D7 29 #define LCD_PINS_D7 EXP1_03_PIN
#if !IS_NEWPANEL #if !IS_NEWPANEL
#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_06_PIN
#endif #endif
#endif #endif
@ -511,7 +558,7 @@
//#define SHIFT_CLK_PIN 38 //#define SHIFT_CLK_PIN 38
//#define SHIFT_LD_PIN 42 //#define SHIFT_LD_PIN 42
//#define SHIFT_OUT_PIN 40 //#define SHIFT_OUT_PIN 40
//#define SHIFT_EN_PIN 17 //#define SHIFT_EN_PIN EXP1_08_PIN
#endif #endif
#endif #endif
@ -527,22 +574,22 @@
#if IS_RRD_SC #if IS_RRD_SC
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_10_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define BTN_EN1 17 #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 23 #define BTN_EN2 EXP1_06_PIN
#else #else
#define BTN_EN1 31 #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_06_PIN
#endif #endif
#define BTN_ENC 35 #define BTN_ENC EXP1_09_PIN
#ifndef SD_DETECT_PIN #ifndef SD_DETECT_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#endif #endif
#ifndef KILL_PIN #ifndef KILL_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_03_PIN
#endif #endif
#if ENABLED(BQ_LCD_SMART_CONTROLLER) #if ENABLED(BQ_LCD_SMART_CONTROLLER)
@ -562,7 +609,7 @@
#define BTN_EN2 43 #define BTN_EN2 43
#define BTN_ENC 32 #define BTN_ENC 32
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
#define KILL_PIN 41 #define KILL_PIN EXP2_03_PIN
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
@ -571,7 +618,7 @@
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#elif ANY(VIKI2, miniVIKI) #elif ANY(VIKI2, miniVIKI)
@ -579,87 +626,81 @@
#define DOGLCD_A0 44 #define DOGLCD_A0 44
#define LCD_SCREEN_ROT_180 #define LCD_SCREEN_ROT_180
#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_06_PIN
#define STAT_LED_RED_PIN 32 #define STAT_LED_RED_PIN 32
#define STAT_LED_BLUE_PIN 35 #define STAT_LED_BLUE_PIN EXP1_09_PIN
#define BTN_EN1 22 #define BTN_EN1 22
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC 39 #define BTN_ENC 39
#define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board #define SD_DETECT_PIN -1 // Pin 49 for display SD interface, 72 for easy adapter board
#define KILL_PIN 31 #define KILL_PIN EXP2_08_PIN
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define DOGLCD_CS 29 #define DOGLCD_CS EXP1_03_PIN
#define DOGLCD_A0 27 #define DOGLCD_A0 EXP1_04_PIN
#define BEEPER_PIN 23 #define BEEPER_PIN EXP1_06_PIN
#define LCD_BACKLIGHT_PIN 33 #define LCD_BACKLIGHT_PIN EXP2_06_PIN
#define BTN_EN1 35 #define BTN_EN1 EXP1_09_PIN
#define BTN_EN2 37 #define BTN_EN2 EXP1_10_PIN
#define BTN_ENC 31 #define BTN_ENC EXP2_08_PIN
#define LCD_SDSS SDSS #define LCD_SDSS SDSS
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_03_PIN
#elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864) #elif EITHER(MKS_MINI_12864, FYSETC_MINI_12864)
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC 35 #define BTN_ENC EXP1_09_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#ifndef KILL_PIN #ifndef KILL_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_03_PIN
#endif #endif
#if ENABLED(MKS_MINI_12864) #if ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 27 #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS 25 #define DOGLCD_CS EXP1_05_PIN
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
// not connected to a pin // not connected to a pin
#define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!) #define LCD_BACKLIGHT_PIN -1 // 65 (MKS mini12864 can't adjust backlight by software!)
#define BTN_EN1 31 #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 33 #define BTN_EN2 EXP2_06_PIN
#elif ENABLED(FYSETC_MINI_12864) #elif ENABLED(FYSETC_MINI_12864)
// From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8 // From https://wiki.fysetc.com/Mini12864_Panel/?fbclid=IwAR1FyjuNdVOOy9_xzky3qqo_WeM5h-4gpRnnWhQr_O1Ef3h0AFnFXmCehK8
#define DOGLCD_A0 16 #define DOGLCD_A0 EXP1_07_PIN
#define DOGLCD_CS 17 #define DOGLCD_CS EXP1_08_PIN
#define BTN_EN1 33 #define BTN_EN1 EXP2_06_PIN
#define BTN_EN2 31 #define BTN_EN2 EXP2_08_PIN
//#define FORCE_SOFT_SPI // Use this if default of hardware SPI causes display problems //#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 // results in LCD soft SPI mode 3, SD soft SPI mode 0
#define LCD_RESET_PIN 23 // 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) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN 25 #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN 27 #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN 29 #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN 25 #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#endif #endif
@ -673,17 +714,11 @@
#define DOGLCD_A0 44 #define DOGLCD_A0 44
#define DOGLCD_CS 66 #define DOGLCD_CS 66
// GLCD features
// Uncomment screen orientation
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#define LCD_SCREEN_ROT_270
#define BTN_EN1 40 #define BTN_EN1 40
#define BTN_EN2 63 #define BTN_EN2 63
#define BTN_ENC 59 #define BTN_ENC 59
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#define KILL_PIN 64 #define KILL_PIN 64
#elif ENABLED(ZONESTAR_LCD) #elif ENABLED(ZONESTAR_LCD)
@ -699,27 +734,27 @@
#elif IS_TFTGLCD_PANEL #elif IS_TFTGLCD_PANEL
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#else #else
// Beeper on AUX-4 // Beeper on AUX-4
#define BEEPER_PIN 33 #define BEEPER_PIN EXP2_06_PIN
// Buttons are directly attached to AUX-2 // Buttons are directly attached to AUX-2
#if ENABLED(PANEL_ONE) #if ENABLED(PANEL_ONE)
#define BTN_EN1 59 // AUX2 PIN 3 #define BTN_EN1 59 // AUX2 PIN 3
#define BTN_EN2 63 // AUX2 PIN 4 #define BTN_EN2 63 // AUX2 PIN 4
#define BTN_ENC 49 // AUX3 PIN 7 #define BTN_ENC EXP2_04_PIN
#else #else
#define BTN_EN1 37 #define BTN_EN1 EXP1_10_PIN
#define BTN_EN2 35 #define BTN_EN2 EXP1_09_PIN
#define BTN_ENC 31 #define BTN_ENC EXP2_08_PIN
#endif #endif
#if ENABLED(G3D_PANEL) #if ENABLED(G3D_PANEL)
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#define KILL_PIN 41 #define KILL_PIN EXP2_03_PIN
#endif #endif
#endif #endif
@ -746,7 +781,8 @@
#error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue." #error "CAUTION! LCD_FYSETC_TFT81050 requires wiring modifications. See 'pins_RAMPS.h' for details. Comment out this line to continue."
/** FYSETC TFT TFT81050 display pinout /**
* FYSETC TFT-81050 display pinout
* *
* Board Display * Board Display
* _____ _____ * _____ _____
@ -771,16 +807,16 @@
* EXP2-7 ----------- EXP1-4 * EXP2-7 ----------- EXP1-4
* EXP2-8 ----------- EXP1-3 * EXP2-8 ----------- EXP1-3
* EXP2-1 ----------- EXP1-2 * EXP2-1 ----------- EXP1-2
* EXP1-10 ----------- EXP1-1 * EXP1-10 ---------- EXP1-1
* *
* NOTE: The MISO pin should not get a 5V signal. * NOTE: The MISO pin should not get a 5V signal.
* To fix, insert a 1N4148 diode in the MISO line. * To fix, insert a 1N4148 diode in the MISO line.
*/ */
#define BEEPER_PIN 37 #define BEEPER_PIN EXP1_10_PIN
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN EXP2_04_PIN
#define CLCD_MOD_RESET 31 #define CLCD_MOD_RESET EXP2_08_PIN
#define CLCD_SPI_CS 33 #define CLCD_SPI_CS EXP2_06_PIN
#endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050 #endif // TOUCH_UI_FTDI_EVE && LCD_FYSETC_TFT81050

View File

@ -268,23 +268,23 @@
* EXP2 EXP1 * EXP2 EXP1
*/ */
#define EXPA1_03_PIN PG7 #define EXP1_03_PIN PG7
#define EXPA1_04_PIN PG6 #define EXP1_04_PIN PG6
#define EXPA1_05_PIN PG3 #define EXP1_05_PIN PG3
#define EXPA1_06_PIN PG2 #define EXP1_06_PIN PG2
#define EXPA1_07_PIN PD10 #define EXP1_07_PIN PD10
#define EXPA1_08_PIN PD11 #define EXP1_08_PIN PD11
#define EXPA1_09_PIN PA8 #define EXP1_09_PIN PA8
#define EXPA1_10_PIN PG4 #define EXP1_10_PIN PG4
#define EXPA2_03_PIN -1 #define EXP2_03_PIN -1
#define EXPA2_04_PIN PF12 #define EXP2_04_PIN PF12
#define EXPA2_05_PIN PB15 #define EXP2_05_PIN PB15
#define EXPA2_06_PIN PF11 #define EXP2_06_PIN PF11
#define EXPA2_07_PIN PB12 #define EXP2_07_PIN PB12
#define EXPA2_08_PIN PG10 #define EXP2_08_PIN PG10
#define EXPA2_09_PIN PB13 #define EXP2_09_PIN PB13
#define EXPA2_10_PIN PB14 #define EXP2_10_PIN PB14
// //
// Onboard SD card // Onboard SD card
@ -292,8 +292,8 @@
// //
#if SD_CONNECTION_IS(LCD) #if SD_CONNECTION_IS(LCD)
#define SD_DETECT_PIN EXPA2_04_PIN #define SD_DETECT_PIN EXP2_04_PIN
#define SDSS EXPA2_07_PIN #define SDSS EXP2_07_PIN
#elif SD_CONNECTION_IS(ONBOARD) #elif SD_CONNECTION_IS(ONBOARD)
@ -325,36 +325,36 @@
*/ */
// M1 on Driver Expansion Module // M1 on Driver Expansion Module
#define E3_STEP_PIN EXPA2_05_PIN #define E3_STEP_PIN EXP2_05_PIN
#define E3_DIR_PIN EXPA2_06_PIN #define E3_DIR_PIN EXP2_06_PIN
#define E3_ENABLE_PIN EXPA2_04_PIN #define E3_ENABLE_PIN EXP2_04_PIN
#define E3_DIAG_PIN EXPA1_06_PIN #define E3_DIAG_PIN EXP1_06_PIN
#define E3_CS_PIN EXPA1_05_PIN #define E3_CS_PIN EXP1_05_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E3_SERIAL_TX_PIN EXPA1_05_PIN #define E3_SERIAL_TX_PIN EXP1_05_PIN
#define E3_SERIAL_RX_PIN EXPA1_05_PIN #define E3_SERIAL_RX_PIN EXP1_05_PIN
#endif #endif
// M2 on Driver Expansion Module // M2 on Driver Expansion Module
#define E4_STEP_PIN EXPA2_08_PIN #define E4_STEP_PIN EXP2_08_PIN
#define E4_DIR_PIN EXPA2_07_PIN #define E4_DIR_PIN EXP2_07_PIN
#define E4_ENABLE_PIN EXPA1_03_PIN #define E4_ENABLE_PIN EXP1_03_PIN
#define E4_DIAG_PIN EXPA1_08_PIN #define E4_DIAG_PIN EXP1_08_PIN
#define E4_CS_PIN EXPA1_07_PIN #define E4_CS_PIN EXP1_07_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E4_SERIAL_TX_PIN EXPA1_07_PIN #define E4_SERIAL_TX_PIN EXP1_07_PIN
#define E4_SERIAL_RX_PIN EXPA1_07_PIN #define E4_SERIAL_RX_PIN EXP1_07_PIN
#endif #endif
// M3 on Driver Expansion Module // M3 on Driver Expansion Module
#define E5_STEP_PIN EXPA2_10_PIN #define E5_STEP_PIN EXP2_10_PIN
#define E5_DIR_PIN EXPA2_09_PIN #define E5_DIR_PIN EXP2_09_PIN
#define E5_ENABLE_PIN EXPA1_04_PIN #define E5_ENABLE_PIN EXP1_04_PIN
#define E5_DIAG_PIN EXPA1_10_PIN #define E5_DIAG_PIN EXP1_10_PIN
#define E5_CS_PIN EXPA1_09_PIN #define E5_CS_PIN EXP1_09_PIN
#if HAS_TMC_UART #if HAS_TMC_UART
#define E5_SERIAL_TX_PIN EXPA1_09_PIN #define E5_SERIAL_TX_PIN EXP1_09_PIN
#define E5_SERIAL_RX_PIN EXPA1_09_PIN #define E5_SERIAL_RX_PIN EXP1_09_PIN
#endif #endif
#endif // BTT_MOTOR_EXPANSION #endif // BTT_MOTOR_EXPANSION
@ -365,23 +365,23 @@
#if IS_TFTGLCD_PANEL #if IS_TFTGLCD_PANEL
#if ENABLED(TFTGLCD_PANEL_SPI) #if ENABLED(TFTGLCD_PANEL_SPI)
#define TFTGLCD_CS EXPA2_08_PIN #define TFTGLCD_CS EXP2_08_PIN
#endif #endif
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#define BEEPER_PIN EXPA1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXPA1_04_PIN #define LCD_PINS_RS EXP1_04_PIN
#define BTN_EN1 EXPA1_08_PIN #define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXPA1_06_PIN #define BTN_EN2 EXP1_06_PIN
#define LCD_PINS_ENABLE EXPA1_03_PIN #define LCD_PINS_ENABLE EXP1_03_PIN
#define LCD_PINS_D4 EXPA1_05_PIN #define LCD_PINS_D4 EXP1_05_PIN
// CR10_STOCKDISPLAY default timing is too fast // CR10_STOCKDISPLAY default timing is too fast
#undef BOARD_ST7920_DELAY_1 #undef BOARD_ST7920_DELAY_1
@ -390,45 +390,45 @@
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 EXPA1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXPA1_05_PIN #define DOGLCD_CS EXP1_05_PIN
#define BTN_EN1 EXPA2_08_PIN #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXPA2_06_PIN #define BTN_EN2 EXP2_06_PIN
#else #else
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA2_08_PIN #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXPA2_06_PIN #define BTN_EN2 EXP2_06_PIN
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS EXPA1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXPA1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
//#define LCD_BACKLIGHT_PIN -1 //#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXPA1_05_PIN #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN EXPA1_04_PIN #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN EXPA1_03_PIN #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN EXPA1_05_PIN #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#endif // !FYSETC_MINI_12864 #endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 EXPA1_05_PIN #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN #define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder

View File

@ -161,38 +161,38 @@
* EXP3 * EXP3
*/ */
#define EXPA1_03_PIN PB7 #define EXP1_03_PIN PB7
#define EXPA1_04_PIN PB6 #define EXP1_04_PIN PB6
#define EXPA1_05_PIN PB14 #define EXP1_05_PIN PB14
#define EXPA1_06_PIN PB13 #define EXP1_06_PIN PB13
#define EXPA1_07_PIN PB12 #define EXP1_07_PIN PB12
#define EXPA1_08_PIN PB15 #define EXP1_08_PIN PB15
#define EXPA1_09_PIN PC12 #define EXP1_09_PIN PC12
#define EXPA1_10_PIN PC9 #define EXP1_10_PIN PC9
#define EXPA2_03_PIN -1 #define EXP2_03_PIN -1
#define EXPA2_04_PIN PC3 #define EXP2_04_PIN PC3
#define EXPA2_05_PIN PA7 #define EXP2_05_PIN PA7
#define EXPA2_06_PIN PC11 #define EXP2_06_PIN PC11
#define EXPA2_07_PIN PA4 #define EXP2_07_PIN PA4
#define EXPA2_08_PIN PC10 #define EXP2_08_PIN PC10
#define EXPA2_09_PIN PA5 #define EXP2_09_PIN PA5
#define EXPA2_10_PIN PA6 #define EXP2_10_PIN PA6
#if HAS_WIRED_LCD #if HAS_WIRED_LCD
#define BEEPER_PIN EXPA1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define BTN_ENC EXPA1_09_PIN #define BTN_ENC EXP1_09_PIN
#if ENABLED(CR10_STOCKDISPLAY) #if ENABLED(CR10_STOCKDISPLAY)
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA2_08_PIN #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXPA2_06_PIN #define BTN_EN2 EXP2_06_PIN
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
// CR10_STOCKDISPLAY default timing is too fast // CR10_STOCKDISPLAY default timing is too fast
#undef BOARD_ST7920_DELAY_1 #undef BOARD_ST7920_DELAY_1
@ -201,45 +201,45 @@
#elif ENABLED(MKS_MINI_12864) #elif ENABLED(MKS_MINI_12864)
#define DOGLCD_A0 EXPA1_04_PIN #define DOGLCD_A0 EXP1_04_PIN
#define DOGLCD_CS EXPA1_05_PIN #define DOGLCD_CS EXP1_05_PIN
#define BTN_EN1 EXPA2_08_PIN #define BTN_EN1 EXP2_08_PIN
#define BTN_EN2 EXPA2_06_PIN #define BTN_EN2 EXP2_06_PIN
#else #else
#define LCD_PINS_RS EXPA1_07_PIN #define LCD_PINS_RS EXP1_07_PIN
#define BTN_EN1 EXPA2_06_PIN #define BTN_EN1 EXP2_06_PIN
#define BTN_EN2 EXPA2_08_PIN #define BTN_EN2 EXP2_08_PIN
#define LCD_PINS_ENABLE EXPA1_08_PIN #define LCD_PINS_ENABLE EXP1_08_PIN
#define LCD_PINS_D4 EXPA1_06_PIN #define LCD_PINS_D4 EXP1_06_PIN
#if ENABLED(FYSETC_MINI_12864) #if ENABLED(FYSETC_MINI_12864)
#define DOGLCD_CS EXPA1_08_PIN #define DOGLCD_CS EXP1_08_PIN
#define DOGLCD_A0 EXPA1_07_PIN #define DOGLCD_A0 EXP1_07_PIN
//#define LCD_BACKLIGHT_PIN -1 //#define LCD_BACKLIGHT_PIN -1
#define LCD_RESET_PIN EXPA1_06_PIN // Must be high or open for LCD to operate normally. #define LCD_RESET_PIN EXP1_06_PIN // Must be high or open for LCD to operate normally.
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) #if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0)
#ifndef RGB_LED_R_PIN #ifndef RGB_LED_R_PIN
#define RGB_LED_R_PIN EXPA1_05_PIN #define RGB_LED_R_PIN EXP1_05_PIN
#endif #endif
#ifndef RGB_LED_G_PIN #ifndef RGB_LED_G_PIN
#define RGB_LED_G_PIN EXPA1_04_PIN #define RGB_LED_G_PIN EXP1_04_PIN
#endif #endif
#ifndef RGB_LED_B_PIN #ifndef RGB_LED_B_PIN
#define RGB_LED_B_PIN EXPA1_03_PIN #define RGB_LED_B_PIN EXP1_03_PIN
#endif #endif
#elif ENABLED(FYSETC_MINI_12864_2_1) #elif ENABLED(FYSETC_MINI_12864_2_1)
#define NEOPIXEL_PIN EXPA1_05_PIN #define NEOPIXEL_PIN EXP1_05_PIN
#endif #endif
#endif // !FYSETC_MINI_12864 #endif // !FYSETC_MINI_12864
#if IS_ULTIPANEL #if IS_ULTIPANEL
#define LCD_PINS_D5 EXPA1_05_PIN #define LCD_PINS_D5 EXP1_05_PIN
#define LCD_PINS_D6 EXPA1_04_PIN #define LCD_PINS_D6 EXP1_04_PIN
#define LCD_PINS_D7 EXPA1_03_PIN #define LCD_PINS_D7 EXP1_03_PIN
#if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER) #if ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)
#define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder #define BTN_ENC_EN LCD_PINS_D7 // Detect the presence of the encoder
@ -265,7 +265,7 @@
#endif #endif
#if ENABLED(TOUCH_UI_FTDI_EVE) #if ENABLED(TOUCH_UI_FTDI_EVE)
#define BEEPER_PIN EXPA1_10_PIN #define BEEPER_PIN EXP1_10_PIN
#define CLCD_MOD_RESET EXPA2_08_PIN #define CLCD_MOD_RESET EXP2_08_PIN
#define CLCD_SPI_CS EXPA2_06_PIN #define CLCD_SPI_CS EXP2_06_PIN
#endif #endif