diff --git a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h index c64d5b91a89ac..bc688451b84a5 100644 --- a/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h +++ b/Marlin/src/pins/stm32f4/pins_BTT_E3_RRF.h @@ -200,8 +200,8 @@ #if ENABLED(CR10_STOCKDISPLAY) #define BEEPER_PIN PE8 - #define BTN_ENC PE9 + #define BTN_ENC PE9 #define BTN_EN1 PE7 #define BTN_EN2 PB2 @@ -273,26 +273,27 @@ #define TFTGLCD_CS PE7 #endif + #elif ENABLED(LCD_FOR_MELZI) - + #error "CAUTION! LCD_FOR_MELZI requires wiring modifications. See 'pins_BTT_E3_RRF.h' for details. Comment out this line to continue." - - /** - * LCD_FOR_MELZI display pinout - * Needs custom cable: - * BTT E3 RRF LCD_FOR_MELZI Display Ribbon - * _____ _____ - * 5V | 1 2 | GND (LCD_RS) LCD_CS | 1 2 | ENC_B (BTN_EN1) - * (LCD_EN) PE11 | 3 4 | PB1 (LCD_RS) (LCD_EN) LCD_DATA | 3 4 | ENC_A (BTN_EN2) - * (LCD_D4) PE10 | 5 6 PB2 (BTN_EN2) (LCD_D4) LCD_SCLK | 5 6 | ENC_BTN (BTN_ENC) - * RESET | 7 8 | PE7 (BTN_EN1) (RESET) ESTOP | 7 8 | BEEPER - * (BTN_ENC) PE9 | 9 10| PE8 (BEEPER) 5V | 9 10| GND - * ----- ----- + + /** LCD_FOR_MELZI display pinout + * + * 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) + * ------ ------ * EXP1 Ribbon - * - * + * + * Needs custom cable: + * * Board Adapter Display Ribbon (coming from display) - * _________ + * * EXP1-1 ----------- EXP1-9 * EXP1-2 ----------- EXP1-10 * EXP1-3 ----------- EXP1-3 @@ -305,11 +306,9 @@ * EXP1-10 ----------- EXP1-8 */ - - //#define KILL_PIN #define BEEPER_PIN PE8 + #define BTN_ENC PE9 - #define BTN_EN1 PE7 #define BTN_EN2 PB2 @@ -317,16 +316,16 @@ #define LCD_PINS_ENABLE PE11 #define LCD_PINS_D4 PE10 - // LCD_FOR_MELZI default timing is too fast, this works but maybe could be reduced: - #define BOARD_ST7920_DELAY_1 200 - #define BOARD_ST7920_DELAY_2 400 - #define BOARD_ST7920_DELAY_3 1200 #else #error "Only CR10_STOCKDISPLAY, ZONESTAR_LCD, ENDER2_STOCKDISPLAY, MKS_MINI_12864, LCD_FOR_MELZI, and TFTGLCD_PANEL_(SPI|I2C) are currently supported on the BTT_E3_RRF." #endif // Alter timing for graphical display - #if IS_U8GLIB_ST7920 + #if ENABLED(LCD_FOR_MELZI) // LCD_FOR_MELZI default timing is too fast. This works but may be reduced. + #define BOARD_ST7920_DELAY_1 200 + #define BOARD_ST7920_DELAY_2 400 + #define BOARD_ST7920_DELAY_3 1200 + #elif IS_U8GLIB_ST7920 #define BOARD_ST7920_DELAY_1 96 #define BOARD_ST7920_DELAY_2 48 #define BOARD_ST7920_DELAY_3 600 @@ -353,7 +352,7 @@ * Needs custom cable: * * Board Adapter Display - * _________ + * * EXP1-1 ----------- EXP1-10 * EXP1-2 ----------- EXP1-9 * SPI1-4 ----------- EXP1-6