Browse Source

🔧 DWIN_CREALITY_LCD_ENHANCED => DWIN_LCD_PROUI

Followup to #23624
Scott Lahteine 2 years ago
parent
commit
48b5362cf0

+ 1
- 1
Marlin/Configuration.h View File

@@ -2807,7 +2807,7 @@
2807 2807
 // Ender-3 v2 OEM display. A DWIN display with Rotary Encoder.
2808 2808
 //
2809 2809
 //#define DWIN_CREALITY_LCD           // Creality UI
2810
-//#define DWIN_CREALITY_LCD_ENHANCED  // Enhanced UI
2810
+//#define DWIN_LCD_PROUI              // Pro UI by MRiscoC
2811 2811
 //#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers
2812 2812
 //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation)
2813 2813
 //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation)

+ 2
- 2
Marlin/Configuration_adv.h View File

@@ -1335,11 +1335,11 @@
1335 1335
 
1336 1336
 #endif // HAS_MARLINUI_MENU
1337 1337
 
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)
1339 1339
   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu
1340 1340
 #endif
1341 1341
 
1342
-#if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
1342
+#if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
1343 1343
   // The timeout (in ms) to return to the status screen from sub-menus
1344 1344
   //#define LCD_TIMEOUT_TO_STATUS 15000
1345 1345
 

+ 2
- 2
Marlin/src/MarlinCore.cpp View File

@@ -74,7 +74,7 @@
74 74
   #include "lcd/e3v2/common/encoder.h"
75 75
   #if ENABLED(DWIN_CREALITY_LCD)
76 76
     #include "lcd/e3v2/creality/dwin.h"
77
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
77
+  #elif ENABLED(DWIN_LCD_PROUI)
78 78
     #include "lcd/e3v2/proui/dwin.h"
79 79
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
80 80
     #include "lcd/e3v2/jyersui/dwin.h"
@@ -878,7 +878,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp
878 878
   // Echo the LCD message to serial for extra context
879 879
   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); }
880 880
 
881
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
881
+  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
882 882
     ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR));
883 883
   #else
884 884
     UNUSED(lcd_error); UNUSED(lcd_component);

+ 5
- 5
Marlin/src/feature/pause.cpp View File

@@ -57,7 +57,7 @@
57 57
 
58 58
 #if ENABLED(EXTENSIBLE_UI)
59 59
   #include "../lcd/extui/ui_api.h"
60
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
60
+#elif ENABLED(DWIN_LCD_PROUI)
61 61
   #include "../lcd/e3v2/proui/dwin.h"
62 62
 #endif
63 63
 
@@ -281,7 +281,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load
281 281
           // Show "Purge More" / "Resume" menu and wait for reply
282 282
           KEEPALIVE_STATE(PAUSED_FOR_USER);
283 283
           wait_for_user = false;
284
-          #if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
284
+          #if EITHER(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
285 285
             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR
286 286
           #else
287 287
             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
549 549
 
550 550
       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING)));
551 551
 
552
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING));
552
+      TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATING));
553 553
 
554 554
       // Re-enable the heaters if they timed out
555 555
       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
567 567
 
568 568
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR)));
569 569
       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));
571 571
 
572 572
       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true);
573 573
 
@@ -711,7 +711,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_
711 711
 
712 712
   TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
713 713
   TERN_(HAS_MARLINUI_MENU, ui.return_to_status());
714
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen());
714
+  TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen());
715 715
 }
716 716
 
717 717
 #endif // ADVANCED_PAUSE_FEATURE

+ 2
- 2
Marlin/src/feature/runout.cpp View File

@@ -68,7 +68,7 @@ bool FilamentMonitorBase::enabled = true,
68 68
 
69 69
 #if ENABLED(EXTENSIBLE_UI)
70 70
   #include "../lcd/extui/ui_api.h"
71
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
71
+#elif ENABLED(DWIN_LCD_PROUI)
72 72
   #include "../lcd/e3v2/proui/dwin.h"
73 73
 #endif
74 74
 
@@ -88,7 +88,7 @@ void event_filament_runout(const uint8_t extruder) {
88 88
   #endif
89 89
 
90 90
   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));
92 92
 
93 93
   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR)
94 94
     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder);

+ 3
- 3
Marlin/src/gcode/bedlevel/abl/G29.cpp View File

@@ -55,7 +55,7 @@
55 55
   #include "../../../lcd/extui/ui_api.h"
56 56
 #elif ENABLED(DWIN_CREALITY_LCD)
57 57
   #include "../../../lcd/e3v2/creality/dwin.h"
58
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
58
+#elif ENABLED(DWIN_LCD_PROUI)
59 59
   #include "../../../lcd/e3v2/proui/dwin.h"
60 60
 #endif
61 61
 
@@ -427,7 +427,7 @@ G29_TYPE GcodeSuite::G29() {
427 427
       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points
428 428
     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
429 429
       TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart());
430
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart());
430
+      TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart());
431 431
     #endif
432 432
 
433 433
     if (!faux) {
@@ -721,7 +721,7 @@ G29_TYPE GcodeSuite::G29() {
721 721
 
722 722
     #endif // AUTO_BED_LEVELING_3POINT
723 723
 
724
-    TERN_(HAS_STATUS_MESSAGE, ui.reset_status());
724
+    ui.reset_status();
725 725
 
726 726
     // Stow the probe. No raise for FIX_MOUNTED_PROBE.
727 727
     if (probe.stow()) {

+ 2
- 2
Marlin/src/gcode/bedlevel/mbl/G29.cpp View File

@@ -40,7 +40,7 @@
40 40
 
41 41
 #if ENABLED(EXTENSIBLE_UI)
42 42
   #include "../../../lcd/extui/ui_api.h"
43
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
43
+#elif ENABLED(DWIN_LCD_PROUI)
44 44
   #include "../../../lcd/e3v2/proui/dwin.h"
45 45
 #endif
46 46
 
@@ -193,7 +193,7 @@ void GcodeSuite::G29() {
193 193
       if (parser.seenval('Z')) {
194 194
         mbl.z_values[ix][iy] = parser.value_linear_units();
195 195
         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]));
197 197
       }
198 198
       else
199 199
         return echo_not_entered('Z');

+ 2
- 2
Marlin/src/gcode/bedlevel/ubl/M421.cpp View File

@@ -33,7 +33,7 @@
33 33
 
34 34
 #if ENABLED(EXTENSIBLE_UI)
35 35
   #include "../../../lcd/extui/ui_api.h"
36
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
36
+#elif ENABLED(DWIN_LCD_PROUI)
37 37
   #include "../../../lcd/e3v2/proui/dwin.h"
38 38
 #endif
39 39
 
@@ -69,7 +69,7 @@ void GcodeSuite::M421() {
69 69
     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point
70 70
     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL
71 71
     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));
73 73
   }
74 74
 }
75 75
 

+ 1
- 1
Marlin/src/gcode/calibrate/G28.cpp View File

@@ -51,7 +51,7 @@
51 51
   #include "../../lcd/extui/ui_api.h"
52 52
 #elif ENABLED(DWIN_CREALITY_LCD)
53 53
   #include "../../lcd/e3v2/creality/dwin.h"
54
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
54
+#elif ENABLED(DWIN_LCD_PROUI)
55 55
   #include "../../lcd/e3v2/proui/dwin.h"
56 56
 #endif
57 57
 

+ 2
- 2
Marlin/src/gcode/control/M997.cpp View File

@@ -24,7 +24,7 @@
24 24
 
25 25
 #if ENABLED(PLATFORM_M997_SUPPORT)
26 26
 
27
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
27
+#if ENABLED(DWIN_LCD_PROUI)
28 28
   #include "../../lcd/e3v2/proui/dwin.h"
29 29
 #endif
30 30
 
@@ -33,7 +33,7 @@
33 33
  */
34 34
 void GcodeSuite::M997() {
35 35
 
36
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen());
36
+  TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen());
37 37
 
38 38
   flashFirmware(parser.intval('S'));
39 39
 

+ 1
- 1
Marlin/src/gcode/feature/powerloss/M1000.cpp View File

@@ -33,7 +33,7 @@
33 33
   #include "../../../lcd/extui/ui_api.h"
34 34
 #elif ENABLED(DWIN_CREALITY_LCD)
35 35
   #include "../../../lcd/e3v2/creality/dwin.h"
36
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
36
+#elif ENABLED(DWIN_LCD_PROUI)
37 37
   #include "../../../lcd/e3v2/proui/dwin.h"
38 38
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
39 39
   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented

+ 2
- 2
Marlin/src/gcode/lcd/M0_M1.cpp View File

@@ -35,7 +35,7 @@
35 35
   #include "../../lcd/marlinui.h"
36 36
 #elif ENABLED(EXTENSIBLE_UI)
37 37
   #include "../../lcd/extui/ui_api.h"
38
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
38
+#elif ENABLED(DWIN_LCD_PROUI)
39 39
   #include "../../lcd/e3v2/proui/dwin_popup.h"
40 40
   #include "../../lcd/e3v2/proui/dwin.h"
41 41
 #endif
@@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() {
71 71
       ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer
72 72
     else
73 73
       ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
74
-  #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
74
+  #elif ENABLED(DWIN_LCD_PROUI)
75 75
     if (parser.string_arg)
76 76
       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT));
77 77
     else

+ 2
- 2
Marlin/src/gcode/lcd/M73.cpp View File

@@ -28,7 +28,7 @@
28 28
 #include "../../lcd/marlinui.h"
29 29
 #include "../../sd/cardreader.h"
30 30
 
31
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
31
+#if ENABLED(DWIN_LCD_PROUI)
32 32
   #include "../../lcd/e3v2/proui/dwin.h"
33 33
 #endif
34 34
 
@@ -40,7 +40,7 @@
40 40
  */
41 41
 void GcodeSuite::M73() {
42 42
 
43
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
43
+  #if ENABLED(DWIN_LCD_PROUI)
44 44
 
45 45
     DWIN_Progress_Update();
46 46
 

+ 2
- 2
Marlin/src/gcode/sd/M1001.cpp View File

@@ -49,7 +49,7 @@
49 49
 
50 50
 #if ENABLED(EXTENSIBLE_UI)
51 51
   #include "../../lcd/extui/ui_api.h"
52
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
52
+#elif ENABLED(DWIN_LCD_PROUI)
53 53
   #include "../../lcd/e3v2/proui/dwin.h"
54 54
 #endif
55 55
 
@@ -109,7 +109,7 @@ void GcodeSuite::M1001() {
109 109
   #endif
110 110
 
111 111
   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished());
112
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
112
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
113 113
 
114 114
   // Re-select the last printed file in the UI
115 115
   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file());

+ 3
- 3
Marlin/src/gcode/stats/M75-M78.cpp View File

@@ -29,7 +29,7 @@
29 29
 
30 30
 #include "../../MarlinCore.h" // for startOrResumeJob
31 31
 
32
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
32
+#if ENABLED(DWIN_LCD_PROUI)
33 33
   #include "../../lcd/e3v2/proui/dwin.h"
34 34
 #endif
35 35
 
@@ -38,7 +38,7 @@
38 38
  */
39 39
 void GcodeSuite::M75() {
40 40
   startOrResumeJob();
41
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
41
+  #if ENABLED(DWIN_LCD_PROUI)
42 42
     DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT));
43 43
     DWIN_Print_Started(false);
44 44
   #endif
@@ -57,7 +57,7 @@ void GcodeSuite::M76() {
57 57
  */
58 58
 void GcodeSuite::M77() {
59 59
   print_job_timer.stop();
60
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished());
60
+  TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished());
61 61
 }
62 62
 
63 63
 #if ENABLED(PRINTCOUNTER)

+ 3
- 3
Marlin/src/gcode/temp/M303.cpp View File

@@ -30,7 +30,7 @@
30 30
 
31 31
 #if ENABLED(EXTENSIBLE_UI)
32 32
   #include "../../lcd/extui/ui_api.h"
33
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
33
+#elif ENABLED(DWIN_LCD_PROUI)
34 34
   #include "../../lcd/e3v2/proui/dwin.h"
35 35
 #endif
36 36
 
@@ -73,7 +73,7 @@ void GcodeSuite::M303() {
73 73
     default:
74 74
       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID);
75 75
       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));
77 77
       return;
78 78
   }
79 79
 
@@ -83,7 +83,7 @@ void GcodeSuite::M303() {
83 83
   const celsius_t temp = seenS ? parser.value_celsius() : default_temp;
84 84
   const bool u = parser.boolval('U');
85 85
 
86
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
86
+  #if ENABLED(DWIN_LCD_PROUI)
87 87
     if (seenC) HMI_data.PidCycles = c;
88 88
     if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; }
89 89
   #endif

+ 2
- 2
Marlin/src/inc/Conditionals_LCD.h View File

@@ -473,7 +473,7 @@
473 473
 #endif
474 474
 
475 475
 // Aliases for LCD features
476
-#if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
476
+#if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
477 477
   #define HAS_DWIN_E3V2_BASIC 1
478 478
 #endif
479 479
 #if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI)
@@ -494,7 +494,7 @@
494 494
   #endif
495 495
   #define HAS_LCD_BRIGHTNESS 1
496 496
   #define LCD_BRIGHTNESS_MAX 250
497
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
497
+  #if ENABLED(DWIN_LCD_PROUI)
498 498
     #define LCD_BRIGHTNESS_DEFAULT 127
499 499
   #endif
500 500
 #endif

+ 1
- 1
Marlin/src/inc/Conditionals_post.h View File

@@ -3177,7 +3177,7 @@
3177 3177
  * Advanced Pause - Filament Change
3178 3178
  */
3179 3179
 #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)
3181 3181
     #define M600_PURGE_MORE_RESUMABLE 1
3182 3182
   #endif
3183 3183
   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH

+ 12
- 10
Marlin/src/inc/SanityCheck.h View File

@@ -615,6 +615,8 @@
615 615
   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2."
616 616
 #elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
617 617
   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
618
+#elif defined(DWIN_CREALITY_LCD_ENHANCED)
619
+  #error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI."
618 620
 #endif
619 621
 
620 622
 constexpr float arm[] = AXIS_RELATIVE_MODES;
@@ -846,7 +848,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
846 848
     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0."
847 849
   #endif
848 850
 #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI)
849
-  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
851
+  #error "LCD_SET_PROGRESS_MANUALLY requires LCD_PROGRESS_BAR, Character LCD, Graphical LCD, TFT, DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_*, OR EXTENSIBLE_UI."
850 852
 #endif
851 853
 
852 854
 #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY)
@@ -1830,7 +1832,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
1830 1832
  * LCD_BED_LEVELING requirements
1831 1833
  */
1832 1834
 #if ENABLED(LCD_BED_LEVELING)
1833
-  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED)
1835
+  #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_LCD_PROUI)
1834 1836
     #error "LCD_BED_LEVELING is not supported by the selected LCD controller."
1835 1837
   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL)
1836 1838
     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING."
@@ -2719,7 +2721,7 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2719 2721
   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \
2720 2722
   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \
2721 2723
   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \
2722
-  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
2724
+  + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \
2723 2725
   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \
2724 2726
   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \
2725 2727
   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \
@@ -2849,17 +2851,17 @@ static_assert(Y_MAX_LENGTH >= Y_BED_SIZE, "Movement bounds (Y_MIN_POS, Y_MAX_POS
2849 2851
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2850 2852
     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2851 2853
   #endif
2852
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
2854
+#elif ENABLED(DWIN_LCD_PROUI)
2853 2855
   #if DISABLED(SDSUPPORT)
2854
-    #error "DWIN_CREALITY_LCD_ENHANCED requires SDSUPPORT to be enabled."
2856
+    #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled."
2855 2857
   #elif ENABLED(PID_EDIT_MENU)
2856
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_EDIT_MENU."
2858
+    #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU."
2857 2859
   #elif ENABLED(PID_AUTOTUNE_MENU)
2858
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_AUTOTUNE_MENU."
2860
+    #error "DWIN_LCD_PROUI does not support PID_AUTOTUNE_MENU."
2859 2861
   #elif ENABLED(LEVEL_BED_CORNERS)
2860
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LEVEL_BED_CORNERS."
2862
+    #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS."
2861 2863
   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY)
2862
-    #error "DWIN_CREALITY_LCD_ENHANCED does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2864
+    #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY."
2863 2865
   #endif
2864 2866
 #endif
2865 2867
 
@@ -3438,7 +3440,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
3438 3440
   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel."
3439 3441
 #endif
3440 3442
 
3441
-#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED)
3443
+#if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI)
3442 3444
   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu."
3443 3445
 #endif
3444 3446
 

+ 2
- 2
Marlin/src/lcd/e3v2/proui/dwin.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
34
+#if ENABLED(DWIN_LCD_PROUI)
35 35
 
36 36
 #include "dwin.h"
37 37
 #include "dwin_popup.h"
@@ -3974,4 +3974,4 @@ void Draw_Steps_Menu() {
3974 3974
   }
3975 3975
 #endif
3976 3976
 
3977
-#endif // DWIN_CREALITY_LCD_ENHANCED
3977
+#endif // DWIN_LCD_PROUI

+ 2
- 2
Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
34
+#if ENABLED(DWIN_LCD_PROUI)
35 35
 
36 36
 #include "../../../inc/MarlinConfig.h"
37 37
 
@@ -159,4 +159,4 @@ void DWIN_SRAMToPic(uint8_t picID) {
159 159
 //  DWIN_Send(i);
160 160
 //}
161 161
 
162
-#endif // DWIN_CREALITY_LCD_ENHANCED
162
+#endif // DWIN_LCD_PROUI

+ 2
- 2
Marlin/src/lcd/e3v2/proui/dwin_popup.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
34
+#if ENABLED(DWIN_LCD_PROUI)
35 35
 
36 36
 #include "dwin.h"
37 37
 #include "dwin_popup.h"
@@ -60,4 +60,4 @@ void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) {
60 60
   DWIN_UpdateLCD();
61 61
 }
62 62
 
63
-#endif // DWIN_CREALITY_LCD_ENHANCED
63
+#endif // DWIN_LCD_PROUI

+ 2
- 2
Marlin/src/lcd/e3v2/proui/dwinui.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
34
+#if ENABLED(DWIN_LCD_PROUI)
35 35
 
36 36
 #include "../../../inc/MarlinConfig.h"
37 37
 #include "dwin_lcd.h"
@@ -453,4 +453,4 @@ MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void
453 453
   value = val;
454 454
 };
455 455
 
456
-#endif // DWIN_CREALITY_LCD_ENHANCED
456
+#endif // DWIN_LCD_PROUI

+ 2
- 2
Marlin/src/lcd/e3v2/proui/endstop_diag.cpp View File

@@ -32,7 +32,7 @@
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 #include "dwin_defines.h"
34 34
 
35
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_ESDIAG)
35
+#if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG)
36 36
 
37 37
 #include "endstop_diag.h"
38 38
 
@@ -108,4 +108,4 @@ void ESDiagClass::Update() {
108 108
   DWIN_UpdateLCD();
109 109
 }
110 110
 
111
-#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_ESDIAG
111
+#endif // DWIN_LCD_PROUI && HAS_ESDIAG

+ 2
- 2
Marlin/src/lcd/e3v2/proui/lockscreen.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
34
+#if ENABLED(DWIN_LCD_PROUI)
35 35
 
36 36
 #include "../../../core/types.h"
37 37
 #include "dwin_lcd.h"
@@ -75,4 +75,4 @@ void LockScreenClass::onEncoder(EncoderState encoder_diffState) {
75 75
   DWIN_UpdateLCD();
76 76
 }
77 77
 
78
-#endif // DWIN_CREALITY_LCD_ENHANCED
78
+#endif // DWIN_LCD_PROUI

+ 2
- 2
Marlin/src/lcd/e3v2/proui/meshviewer.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH)
34
+#if BOTH(DWIN_LCD_PROUI, HAS_MESH)
35 35
 
36 36
 #include "meshviewer.h"
37 37
 
@@ -109,4 +109,4 @@ void MeshViewerClass::Draw() {
109 109
   );
110 110
 }
111 111
 
112
-#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
112
+#endif // DWIN_LCD_PROUI && HAS_MESH

+ 2
- 2
Marlin/src/lcd/e3v2/proui/printstats.cpp View File

@@ -31,7 +31,7 @@
31 31
 
32 32
 #include "../../../inc/MarlinConfigPre.h"
33 33
 
34
-#if BOTH(DWIN_CREALITY_LCD_ENHANCED, PRINTCOUNTER)
34
+#if BOTH(DWIN_LCD_PROUI, PRINTCOUNTER)
35 35
 
36 36
 #include "printstats.h"
37 37
 
@@ -75,4 +75,4 @@ void PrintStatsClass::Reset() {
75 75
   HMI_AudioFeedback();
76 76
 }
77 77
 
78
-#endif // DWIN_CREALITY_LCD_ENHANCED && PRINTCOUNTER
78
+#endif // DWIN_LCD_PROUI && PRINTCOUNTER

+ 4
- 4
Marlin/src/lcd/marlinui.cpp View File

@@ -47,7 +47,7 @@ MarlinUI ui;
47 47
 
48 48
 #if ENABLED(DWIN_CREALITY_LCD)
49 49
   #include "e3v2/creality/dwin.h"
50
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
50
+#elif ENABLED(DWIN_LCD_PROUI)
51 51
   #include "fontutils.h"
52 52
   #include "e3v2/proui/dwin.h"
53 53
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
@@ -69,7 +69,7 @@ MarlinUI ui;
69 69
 constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
70 70
 
71 71
 #if HAS_STATUS_MESSAGE
72
-  #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
72
+  #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
73 73
     uint8_t MarlinUI::status_scroll_offset; // = 0
74 74
   #endif
75 75
   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
@@ -1522,13 +1522,13 @@ void MarlinUI::init() {
1522 1522
 
1523 1523
     #endif
1524 1524
 
1525
-    #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
1525
+    #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
1526 1526
       status_scroll_offset = 0;
1527 1527
     #endif
1528 1528
 
1529 1529
     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message));
1530 1530
     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message));
1531
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_CheckStatusMessage());
1531
+    TERN_(DWIN_LCD_PROUI, DWIN_CheckStatusMessage());
1532 1532
     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message));
1533 1533
   }
1534 1534
 

+ 4
- 4
Marlin/src/lcd/marlinui.h View File

@@ -57,7 +57,7 @@
57 57
 
58 58
 #if ENABLED(DWIN_CREALITY_LCD)
59 59
   #include "e3v2/creality/dwin.h"
60
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
60
+#elif ENABLED(DWIN_LCD_PROUI)
61 61
   #include "e3v2/proui/dwin.h"
62 62
 #endif
63 63
 
@@ -333,7 +333,7 @@ public:
333 333
 
334 334
   #if HAS_STATUS_MESSAGE
335 335
 
336
-    #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED)
336
+    #if EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI)
337 337
       #if ENABLED(STATUS_MESSAGE_SCROLLING)
338 338
         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
339 339
       #else
@@ -367,7 +367,7 @@ public:
367 367
   static void set_status(FSTR_P const fstr, const int8_t level=0);
368 368
   static void status_printf(const uint8_t level, FSTR_P const fmt, ...);
369 369
 
370
-  #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED)
370
+  #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI)
371 371
     static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component);
372 372
     #if DISABLED(LIGHTWEIGHT_UI)
373 373
       static void draw_status_message(const bool blink);
@@ -619,7 +619,7 @@ public:
619 619
     static bool use_click() { return false; }
620 620
   #endif
621 621
 
622
-  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI)
622
+  #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI)
623 623
     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder);
624 624
   #else
625 625
     static void _pause_show_message() {}

+ 2
- 2
Marlin/src/module/probe.cpp View File

@@ -87,7 +87,7 @@
87 87
 
88 88
 #if ENABLED(EXTENSIBLE_UI)
89 89
   #include "../lcd/extui/ui_api.h"
90
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
90
+#elif ENABLED(DWIN_LCD_PROUI)
91 91
   #include "../lcd/e3v2/proui/dwin.h"
92 92
 #endif
93 93
 
@@ -316,7 +316,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) {
316 316
 
317 317
       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR)));
318 318
       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe")));
319
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
319
+      TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR)));
320 320
       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response());
321 321
       ui.reset_status();
322 322
 

+ 7
- 7
Marlin/src/module/settings.cpp View File

@@ -74,7 +74,7 @@
74 74
 
75 75
 #if ENABLED(EXTENSIBLE_UI)
76 76
   #include "../lcd/extui/ui_api.h"
77
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
77
+#elif ENABLED(DWIN_LCD_PROUI)
78 78
   #include "../lcd/e3v2/proui/dwin.h"
79 79
 #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
80 80
   #include "../lcd/e3v2/jyersui/dwin.h"
@@ -487,7 +487,7 @@ typedef struct SettingsDataStruct {
487 487
   //
488 488
   // Ender-3 V2 DWIN
489 489
   //
490
-  #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
490
+  #if ENABLED(DWIN_LCD_PROUI)
491 491
     uint8_t dwin_data[eeprom_data_size];
492 492
   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
493 493
     uint8_t dwin_settings[CrealityDWIN.eeprom_data_size];
@@ -1465,7 +1465,7 @@ void MarlinSettings::postprocess() {
1465 1465
     //
1466 1466
     // Creality DWIN User Data
1467 1467
     //
1468
-    #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
1468
+    #if ENABLED(DWIN_LCD_PROUI)
1469 1469
     {
1470 1470
       char dwin_data[eeprom_data_size] = { 0 };
1471 1471
       DWIN_StoreSettings(dwin_data);
@@ -1610,7 +1610,7 @@ void MarlinSettings::postprocess() {
1610 1610
         stored_ver[1] = '\0';
1611 1611
       }
1612 1612
       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")");
1613
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
1613
+      TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION));
1614 1614
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_VERSION)));
1615 1615
 
1616 1616
       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version());
@@ -2408,7 +2408,7 @@ void MarlinSettings::postprocess() {
2408 2408
       //
2409 2409
       // Creality DWIN User Data
2410 2410
       //
2411
-      #if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
2411
+      #if ENABLED(DWIN_LCD_PROUI)
2412 2412
       {
2413 2413
         const char dwin_data[eeprom_data_size] = { 0 };
2414 2414
         _FIELD_TEST(dwin_data);
@@ -2512,7 +2512,7 @@ void MarlinSettings::postprocess() {
2512 2512
       else if (working_crc != stored_crc) {
2513 2513
         eeprom_error = true;
2514 2514
         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!");
2515
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
2515
+        TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_CRC));
2516 2516
         TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_CRC)));
2517 2517
         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc());
2518 2518
       }
@@ -2830,7 +2830,7 @@ void MarlinSettings::reset() {
2830 2830
     #endif
2831 2831
   #endif
2832 2832
 
2833
-  TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults());
2833
+  TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults());
2834 2834
   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings());
2835 2835
 
2836 2836
   //

+ 7
- 7
Marlin/src/module/temperature.cpp View File

@@ -51,7 +51,7 @@
51 51
 
52 52
 #if ENABLED(DWIN_CREALITY_LCD)
53 53
   #include "../lcd/e3v2/creality/dwin.h"
54
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
54
+#elif ENABLED(DWIN_LCD_PROUI)
55 55
   #include "../lcd/e3v2/proui/dwin.h"
56 56
 #endif
57 57
 
@@ -623,12 +623,12 @@ volatile bool Temperature::raw_temps_ready = false;
623 623
     TERN_(HAS_FAN_LOGIC, fan_update_ms = next_temp_ms + fan_update_interval_ms);
624 624
 
625 625
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED));
626
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
626
+    TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START));
627 627
 
628 628
     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) {
629 629
       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
630 630
       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
631
-      TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
631
+      TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
632 632
       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
633 633
       return;
634 634
     }
@@ -719,7 +719,7 @@ volatile bool Temperature::raw_temps_ready = false;
719 719
       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) {
720 720
         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH);
721 721
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH));
722
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
722
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH));
723 723
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH)));
724 724
         break;
725 725
       }
@@ -756,7 +756,7 @@ volatile bool Temperature::raw_temps_ready = false;
756 756
       #endif
757 757
       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) {
758 758
         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0));
759
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT));
759
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT));
760 760
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT));
761 761
         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT)));
762 762
         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT);
@@ -812,7 +812,7 @@ volatile bool Temperature::raw_temps_ready = false;
812 812
         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
813 813
 
814 814
         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
815
-        TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
815
+        TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
816 816
 
817 817
         goto EXIT_M303;
818 818
       }
@@ -830,7 +830,7 @@ volatile bool Temperature::raw_temps_ready = false;
830 830
     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color));
831 831
 
832 832
     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE));
833
-    TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE));
833
+    TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE));
834 834
 
835 835
     EXIT_M303:
836 836
       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true);

+ 1
- 1
Marlin/src/sd/cardreader.cpp View File

@@ -33,7 +33,7 @@
33 33
 
34 34
 #if ENABLED(DWIN_CREALITY_LCD)
35 35
   #include "../lcd/e3v2/creality/dwin.h"
36
-#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
36
+#elif ENABLED(DWIN_LCD_PROUI)
37 37
   #include "../lcd/e3v2/proui/dwin.h"
38 38
 #endif
39 39
 

+ 2
- 2
buildroot/tests/STM32F103RE_creality View File

@@ -15,8 +15,8 @@ exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3"
15 15
 
16 16
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
17 17
 opt_disable DWIN_CREALITY_LCD
18
-opt_enable DWIN_CREALITY_LCD_ENHANCED BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
19
-exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3"
18
+opt_enable DWIN_LCD_PROUI BLTOUCH AUTO_BED_LEVELING_UBL Z_SAFE_HOMING INDIVIDUAL_AXIS_HOMING_SUBMENU LCD_SET_PROGRESS_MANUALLY STATUS_MESSAGE_SCROLLING BAUD_RATE_GCODE
19
+exec_test $1 $2 "Ender 3 v2 with Pro UI" "$3"
20 20
 
21 21
 use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI"
22 22
 opt_disable DWIN_CREALITY_LCD

+ 1
- 1
ini/features.ini View File

@@ -47,7 +47,7 @@ SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https:/
47 47
 SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp>
48 48
 HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common>
49 49
 DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality>
50
-DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/proui>
50
+DWIN_LCD_PROUI                         = src_filter=+<src/lcd/e3v2/proui>
51 51
 DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui>
52 52
 IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui>
53 53
 HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft>

Loading…
Cancel
Save