Skip to content

✨ Add Ender-3 V2 LCD support for SKR 3/EZ #27061

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 7 commits into from
May 20, 2024
Merged

✨ Add Ender-3 V2 LCD support for SKR 3/EZ #27061

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
37e76c2
Add support for SKR3 and SKR3 EZ
May 8, 2024
459501a
Merge branch 'bugfix-2.1.x' into PR/add_skr3_and_EZ_support
vrooze May 8, 2024
90df02d
Update pins_BTT_SKR_V3_0_common.h
vrooze May 8, 2024
1ca6724
Update Conditionals_adv.h
vrooze May 8, 2024
91d3d4d
Formatting fixes on pins file
May 8, 2024
f0762e8
Merge branch 'PR/add_skr3_and_EZ_support' of github.com:vrooze/Marlin…
May 8, 2024
f2630d2
Merge branch 'bugfix-2.1.x' into pr/27061
thinkyhead May 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Marlin/src/inc/Conditionals_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1311,7 +1311,8 @@
* currently HAL.h must be included ahead of pins.h.
*/
#if LCD_IS_SERIAL_HOST && !defined(LCD_SERIAL_PORT)
#if MB(MKS_MONSTER8_V1, 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_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, AQUILA_V101)
#if MB(MKS_MONSTER8_V1, 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_MINI_E3_V3_0_1, BTT_SKR_E3_TURBO, BTT_OCTOPUS_V1_1, BTT_SKR_V3_0, BTT_SKR_V3_0_EZ, AQUILA_V101)

#define LCD_SERIAL_PORT 1
#elif MB(CREALITY_V24S1_301, CREALITY_V24S1_301F4, CREALITY_F401RE, CREALITY_V423, CREALITY_CR4NTXXC10, MKS_ROBIN, PANOWIN_CUTLASS, KODAMA_BARDO)
#define LCD_SERIAL_PORT 2
Expand Down
23 changes: 23 additions & 0 deletions Marlin/src/pins/stm32h7/pins_BTT_SKR_V3_0_common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -440,6 +440,29 @@
#define TFTGLCD_CS EXP2_03_PIN
#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_SKR_V3_0_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

#define BEEPER_PIN EXP1_01_PIN
Expand Down