MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

✨ Ender-3 V2 DWIN for BTT Octopus V1.1 (#24983)

Browse Source
This commit is contained in:
Taylor Talkington 2022-11-27 22:41:27 -05:00 committed by Scott Lahteine
parent 6f5ad55953
commit 95019bf526
2 changed files with 25 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/inc/Conditionals_adv.h
View File

@ -1078,7 +1078,7 @@
*/ */
#ifndef LCD_SERIAL_PORT #ifndef LCD_SERIAL_PORT
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD #if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
#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) #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)
#define LCD_SERIAL_PORT 1 #define LCD_SERIAL_PORT 1
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN) #elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_V423, MKS_ROBIN)
#define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin #define LCD_SERIAL_PORT 2 // Creality Ender3S1, MKS Robin

24
Marlin/src/pins/stm32f4/pins_BTT_OCTOPUS_V1_common.h
View File

@ -429,6 +429,30 @@
#define TFTGLCD_CS EXP2_03_PIN #define TFTGLCD_CS EXP2_03_PIN
#endif #endif
#elif HAS_DWIN_E3V2 || IS_DWIN_MARLINUI
/**
* ------ ------ ---
* | 1 2 | | 1 2 | 1 |
* | 3 4 | RX | 3 4 | TX | 2 | RX
* ENT 5 6 | BEEP ENT 5 6 | BEEP | 3 | TX
* B | 7 8 | A B | 7 8 | A | 4 |
* GND | 9 10 | VCC GND | 9 10 | VCC 5 |
* ------ ------ ---
* EXP1 DWIN TFT
*
* DWIN pins are labeled as printed on DWIN PCB. GND, VCC, A, B, ENT & BEEP can be connected in the same
* orientation as the existing plug/DWIN to EXP1. TX/RX need to be connected to the TFT port, with TX->RX, RX->TX.
*/
#ifndef NO_CONTROLLER_CUSTOM_WIRING_WARNING
#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.)"
#endif
#define BEEPER_PIN EXP1_06_PIN
#define BTN_EN1 EXP1_08_PIN
#define BTN_EN2 EXP1_07_PIN
#define BTN_ENC EXP1_05_PIN
#elif HAS_WIRED_LCD #elif HAS_WIRED_LCD
#define BEEPER_PIN EXP1_01_PIN #define BEEPER_PIN EXP1_01_PIN