Skip to content

Commit 95019bf

Browse files
The-EGthinkyhead
authored andcommitted
✨ Ender-3 V2 DWIN for BTT Octopus V1.1 (MarlinFirmware#24983)
1 parent 6f5ad55 commit 95019bf

File tree

2 files changed

+25
-1
lines changed

2 files changed

+25
-1
lines changed

Marlin/src/inc/Conditionals_adv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,7 @@
10781078
*/
10791079
#ifndef LCD_SERIAL_PORT
10801080
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
1081-
#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO)
1081+
#if MB(BTT_SKR_MINI_E3_V1_0, BTT_SKR_MINI_E3_V1_2, BTT_SKR_MINI_E3_V2_0, BTT_SKR_MINI_E3_V3_0, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1)
10821082
#define LCD_SERIAL_PORT 1
10831083
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN)
10841084
#define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin

Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,30 @@
429429
#define TFTGLCD_CS EXP2_03_PIN
430430
#endif
431431

432+
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
433+
/**
434+
* ------ ------ ---
435+
* | 1 2 | | 1 2 | 1 |
436+
* | 3 4 | RX | 3 4 | TX | 2 | RX
437+
* ENT 5 6 | BEEP ENT 5 6 | BEEP | 3 | TX
438+
* B | 7 8 | A B | 7 8 | A | 4 |
439+
* GND | 9 10 | VCC GND | 9 10 | VCC 5 |
440+
* ------ ------ ---
441+
* EXP1 DWIN TFT
442+
*
443+
* DWIN pins are labeled as printed on DWIN PCB. GND, VCC, A, B, ENT & BEEP can be connected in the same
444+
* orientation as the existing plug/DWIN to EXP1. TX/RX need to be connected to the TFT port, with TX->RX, RX->TX.
445+
*/
446+
447+
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
448+
#error "CAUTION! Ender-3 V2 display requires a custom cable. See 'pins_BTT_OCTOPUS_V1_common.h' for details. (Define NO_CONTROLLER_CUSTOM_WIRING_WARNING to suppress this warning.)"
449+
#endif
450+
451+
#define BEEPER_PIN EXP1_06_PIN
452+
#define BTN_EN1 EXP1_08_PIN
453+
#define BTN_EN2 EXP1_07_PIN
454+
#define BTN_ENC EXP1_05_PIN
455+
432456
#elif HAS_WIRED_LCD
433457

434458
#define BEEPER_PIN EXP1_01_PIN

0 commit comments

Comments
 (0)