Skip to content

Commit 48b5362

Browse files
thinkyheadthinkyhead
committed
🔧 DWIN_CREALITY_LCD_ENHANCED => DWIN_LCD_PROUI
Followup to MarlinFirmware#23624
1 parent 4e467e9 commit 48b5362

35 files changed

+94
-92
lines changed

‎Marlin/Configuration.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -2807,7 +2807,7 @@
28072807
// Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
28082808
//
28092809
//#define DWIN_CREALITY_LCD // Creality UI
2810-
//#define DWIN_CREALITY_LCD_ENHANCED // Enhanced UI
2810+
//#define DWIN_LCD_PROUI // Pro UI by MRiscoC
28112811
//#define DWIN_CREALITY_LCD_JYERSUI // Jyers UI by Jacob Myers
28122812
//#define DWIN_MARLINUI_PORTRAIT // MarlinUI (portrait orientation)
28132813
//#define DWIN_MARLINUI_LANDSCAPE // MarlinUI (landscape orientation)

‎Marlin/Configuration_adv.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -1335,11 +1335,11 @@
13351335

13361336
#endif // HAS_MARLINUI_MENU
13371337

1338-
#if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
1338+
#if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
13391339
//#define SOUND_MENU_ITEM // Add a mute option to the LCD menu
13401340
#endif
13411341

1342-
#if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
1342+
#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
13431343
// The timeout (in ms) to return to the status screen from sub-menus
13441344
//#define LCD_TIMEOUT_TO_STATUS 15000
13451345

‎Marlin/src/MarlinCore.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
#include "lcd/e3v2/common/encoder.h"
7575
#if ENABLED(DWIN_CREALITY_LCD)
7676
#include "lcd/e3v2/creality/dwin.h"
77-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
77+
#elif ENABLED(DWIN_LCD_PROUI)
7878
#include "lcd/e3v2/proui/dwin.h"
7979
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
8080
#include "lcd/e3v2/jyersui/dwin.h"
@@ -878,7 +878,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
878878
// Echo the LCD message to serial for extra context
879879
if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
880880

881-
#if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
881+
#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
882882
ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));
883883
#else
884884
UNUSED(lcd_error); UNUSED(lcd_component);

‎Marlin/src/feature/pause.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757

5858
#if ENABLED(EXTENSIBLE_UI)
5959
#include "../lcd/extui/ui_api.h"
60-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
60+
#elif ENABLED(DWIN_LCD_PROUI)
6161
#include "../lcd/e3v2/proui/dwin.h"
6262
#endif
6363

@@ -281,7 +281,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
281281
// Show "Purge More" / "Resume" menu and wait for reply
282282
KEEPALIVE_STATE(PAUSED_FOR_USER);
283283
wait_for_user = false;
284-
#if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
284+
#if EITHER(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
285285
ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
286286
#else
287287
pause_menu_response = PAUSE_RESPONSE_WAIT_FOR;
@@ -549,7 +549,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
549549

550550
TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING)));
551551

552-
TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING));
552+
TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATING));
553553

554554
// Re-enable the heaters if they timed out
555555
HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e);
@@ -567,7 +567,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
567567

568568
TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
569569
TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE)));
570-
TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE));
570+
TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATDONE));
571571

572572
IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
573573

@@ -711,7 +711,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
711711

712712
TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
713713
TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
714-
TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
714+
TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
715715
}
716716

717717
#endif // ADVANCED_PAUSE_FEATURE

‎Marlin/src/feature/runout.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ bool FilamentMonitorBase::enabled = true,
6868

6969
#if ENABLED(EXTENSIBLE_UI)
7070
#include "../lcd/extui/ui_api.h"
71-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
71+
#elif ENABLED(DWIN_LCD_PROUI)
7272
#include "../lcd/e3v2/proui/dwin.h"
7373
#endif
7474

@@ -88,7 +88,7 @@ void event_filament_runout(const uint8_t extruder) {
8888
#endif
8989

9090
TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder)));
91-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_FilamentRunout(extruder));
91+
TERN_(DWIN_LCD_PROUI, DWIN_FilamentRunout(extruder));
9292

9393
#if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
9494
const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);

‎Marlin/src/gcode/bedlevel/abl/G29.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
#include "../../../lcd/extui/ui_api.h"
5656
#elif ENABLED(DWIN_CREALITY_LCD)
5757
#include "../../../lcd/e3v2/creality/dwin.h"
58-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
58+
#elif ENABLED(DWIN_LCD_PROUI)
5959
#include "../../../lcd/e3v2/proui/dwin.h"
6060
#endif
6161

@@ -427,7 +427,7 @@ G29_TYPE GcodeSuite::G29() {
427427
points[0].z = points[1].z = points[2].z = 0; // Probe at 3 arbitrary points
428428
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
429429
TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
430-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart());
430+
TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
431431
#endif
432432

433433
if (!faux) {
@@ -721,7 +721,7 @@ G29_TYPE GcodeSuite::G29() {
721721

722722
#endif // AUTO_BED_LEVELING_3POINT
723723

724-
TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
724+
ui.reset_status();
725725

726726
// Stow the probe. No raise for FIX_MOUNTED_PROBE.
727727
if (probe.stow()) {

‎Marlin/src/gcode/bedlevel/mbl/G29.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
#if ENABLED(EXTENSIBLE_UI)
4242
#include "../../../lcd/extui/ui_api.h"
43-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
43+
#elif ENABLED(DWIN_LCD_PROUI)
4444
#include "../../../lcd/e3v2/proui/dwin.h"
4545
#endif
4646

@@ -193,7 +193,7 @@ void GcodeSuite::G29() {
193193
if (parser.seenval('Z')) {
194194
mbl.z_values[ix][iy] = parser.value_linear_units();
195195
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy]));
196-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
196+
TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy]));
197197
}
198198
else
199199
return echo_not_entered('Z');

‎Marlin/src/gcode/bedlevel/ubl/M421.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
#if ENABLED(EXTENSIBLE_UI)
3535
#include "../../../lcd/extui/ui_api.h"
36-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
36+
#elif ENABLED(DWIN_LCD_PROUI)
3737
#include "../../../lcd/e3v2/proui/dwin.h"
3838
#endif
3939

@@ -69,7 +69,7 @@ void GcodeSuite::M421() {
6969
float &zval = ubl.z_values[ij.x][ij.y]; // Altering this Mesh Point
7070
zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0); // N=NAN, Z=NEWVAL, or Q=ADDVAL
7171
TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval)); // Ping ExtUI in case it's showing the mesh
72-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ij.x, ij.y, zval));
72+
TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ij.x, ij.y, zval));
7373
}
7474
}
7575

‎Marlin/src/gcode/calibrate/G28.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
#include "../../lcd/extui/ui_api.h"
5252
#elif ENABLED(DWIN_CREALITY_LCD)
5353
#include "../../lcd/e3v2/creality/dwin.h"
54-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
54+
#elif ENABLED(DWIN_LCD_PROUI)
5555
#include "../../lcd/e3v2/proui/dwin.h"
5656
#endif
5757

‎Marlin/src/gcode/control/M997.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
#if ENABLED(PLATFORM_M997_SUPPORT)
2626

27-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
27+
#if ENABLED(DWIN_LCD_PROUI)
2828
#include "../../lcd/e3v2/proui/dwin.h"
2929
#endif
3030

@@ -33,7 +33,7 @@
3333
*/
3434
void GcodeSuite::M997() {
3535

36-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
36+
TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
3737

3838
flashFirmware(parser.intval('S'));
3939

‎Marlin/src/gcode/feature/powerloss/M1000.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include "../../../lcd/extui/ui_api.h"
3434
#elif ENABLED(DWIN_CREALITY_LCD)
3535
#include "../../../lcd/e3v2/creality/dwin.h"
36-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
36+
#elif ENABLED(DWIN_LCD_PROUI)
3737
#include "../../../lcd/e3v2/proui/dwin.h"
3838
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
3939
#include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented

‎Marlin/src/gcode/lcd/M0_M1.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#include "../../lcd/marlinui.h"
3636
#elif ENABLED(EXTENSIBLE_UI)
3737
#include "../../lcd/extui/ui_api.h"
38-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
38+
#elif ENABLED(DWIN_LCD_PROUI)
3939
#include "../../lcd/e3v2/proui/dwin_popup.h"
4040
#include "../../lcd/e3v2/proui/dwin.h"
4141
#endif
@@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
7171
ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer
7272
else
7373
ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
74-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
74+
#elif ENABLED(DWIN_LCD_PROUI)
7575
if (parser.string_arg)
7676
DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
7777
else

‎Marlin/src/gcode/lcd/M73.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "../../lcd/marlinui.h"
2929
#include "../../sd/cardreader.h"
3030

31-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
31+
#if ENABLED(DWIN_LCD_PROUI)
3232
#include "../../lcd/e3v2/proui/dwin.h"
3333
#endif
3434

@@ -40,7 +40,7 @@
4040
*/
4141
void GcodeSuite::M73() {
4242

43-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
43+
#if ENABLED(DWIN_LCD_PROUI)
4444

4545
DWIN_Progress_Update();
4646

‎Marlin/src/gcode/sd/M1001.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949

5050
#if ENABLED(EXTENSIBLE_UI)
5151
#include "../../lcd/extui/ui_api.h"
52-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
52+
#elif ENABLED(DWIN_LCD_PROUI)
5353
#include "../../lcd/e3v2/proui/dwin.h"
5454
#endif
5555

@@ -109,7 +109,7 @@ void GcodeSuite::M1001() {
109109
#endif
110110

111111
TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
112-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
112+
TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
113113

114114
// Re-select the last printed file in the UI
115115
TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file());

‎Marlin/src/gcode/stats/M75-M78.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929

3030
#include "../../MarlinCore.h" // for startOrResumeJob
3131

32-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
32+
#if ENABLED(DWIN_LCD_PROUI)
3333
#include "../../lcd/e3v2/proui/dwin.h"
3434
#endif
3535

@@ -38,7 +38,7 @@
3838
*/
3939
void GcodeSuite::M75() {
4040
startOrResumeJob();
41-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
41+
#if ENABLED(DWIN_LCD_PROUI)
4242
DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
4343
DWIN_Print_Started(false);
4444
#endif
@@ -57,7 +57,7 @@ void GcodeSuite::M76() {
5757
*/
5858
void GcodeSuite::M77() {
5959
print_job_timer.stop();
60-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
60+
TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
6161
}
6262

6363
#if ENABLED(PRINTCOUNTER)

‎Marlin/src/gcode/temp/M303.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030

3131
#if ENABLED(EXTENSIBLE_UI)
3232
#include "../../lcd/extui/ui_api.h"
33-
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
33+
#elif ENABLED(DWIN_LCD_PROUI)
3434
#include "../../lcd/e3v2/proui/dwin.h"
3535
#endif
3636

@@ -73,7 +73,7 @@ void GcodeSuite::M303() {
7373
default:
7474
SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
7575
TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM));
76-
TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
76+
TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM));
7777
return;
7878
}
7979

@@ -83,7 +83,7 @@ void GcodeSuite::M303() {
8383
const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
8484
const bool u = parser.boolval('U');
8585

86-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
86+
#if ENABLED(DWIN_LCD_PROUI)
8787
if (seenC) HMI_data.PidCycles = c;
8888
if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; }
8989
#endif

‎Marlin/src/inc/Conditionals_LCD.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@
473473
#endif
474474

475475
// Aliases for LCD features
476-
#if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
476+
#if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
477477
#define HAS_DWIN_E3V2_BASIC 1
478478
#endif
479479
#if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
@@ -494,7 +494,7 @@
494494
#endif
495495
#define HAS_LCD_BRIGHTNESS 1
496496
#define LCD_BRIGHTNESS_MAX 250
497-
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
497+
#if ENABLED(DWIN_LCD_PROUI)
498498
#define LCD_BRIGHTNESS_DEFAULT 127
499499
#endif
500500
#endif

‎Marlin/src/inc/Conditionals_post.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -3177,7 +3177,7 @@
31773177
* Advanced Pause - Filament Change
31783178
*/
31793179
#if ENABLED(ADVANCED_PAUSE_FEATURE)
3180-
#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
3180+
#if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT)
31813181
#define M600_PURGE_MORE_RESUMABLE 1
31823182
#endif
31833183
#ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH

0 commit comments

Comments
 (0)