Skip to content

Consolidate Ender-3 V2 DWIN common code #22778

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
Sep 16, 2021
Merged

Consolidate Ender-3 V2 DWIN common code #22778

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
da78d20
Adjust some formatting
thinkyhead Sep 15, 2021
05b6397
Standard heading, not suitable for LGPL
thinkyhead Sep 15, 2021
4a32ff5
Common encoder functions
thinkyhead Sep 15, 2021
6c3125d
Use ui.buzzer_enabled
thinkyhead Sep 15, 2021
595a526
Fix mesh array references
thinkyhead Sep 15, 2021
21b3aec
Consolidate common E3V2 code
thinkyhead Sep 15, 2021
95b8b0a
Fix includes, API changes
thinkyhead Sep 15, 2021
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
18 changes: 9 additions & 9 deletions Marlin/src/MarlinCore.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,15 +74,15 @@
#include <lvgl.h>
#endif

#if ENABLED(DWIN_CREALITY_LCD)
#include "lcd/e3v2/creality/dwin.h"
#include "lcd/e3v2/creality/rotary_encoder.h"
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#include "lcd/e3v2/enhanced/dwin.h"
#include "lcd/e3v2/enhanced/rotary_encoder.h"
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
#include "lcd/e3v2/jyersui/dwin.h"
#include "lcd/e3v2/jyersui/rotary_encoder.h"
#if HAS_DWIN_E3V2
#include "lcd/e3v2/common/encoder.h"
#if ENABLED(DWIN_CREALITY_LCD)
#include "lcd/e3v2/creality/dwin.h"
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#include "lcd/e3v2/enhanced/dwin.h"
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
#include "lcd/e3v2/jyersui/dwin.h"
#endif
#endif

#if ENABLED(EXTENSIBLE_UI)
Expand Down
3 changes: 2 additions & 1 deletion Marlin/src/inc/Conditionals_post.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -421,8 +421,9 @@
#endif
#endif

#if EITHER(DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
#if EITHER(HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
#define HAS_LCD_BRIGHTNESS 1
#define MAX_LCD_BRIGHTNESS 31
#endif

/**
Expand Down
Loading