committed by
					
						 Scott Lahteine
						Scott Lahteine
					
				
			
			
				
	
			
			
			
						parent
						
							152ec49b8b
						
					
				
				
					commit
					b669aa49cc
				
			| @@ -2807,7 +2807,7 @@ | |||||||
| // Ender-3 v2 OEM display. A DWIN display with Rotary Encoder. | // Ender-3 v2 OEM display. A DWIN display with Rotary Encoder. | ||||||
| // | // | ||||||
| //#define DWIN_CREALITY_LCD           // Creality UI | //#define DWIN_CREALITY_LCD           // Creality UI | ||||||
| //#define DWIN_CREALITY_LCD_ENHANCED  // Enhanced UI | //#define DWIN_LCD_PROUI              // Pro UI by MRiscoC | ||||||
| //#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers | //#define DWIN_CREALITY_LCD_JYERSUI   // Jyers UI by Jacob Myers | ||||||
| //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation) | //#define DWIN_MARLINUI_PORTRAIT      // MarlinUI (portrait orientation) | ||||||
| //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation) | //#define DWIN_MARLINUI_LANDSCAPE     // MarlinUI (landscape orientation) | ||||||
|   | |||||||
| @@ -1335,11 +1335,11 @@ | |||||||
|  |  | ||||||
| #endif // HAS_MARLINUI_MENU | #endif // HAS_MARLINUI_MENU | ||||||
|  |  | ||||||
| #if ANY(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) | #if ANY(HAS_DISPLAY, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) | ||||||
|   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu |   //#define SOUND_MENU_ITEM   // Add a mute option to the LCD menu | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED) | #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI) | ||||||
|   // The timeout (in ms) to return to the status screen from sub-menus |   // The timeout (in ms) to return to the status screen from sub-menus | ||||||
|   //#define LCD_TIMEOUT_TO_STATUS 15000 |   //#define LCD_TIMEOUT_TO_STATUS 15000 | ||||||
|  |  | ||||||
|   | |||||||
| @@ -74,7 +74,7 @@ | |||||||
|   #include "lcd/e3v2/common/encoder.h" |   #include "lcd/e3v2/common/encoder.h" | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD) |   #if ENABLED(DWIN_CREALITY_LCD) | ||||||
|     #include "lcd/e3v2/creality/dwin.h" |     #include "lcd/e3v2/creality/dwin.h" | ||||||
|   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|     #include "lcd/e3v2/proui/dwin.h" |     #include "lcd/e3v2/proui/dwin.h" | ||||||
|   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) |   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | ||||||
|     #include "lcd/e3v2/jyersui/dwin.h" |     #include "lcd/e3v2/jyersui/dwin.h" | ||||||
| @@ -878,7 +878,7 @@ void kill(FSTR_P const lcd_error/*=nullptr*/, FSTR_P const lcd_component/*=nullp | |||||||
|   // Echo the LCD message to serial for extra context |   // Echo the LCD message to serial for extra context | ||||||
|   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); } |   if (lcd_error) { SERIAL_ECHO_START(); SERIAL_ECHOLNF(lcd_error); } | ||||||
|  |  | ||||||
|   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED) |   #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI) | ||||||
|     ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR)); |     ui.kill_screen(lcd_error ?: GET_TEXT_F(MSG_KILLED), lcd_component ?: FPSTR(NUL_STR)); | ||||||
|   #else |   #else | ||||||
|     UNUSED(lcd_error); UNUSED(lcd_component); |     UNUSED(lcd_error); UNUSED(lcd_component); | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../lcd/extui/ui_api.h" |   #include "../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -281,7 +281,7 @@ bool load_filament(const_float_t slow_load_length/*=0*/, const_float_t fast_load | |||||||
|           // Show "Purge More" / "Resume" menu and wait for reply |           // Show "Purge More" / "Resume" menu and wait for reply | ||||||
|           KEEPALIVE_STATE(PAUSED_FOR_USER); |           KEEPALIVE_STATE(PAUSED_FOR_USER); | ||||||
|           wait_for_user = false; |           wait_for_user = false; | ||||||
|           #if EITHER(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED) |           #if EITHER(HAS_MARLINUI_MENU, DWIN_LCD_PROUI) | ||||||
|             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR |             ui.pause_show_message(PAUSE_MESSAGE_OPTION); // Also sets PAUSE_RESPONSE_WAIT_FOR | ||||||
|           #else |           #else | ||||||
|             pause_menu_response = PAUSE_RESPONSE_WAIT_FOR; |             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 | |||||||
|  |  | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING))); |       TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(GET_TEXT_F(MSG_REHEATING))); | ||||||
|  |  | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATING)); |       TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATING)); | ||||||
|  |  | ||||||
|       // Re-enable the heaters if they timed out |       // Re-enable the heaters if they timed out | ||||||
|       HOTEND_LOOP() thermalManager.reset_hotend_idle_timer(e); |       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 | |||||||
|  |  | ||||||
|       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR))); |       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, GET_TEXT_F(MSG_REHEATDONE), FPSTR(CONTINUE_STR))); | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE))); |       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_REHEATDONE))); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_REHEATDONE)); |       TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_REHEATDONE)); | ||||||
|  |  | ||||||
|       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true); |       IF_DISABLED(PAUSE_REHEAT_FAST_RESUME, wait_for_user = true); | ||||||
|  |  | ||||||
| @@ -711,7 +711,7 @@ void resume_print(const_float_t slow_load_length/*=0*/, const_float_t fast_load_ | |||||||
|  |  | ||||||
|   TERN_(HAS_STATUS_MESSAGE, ui.reset_status()); |   TERN_(HAS_STATUS_MESSAGE, ui.reset_status()); | ||||||
|   TERN_(HAS_MARLINUI_MENU, ui.return_to_status()); |   TERN_(HAS_MARLINUI_MENU, ui.return_to_status()); | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, HMI_ReturnScreen()); |   TERN_(DWIN_LCD_PROUI, HMI_ReturnScreen()); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // ADVANCED_PAUSE_FEATURE | #endif // ADVANCED_PAUSE_FEATURE | ||||||
|   | |||||||
| @@ -68,7 +68,7 @@ bool FilamentMonitorBase::enabled = true, | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../lcd/extui/ui_api.h" |   #include "../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -88,7 +88,7 @@ void event_filament_runout(const uint8_t extruder) { | |||||||
|   #endif |   #endif | ||||||
|  |  | ||||||
|   TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder))); |   TERN_(EXTENSIBLE_UI, ExtUI::onFilamentRunout(ExtUI::getTool(extruder))); | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_FilamentRunout(extruder)); |   TERN_(DWIN_LCD_PROUI, DWIN_FilamentRunout(extruder)); | ||||||
|  |  | ||||||
|   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR) |   #if ANY(HOST_PROMPT_SUPPORT, HOST_ACTION_COMMANDS, MULTI_FILAMENT_SENSOR) | ||||||
|     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder); |     const char tool = '0' + TERN0(MULTI_FILAMENT_SENSOR, extruder); | ||||||
|   | |||||||
| @@ -55,7 +55,7 @@ | |||||||
|   #include "../../../lcd/extui/ui_api.h" |   #include "../../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD) | #elif ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "../../../lcd/e3v2/creality/dwin.h" |   #include "../../../lcd/e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../../lcd/e3v2/proui/dwin.h" |   #include "../../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -427,7 +427,7 @@ G29_TYPE GcodeSuite::G29() { | |||||||
|       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points |       points[0].z = points[1].z = points[2].z = 0;  // Probe at 3 arbitrary points | ||||||
|     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) |     #elif ENABLED(AUTO_BED_LEVELING_BILINEAR) | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart()); |       TERN_(EXTENSIBLE_UI, ExtUI::onMeshLevelingStart()); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshLevelingStart()); |       TERN_(DWIN_LCD_PROUI, DWIN_MeshLevelingStart()); | ||||||
|     #endif |     #endif | ||||||
|  |  | ||||||
|     if (!faux) { |     if (!faux) { | ||||||
| @@ -721,7 +721,7 @@ G29_TYPE GcodeSuite::G29() { | |||||||
|  |  | ||||||
|     #endif // AUTO_BED_LEVELING_3POINT |     #endif // AUTO_BED_LEVELING_3POINT | ||||||
|  |  | ||||||
|     TERN_(HAS_STATUS_MESSAGE, ui.reset_status()); |     ui.reset_status(); | ||||||
|  |  | ||||||
|     // Stow the probe. No raise for FIX_MOUNTED_PROBE. |     // Stow the probe. No raise for FIX_MOUNTED_PROBE. | ||||||
|     if (probe.stow()) { |     if (probe.stow()) { | ||||||
|   | |||||||
| @@ -40,7 +40,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../../../lcd/extui/ui_api.h" |   #include "../../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../../lcd/e3v2/proui/dwin.h" |   #include "../../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -193,7 +193,7 @@ void GcodeSuite::G29() { | |||||||
|       if (parser.seenval('Z')) { |       if (parser.seenval('Z')) { | ||||||
|         mbl.z_values[ix][iy] = parser.value_linear_units(); |         mbl.z_values[ix][iy] = parser.value_linear_units(); | ||||||
|         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy])); |         TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ix, iy, mbl.z_values[ix][iy])); | ||||||
|         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy])); |         TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ix, iy, mbl.z_values[ix][iy])); | ||||||
|       } |       } | ||||||
|       else |       else | ||||||
|         return echo_not_entered('Z'); |         return echo_not_entered('Z'); | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../../../lcd/extui/ui_api.h" |   #include "../../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../../lcd/e3v2/proui/dwin.h" |   #include "../../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -69,7 +69,7 @@ void GcodeSuite::M421() { | |||||||
|     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point |     float &zval = ubl.z_values[ij.x][ij.y];                               // Altering this Mesh Point | ||||||
|     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL |     zval = hasN ? NAN : parser.value_linear_units() + (hasQ ? zval : 0);  // N=NAN, Z=NEWVAL, or Q=ADDVAL | ||||||
|     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh |     TERN_(EXTENSIBLE_UI, ExtUI::onMeshUpdate(ij.x, ij.y, zval));          // Ping ExtUI in case it's showing the mesh | ||||||
|     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_MeshUpdate(ij.x, ij.y, zval)); |     TERN_(DWIN_LCD_PROUI, DWIN_MeshUpdate(ij.x, ij.y, zval)); | ||||||
|   } |   } | ||||||
| } | } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ | |||||||
|   #include "../../lcd/extui/ui_api.h" |   #include "../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD) | #elif ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "../../lcd/e3v2/creality/dwin.h" |   #include "../../lcd/e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -24,7 +24,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(PLATFORM_M997_SUPPORT) | #if ENABLED(PLATFORM_M997_SUPPORT) | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -33,7 +33,7 @@ | |||||||
|  */ |  */ | ||||||
| void GcodeSuite::M997() { | void GcodeSuite::M997() { | ||||||
|  |  | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_RebootScreen()); |   TERN_(DWIN_LCD_PROUI, DWIN_RebootScreen()); | ||||||
|  |  | ||||||
|   flashFirmware(parser.intval('S')); |   flashFirmware(parser.intval('S')); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ | |||||||
|   #include "../../../lcd/extui/ui_api.h" |   #include "../../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD) | #elif ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "../../../lcd/e3v2/creality/dwin.h" |   #include "../../../lcd/e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../../lcd/e3v2/proui/dwin.h" |   #include "../../../lcd/e3v2/proui/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | ||||||
|   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented |   #include "../../../lcd/e3v2/jyersui/dwin.h" // Temporary fix until it can be better implemented | ||||||
|   | |||||||
| @@ -35,7 +35,7 @@ | |||||||
|   #include "../../lcd/marlinui.h" |   #include "../../lcd/marlinui.h" | ||||||
| #elif ENABLED(EXTENSIBLE_UI) | #elif ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../../lcd/extui/ui_api.h" |   #include "../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin_popup.h" |   #include "../../lcd/e3v2/proui/dwin_popup.h" | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
| @@ -71,7 +71,7 @@ void GcodeSuite::M0_M1() { | |||||||
|       ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer |       ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer | ||||||
|     else |     else | ||||||
|       ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT)); |       ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT)); | ||||||
|   #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|     if (parser.string_arg) |     if (parser.string_arg) | ||||||
|       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT)); |       DWIN_Popup_Confirm(ICON_BLTouch, parser.string_arg, GET_TEXT_F(MSG_USERWAIT)); | ||||||
|     else |     else | ||||||
|   | |||||||
| @@ -28,7 +28,7 @@ | |||||||
| #include "../../lcd/marlinui.h" | #include "../../lcd/marlinui.h" | ||||||
| #include "../../sd/cardreader.h" | #include "../../sd/cardreader.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -40,7 +40,7 @@ | |||||||
|  */ |  */ | ||||||
| void GcodeSuite::M73() { | void GcodeSuite::M73() { | ||||||
|  |  | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
|     DWIN_Progress_Update(); |     DWIN_Progress_Update(); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -49,7 +49,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../../lcd/extui/ui_api.h" |   #include "../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -109,7 +109,7 @@ void GcodeSuite::M1001() { | |||||||
|   #endif |   #endif | ||||||
|  |  | ||||||
|   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished()); |   TERN_(EXTENSIBLE_UI, ExtUI::onPrintFinished()); | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished()); |   TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished()); | ||||||
|  |  | ||||||
|   // Re-select the last printed file in the UI |   // Re-select the last printed file in the UI | ||||||
|   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file()); |   TERN_(SD_REPRINT_LAST_SELECTED_FILE, ui.reselect_last_file()); | ||||||
|   | |||||||
| @@ -29,7 +29,7 @@ | |||||||
|  |  | ||||||
| #include "../../MarlinCore.h" // for startOrResumeJob | #include "../../MarlinCore.h" // for startOrResumeJob | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -38,7 +38,7 @@ | |||||||
|  */ |  */ | ||||||
| void GcodeSuite::M75() { | void GcodeSuite::M75() { | ||||||
|   startOrResumeJob(); |   startOrResumeJob(); | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(DWIN_LCD_PROUI) | ||||||
|     DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT)); |     DWIN_Print_Header(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT)); | ||||||
|     DWIN_Print_Started(false); |     DWIN_Print_Started(false); | ||||||
|   #endif |   #endif | ||||||
| @@ -57,7 +57,7 @@ void GcodeSuite::M76() { | |||||||
|  */ |  */ | ||||||
| void GcodeSuite::M77() { | void GcodeSuite::M77() { | ||||||
|   print_job_timer.stop(); |   print_job_timer.stop(); | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Print_Finished()); |   TERN_(DWIN_LCD_PROUI, DWIN_Print_Finished()); | ||||||
| } | } | ||||||
|  |  | ||||||
| #if ENABLED(PRINTCOUNTER) | #if ENABLED(PRINTCOUNTER) | ||||||
|   | |||||||
| @@ -30,7 +30,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../../lcd/extui/ui_api.h" |   #include "../../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../../lcd/e3v2/proui/dwin.h" |   #include "../../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -73,7 +73,7 @@ void GcodeSuite::M303() { | |||||||
|     default: |     default: | ||||||
|       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID); |       SERIAL_ECHOLNPGM(STR_PID_BAD_HEATER_ID); | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM)); |       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_BAD_EXTRUDER_NUM)); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM)); |       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_BAD_EXTRUDER_NUM)); | ||||||
|       return; |       return; | ||||||
|   } |   } | ||||||
|  |  | ||||||
| @@ -83,7 +83,7 @@ void GcodeSuite::M303() { | |||||||
|   const celsius_t temp = seenS ? parser.value_celsius() : default_temp; |   const celsius_t temp = seenS ? parser.value_celsius() : default_temp; | ||||||
|   const bool u = parser.boolval('U'); |   const bool u = parser.boolval('U'); | ||||||
|  |  | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(DWIN_LCD_PROUI) | ||||||
|     if (seenC) HMI_data.PidCycles = c; |     if (seenC) HMI_data.PidCycles = c; | ||||||
|     if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; } |     if (seenS) { if (hid == H_BED) HMI_data.BedPidT = temp; else HMI_data.HotendPidT = temp; } | ||||||
|   #endif |   #endif | ||||||
|   | |||||||
| @@ -473,7 +473,7 @@ | |||||||
| #endif | #endif | ||||||
|  |  | ||||||
| // Aliases for LCD features | // Aliases for LCD features | ||||||
| #if EITHER(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED) | #if EITHER(DWIN_CREALITY_LCD, DWIN_LCD_PROUI) | ||||||
|   #define HAS_DWIN_E3V2_BASIC 1 |   #define HAS_DWIN_E3V2_BASIC 1 | ||||||
| #endif | #endif | ||||||
| #if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI) | #if EITHER(HAS_DWIN_E3V2_BASIC, DWIN_CREALITY_LCD_JYERSUI) | ||||||
| @@ -494,7 +494,7 @@ | |||||||
|   #endif |   #endif | ||||||
|   #define HAS_LCD_BRIGHTNESS 1 |   #define HAS_LCD_BRIGHTNESS 1 | ||||||
|   #define LCD_BRIGHTNESS_MAX 250 |   #define LCD_BRIGHTNESS_MAX 250 | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(DWIN_LCD_PROUI) | ||||||
|     #define LCD_BRIGHTNESS_DEFAULT 127 |     #define LCD_BRIGHTNESS_DEFAULT 127 | ||||||
|   #endif |   #endif | ||||||
| #endif | #endif | ||||||
|   | |||||||
| @@ -3177,7 +3177,7 @@ | |||||||
|  * Advanced Pause - Filament Change |  * Advanced Pause - Filament Change | ||||||
|  */ |  */ | ||||||
| #if ENABLED(ADVANCED_PAUSE_FEATURE) | #if ENABLED(ADVANCED_PAUSE_FEATURE) | ||||||
|   #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) |   #if ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) || BOTH(EMERGENCY_PARSER, HOST_PROMPT_SUPPORT) | ||||||
|     #define M600_PURGE_MORE_RESUMABLE 1 |     #define M600_PURGE_MORE_RESUMABLE 1 | ||||||
|   #endif |   #endif | ||||||
|   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH |   #ifndef FILAMENT_CHANGE_SLOW_LOAD_LENGTH | ||||||
|   | |||||||
| @@ -615,6 +615,8 @@ | |||||||
|   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2." |   #error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 2." | ||||||
| #elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) | #elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS) | ||||||
|   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY." |   #error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY." | ||||||
|  | #elif defined(DWIN_CREALITY_LCD_ENHANCED) | ||||||
|  |   #error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI." | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| constexpr float arm[] = AXIS_RELATIVE_MODES; | 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 | |||||||
|     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0." |     #error "PROGRESS_MSG_EXPIRE must be greater than or equal to 0." | ||||||
|   #endif |   #endif | ||||||
| #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI) | #elif ENABLED(LCD_SET_PROGRESS_MANUALLY) && NONE(HAS_MARLINUI_U8GLIB, HAS_GRAPHICAL_TFT, HAS_MARLINUI_HD44780, EXTENSIBLE_UI, HAS_DWIN_E3V2, IS_DWIN_MARLINUI) | ||||||
|   #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." |   #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." | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #if ENABLED(USE_M73_REMAINING_TIME) && DISABLED(LCD_SET_PROGRESS_MANUALLY) | #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 | |||||||
|  * LCD_BED_LEVELING requirements |  * LCD_BED_LEVELING requirements | ||||||
|  */ |  */ | ||||||
| #if ENABLED(LCD_BED_LEVELING) | #if ENABLED(LCD_BED_LEVELING) | ||||||
|   #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED) |   #if NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD, DWIN_LCD_PROUI) | ||||||
|     #error "LCD_BED_LEVELING is not supported by the selected LCD controller." |     #error "LCD_BED_LEVELING is not supported by the selected LCD controller." | ||||||
|   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL) |   #elif !(ENABLED(MESH_BED_LEVELING) || HAS_ABL_NOT_UBL) | ||||||
|     #error "LCD_BED_LEVELING requires MESH_BED_LEVELING or AUTO_BED_LEVELING." |     #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 | |||||||
|   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \ |   + COUNT_ENABLED(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON, ANYCUBIC_TFT35) \ | ||||||
|   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \ |   + COUNT_ENABLED(DGUS_LCD_UI_ORIGIN, DGUS_LCD_UI_FYSETC, DGUS_LCD_UI_HIPRECY, DGUS_LCD_UI_MKS, DGUS_LCD_UI_RELOADED) \ | ||||||
|   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \ |   + COUNT_ENABLED(ENDER2_STOCKDISPLAY, CR10_STOCKDISPLAY) \ | ||||||
|   + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \ |   + COUNT_ENABLED(DWIN_CREALITY_LCD, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI, DWIN_MARLINUI_PORTRAIT, DWIN_MARLINUI_LANDSCAPE) \ | ||||||
|   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \ |   + COUNT_ENABLED(FYSETC_MINI_12864_X_X, FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0, FYSETC_GENERIC_12864_1_1) \ | ||||||
|   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \ |   + COUNT_ENABLED(LCD_SAINSMART_I2C_1602, LCD_SAINSMART_I2C_2004) \ | ||||||
|   + COUNT_ENABLED(MKS_12864OLED, MKS_12864OLED_SSD1306) \ |   + 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 | |||||||
|   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY) |   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY) | ||||||
|     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY." |     #error "DWIN_CREALITY_LCD does not support LCD_BED_LEVELING with PROBE_MANUALLY." | ||||||
|   #endif |   #endif | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #if DISABLED(SDSUPPORT) |   #if DISABLED(SDSUPPORT) | ||||||
|     #error "DWIN_CREALITY_LCD_ENHANCED requires SDSUPPORT to be enabled." |     #error "DWIN_LCD_PROUI requires SDSUPPORT to be enabled." | ||||||
|   #elif ENABLED(PID_EDIT_MENU) |   #elif ENABLED(PID_EDIT_MENU) | ||||||
|     #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_EDIT_MENU." |     #error "DWIN_LCD_PROUI does not support PID_EDIT_MENU." | ||||||
|   #elif ENABLED(PID_AUTOTUNE_MENU) |   #elif ENABLED(PID_AUTOTUNE_MENU) | ||||||
|     #error "DWIN_CREALITY_LCD_ENHANCED does not support PID_AUTOTUNE_MENU." |     #error "DWIN_LCD_PROUI does not support PID_AUTOTUNE_MENU." | ||||||
|   #elif ENABLED(LEVEL_BED_CORNERS) |   #elif ENABLED(LEVEL_BED_CORNERS) | ||||||
|     #error "DWIN_CREALITY_LCD_ENHANCED does not support LEVEL_BED_CORNERS." |     #error "DWIN_LCD_PROUI does not support LEVEL_BED_CORNERS." | ||||||
|   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY) |   #elif BOTH(LCD_BED_LEVELING, PROBE_MANUALLY) | ||||||
|     #error "DWIN_CREALITY_LCD_ENHANCED does not support LCD_BED_LEVELING with PROBE_MANUALLY." |     #error "DWIN_LCD_PROUI does not support LCD_BED_LEVELING with PROBE_MANUALLY." | ||||||
|   #endif |   #endif | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -3438,7 +3440,7 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive."); | |||||||
|   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel." |   #error "A very large BLOCK_BUFFER_SIZE is not needed and takes longer to drain the buffer on pause / cancel." | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(LED_CONTROL_MENU) && NONE(HAS_MARLINUI_MENU, DWIN_LCD_PROUI) | ||||||
|   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu." |   #error "LED_CONTROL_MENU requires an LCD controller that implements the menu." | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
| #include "dwin.h" | #include "dwin.h" | ||||||
| #include "dwin_popup.h" | #include "dwin_popup.h" | ||||||
| @@ -3974,4 +3974,4 @@ void Draw_Steps_Menu() { | |||||||
|   } |   } | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED | #endif // DWIN_LCD_PROUI | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfig.h" | #include "../../../inc/MarlinConfig.h" | ||||||
|  |  | ||||||
| @@ -159,4 +159,4 @@ void DWIN_SRAMToPic(uint8_t picID) { | |||||||
| //  DWIN_Send(i); | //  DWIN_Send(i); | ||||||
| //} | //} | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED | #endif // DWIN_LCD_PROUI | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
| #include "dwin.h" | #include "dwin.h" | ||||||
| #include "dwin_popup.h" | #include "dwin_popup.h" | ||||||
| @@ -60,4 +60,4 @@ void DWIN_Popup_ConfirmCancel(const uint8_t icon, FSTR_P const fmsg2) { | |||||||
|   DWIN_UpdateLCD(); |   DWIN_UpdateLCD(); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED | #endif // DWIN_LCD_PROUI | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfig.h" | #include "../../../inc/MarlinConfig.h" | ||||||
| #include "dwin_lcd.h" | #include "dwin_lcd.h" | ||||||
| @@ -453,4 +453,4 @@ MenuItemPtrClass::MenuItemPtrClass(uint8_t cicon, const char * const text, void | |||||||
|   value = val; |   value = val; | ||||||
| }; | }; | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED | #endif // DWIN_LCD_PROUI | ||||||
|   | |||||||
| @@ -32,7 +32,7 @@ | |||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
| #include "dwin_defines.h" | #include "dwin_defines.h" | ||||||
|  |  | ||||||
| #if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_ESDIAG) | #if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG) | ||||||
|  |  | ||||||
| #include "endstop_diag.h" | #include "endstop_diag.h" | ||||||
|  |  | ||||||
| @@ -108,4 +108,4 @@ void ESDiagClass::Update() { | |||||||
|   DWIN_UpdateLCD(); |   DWIN_UpdateLCD(); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED && HAS_ESDIAG | #endif // DWIN_LCD_PROUI && HAS_ESDIAG | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #if ENABLED(DWIN_LCD_PROUI) | ||||||
|  |  | ||||||
| #include "../../../core/types.h" | #include "../../../core/types.h" | ||||||
| #include "dwin_lcd.h" | #include "dwin_lcd.h" | ||||||
| @@ -75,4 +75,4 @@ void LockScreenClass::onEncoder(EncoderState encoder_diffState) { | |||||||
|   DWIN_UpdateLCD(); |   DWIN_UpdateLCD(); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED | #endif // DWIN_LCD_PROUI | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH) | #if BOTH(DWIN_LCD_PROUI, HAS_MESH) | ||||||
|  |  | ||||||
| #include "meshviewer.h" | #include "meshviewer.h" | ||||||
|  |  | ||||||
| @@ -109,4 +109,4 @@ void MeshViewerClass::Draw() { | |||||||
|   ); |   ); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH | #endif // DWIN_LCD_PROUI && HAS_MESH | ||||||
|   | |||||||
| @@ -31,7 +31,7 @@ | |||||||
|  |  | ||||||
| #include "../../../inc/MarlinConfigPre.h" | #include "../../../inc/MarlinConfigPre.h" | ||||||
|  |  | ||||||
| #if BOTH(DWIN_CREALITY_LCD_ENHANCED, PRINTCOUNTER) | #if BOTH(DWIN_LCD_PROUI, PRINTCOUNTER) | ||||||
|  |  | ||||||
| #include "printstats.h" | #include "printstats.h" | ||||||
|  |  | ||||||
| @@ -75,4 +75,4 @@ void PrintStatsClass::Reset() { | |||||||
|   HMI_AudioFeedback(); |   HMI_AudioFeedback(); | ||||||
| } | } | ||||||
|  |  | ||||||
| #endif // DWIN_CREALITY_LCD_ENHANCED && PRINTCOUNTER | #endif // DWIN_LCD_PROUI && PRINTCOUNTER | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ MarlinUI ui; | |||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD) | #if ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "e3v2/creality/dwin.h" |   #include "e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "fontutils.h" |   #include "fontutils.h" | ||||||
|   #include "e3v2/proui/dwin.h" |   #include "e3v2/proui/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | ||||||
| @@ -69,7 +69,7 @@ MarlinUI ui; | |||||||
| constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; | constexpr uint8_t epps = ENCODER_PULSES_PER_STEP; | ||||||
|  |  | ||||||
| #if HAS_STATUS_MESSAGE | #if HAS_STATUS_MESSAGE | ||||||
|   #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI) | ||||||
|     uint8_t MarlinUI::status_scroll_offset; // = 0 |     uint8_t MarlinUI::status_scroll_offset; // = 0 | ||||||
|   #endif |   #endif | ||||||
|   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1]; |   char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1]; | ||||||
| @@ -1522,13 +1522,13 @@ void MarlinUI::init() { | |||||||
|  |  | ||||||
|     #endif |     #endif | ||||||
|  |  | ||||||
|     #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED) |     #if ENABLED(STATUS_MESSAGE_SCROLLING) && EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI) | ||||||
|       status_scroll_offset = 0; |       status_scroll_offset = 0; | ||||||
|     #endif |     #endif | ||||||
|  |  | ||||||
|     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message)); |     TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(status_message)); | ||||||
|     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message)); |     TERN_(DWIN_CREALITY_LCD, DWIN_StatusChanged(status_message)); | ||||||
|     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_CheckStatusMessage()); |     TERN_(DWIN_LCD_PROUI, DWIN_CheckStatusMessage()); | ||||||
|     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message)); |     TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Update_Status(status_message)); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   | |||||||
| @@ -57,7 +57,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD) | #if ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "e3v2/creality/dwin.h" |   #include "e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "e3v2/proui/dwin.h" |   #include "e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -333,7 +333,7 @@ public: | |||||||
|  |  | ||||||
|   #if HAS_STATUS_MESSAGE |   #if HAS_STATUS_MESSAGE | ||||||
|  |  | ||||||
|     #if EITHER(HAS_WIRED_LCD, DWIN_CREALITY_LCD_ENHANCED) |     #if EITHER(HAS_WIRED_LCD, DWIN_LCD_PROUI) | ||||||
|       #if ENABLED(STATUS_MESSAGE_SCROLLING) |       #if ENABLED(STATUS_MESSAGE_SCROLLING) | ||||||
|         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH)) |         #define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH)) | ||||||
|       #else |       #else | ||||||
| @@ -367,7 +367,7 @@ public: | |||||||
|   static void set_status(FSTR_P const fstr, const int8_t level=0); |   static void set_status(FSTR_P const fstr, const int8_t level=0); | ||||||
|   static void status_printf(const uint8_t level, FSTR_P const fmt, ...); |   static void status_printf(const uint8_t level, FSTR_P const fmt, ...); | ||||||
|  |  | ||||||
|   #if EITHER(HAS_DISPLAY, DWIN_CREALITY_LCD_ENHANCED) |   #if EITHER(HAS_DISPLAY, DWIN_LCD_PROUI) | ||||||
|     static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component); |     static void kill_screen(FSTR_P const lcd_error, FSTR_P const lcd_component); | ||||||
|     #if DISABLED(LIGHTWEIGHT_UI) |     #if DISABLED(LIGHTWEIGHT_UI) | ||||||
|       static void draw_status_message(const bool blink); |       static void draw_status_message(const bool blink); | ||||||
| @@ -619,7 +619,7 @@ public: | |||||||
|     static bool use_click() { return false; } |     static bool use_click() { return false; } | ||||||
|   #endif |   #endif | ||||||
|  |  | ||||||
|   #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_CREALITY_LCD_ENHANCED, DWIN_CREALITY_LCD_JYERSUI) |   #if ENABLED(ADVANCED_PAUSE_FEATURE) && ANY(HAS_MARLINUI_MENU, EXTENSIBLE_UI, DWIN_LCD_PROUI, DWIN_CREALITY_LCD_JYERSUI) | ||||||
|     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder); |     static void pause_show_message(const PauseMessage message, const PauseMode mode=PAUSE_MODE_SAME, const uint8_t extruder=active_extruder); | ||||||
|   #else |   #else | ||||||
|     static void _pause_show_message() {} |     static void _pause_show_message() {} | ||||||
|   | |||||||
| @@ -87,7 +87,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../lcd/extui/ui_api.h" |   #include "../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -316,7 +316,7 @@ FORCE_INLINE void probe_specific_action(const bool deploy) { | |||||||
|  |  | ||||||
|       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR))); |       TERN_(HOST_PROMPT_SUPPORT, hostui.prompt_do(PROMPT_USER_CONTINUE, F("Stow Probe"), FPSTR(CONTINUE_STR))); | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe"))); |       TERN_(EXTENSIBLE_UI, ExtUI::onUserConfirmRequired(F("Stow Probe"))); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR))); |       TERN_(DWIN_LCD_PROUI, DWIN_Popup_Confirm(ICON_BLTouch, F("Stow Probe"), FPSTR(CONTINUE_STR))); | ||||||
|       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response()); |       TERN_(HAS_RESUME_CONTINUE, wait_for_user_response()); | ||||||
|       ui.reset_status(); |       ui.reset_status(); | ||||||
|  |  | ||||||
|   | |||||||
| @@ -74,7 +74,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(EXTENSIBLE_UI) | #if ENABLED(EXTENSIBLE_UI) | ||||||
|   #include "../lcd/extui/ui_api.h" |   #include "../lcd/extui/ui_api.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | ||||||
|   #include "../lcd/e3v2/jyersui/dwin.h" |   #include "../lcd/e3v2/jyersui/dwin.h" | ||||||
| @@ -487,7 +487,7 @@ typedef struct SettingsDataStruct { | |||||||
|   // |   // | ||||||
|   // Ender-3 V2 DWIN |   // Ender-3 V2 DWIN | ||||||
|   // |   // | ||||||
|   #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |   #if ENABLED(DWIN_LCD_PROUI) | ||||||
|     uint8_t dwin_data[eeprom_data_size]; |     uint8_t dwin_data[eeprom_data_size]; | ||||||
|   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) |   #elif ENABLED(DWIN_CREALITY_LCD_JYERSUI) | ||||||
|     uint8_t dwin_settings[CrealityDWIN.eeprom_data_size]; |     uint8_t dwin_settings[CrealityDWIN.eeprom_data_size]; | ||||||
| @@ -1465,7 +1465,7 @@ void MarlinSettings::postprocess() { | |||||||
|     // |     // | ||||||
|     // Creality DWIN User Data |     // Creality DWIN User Data | ||||||
|     // |     // | ||||||
|     #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |     #if ENABLED(DWIN_LCD_PROUI) | ||||||
|     { |     { | ||||||
|       char dwin_data[eeprom_data_size] = { 0 }; |       char dwin_data[eeprom_data_size] = { 0 }; | ||||||
|       DWIN_StoreSettings(dwin_data); |       DWIN_StoreSettings(dwin_data); | ||||||
| @@ -1610,7 +1610,7 @@ void MarlinSettings::postprocess() { | |||||||
|         stored_ver[1] = '\0'; |         stored_ver[1] = '\0'; | ||||||
|       } |       } | ||||||
|       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")"); |       DEBUG_ECHO_MSG("EEPROM version mismatch (EEPROM=", stored_ver, " Marlin=" EEPROM_VERSION ")"); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION)); |       TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_VERSION)); | ||||||
|       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_VERSION))); |       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_VERSION))); | ||||||
|  |  | ||||||
|       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version()); |       IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_version()); | ||||||
| @@ -2408,7 +2408,7 @@ void MarlinSettings::postprocess() { | |||||||
|       // |       // | ||||||
|       // Creality DWIN User Data |       // Creality DWIN User Data | ||||||
|       // |       // | ||||||
|       #if ENABLED(DWIN_CREALITY_LCD_ENHANCED) |       #if ENABLED(DWIN_LCD_PROUI) | ||||||
|       { |       { | ||||||
|         const char dwin_data[eeprom_data_size] = { 0 }; |         const char dwin_data[eeprom_data_size] = { 0 }; | ||||||
|         _FIELD_TEST(dwin_data); |         _FIELD_TEST(dwin_data); | ||||||
| @@ -2512,7 +2512,7 @@ void MarlinSettings::postprocess() { | |||||||
|       else if (working_crc != stored_crc) { |       else if (working_crc != stored_crc) { | ||||||
|         eeprom_error = true; |         eeprom_error = true; | ||||||
|         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!"); |         DEBUG_ERROR_MSG("EEPROM CRC mismatch - (stored) ", stored_crc, " != ", working_crc, " (calculated)!"); | ||||||
|         TERN_(DWIN_CREALITY_LCD_ENHANCED, LCD_MESSAGE(MSG_ERR_EEPROM_CRC)); |         TERN_(DWIN_LCD_PROUI, LCD_MESSAGE(MSG_ERR_EEPROM_CRC)); | ||||||
|         TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_CRC))); |         TERN_(HOST_EEPROM_CHITCHAT, hostui.notify(GET_TEXT_F(MSG_ERR_EEPROM_CRC))); | ||||||
|         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc()); |         IF_DISABLED(EEPROM_AUTO_INIT, ui.eeprom_alert_crc()); | ||||||
|       } |       } | ||||||
| @@ -2830,7 +2830,7 @@ void MarlinSettings::reset() { | |||||||
|     #endif |     #endif | ||||||
|   #endif |   #endif | ||||||
|  |  | ||||||
|   TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_SetDataDefaults()); |   TERN_(DWIN_LCD_PROUI, DWIN_SetDataDefaults()); | ||||||
|   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings()); |   TERN_(DWIN_CREALITY_LCD_JYERSUI, CrealityDWIN.Reset_Settings()); | ||||||
|  |  | ||||||
|   // |   // | ||||||
|   | |||||||
| @@ -51,7 +51,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD) | #if ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "../lcd/e3v2/creality/dwin.h" |   #include "../lcd/e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| @@ -623,12 +623,12 @@ volatile bool Temperature::raw_temps_ready = false; | |||||||
|     TERN_(HAS_FAN_LOGIC, fan_update_ms = next_temp_ms + fan_update_interval_ms); |     TERN_(HAS_FAN_LOGIC, fan_update_ms = next_temp_ms + fan_update_interval_ms); | ||||||
|  |  | ||||||
|     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED)); |     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_STARTED)); | ||||||
|     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START)); |     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(isbed ? PID_BED_START : PID_EXTR_START)); | ||||||
|  |  | ||||||
|     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) { |     if (target > GHV(CHAMBER_MAX_TARGET, BED_MAX_TARGET, temp_range[heater_id].maxtemp - (HOTEND_OVERSHOOT))) { | ||||||
|       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); |       SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); | ||||||
|       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); |       TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); | ||||||
|       TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); |       TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); | ||||||
|       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH))); |       TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH))); | ||||||
|       return; |       return; | ||||||
|     } |     } | ||||||
| @@ -719,7 +719,7 @@ volatile bool Temperature::raw_temps_ready = false; | |||||||
|       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) { |       if (current_temp > target + MAX_OVERSHOOT_PID_AUTOTUNE) { | ||||||
|         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); |         SERIAL_ECHOLNPGM(STR_PID_TEMP_TOO_HIGH); | ||||||
|         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); |         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TEMP_TOO_HIGH)); | ||||||
|         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); |         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TEMP_TOO_HIGH)); | ||||||
|         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH))); |         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TEMP_TOO_HIGH))); | ||||||
|         break; |         break; | ||||||
|       } |       } | ||||||
| @@ -756,7 +756,7 @@ volatile bool Temperature::raw_temps_ready = false; | |||||||
|       #endif |       #endif | ||||||
|       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) { |       if ((ms - _MIN(t1, t2)) > (MAX_CYCLE_TIME_PID_AUTOTUNE * 60L * 1000L)) { | ||||||
|         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0)); |         TERN_(DWIN_CREALITY_LCD, DWIN_Popup_Temperature(0)); | ||||||
|         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_TUNING_TIMEOUT)); |         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_TUNING_TIMEOUT)); | ||||||
|         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT)); |         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_TUNING_TIMEOUT)); | ||||||
|         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT))); |         TERN_(HOST_PROMPT_SUPPORT, hostui.notify(GET_TEXT_F(MSG_PID_TIMEOUT))); | ||||||
|         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT); |         SERIAL_ECHOLNPGM(STR_PID_TIMEOUT); | ||||||
| @@ -812,7 +812,7 @@ volatile bool Temperature::raw_temps_ready = false; | |||||||
|         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color)); |         TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color)); | ||||||
|  |  | ||||||
|         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE)); |         TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE)); | ||||||
|         TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE)); |         TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE)); | ||||||
|  |  | ||||||
|         goto EXIT_M303; |         goto EXIT_M303; | ||||||
|       } |       } | ||||||
| @@ -830,7 +830,7 @@ volatile bool Temperature::raw_temps_ready = false; | |||||||
|     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color)); |     TERN_(PRINTER_EVENT_LEDS, printerEventLEDs.onPidTuningDone(color)); | ||||||
|  |  | ||||||
|     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE)); |     TERN_(EXTENSIBLE_UI, ExtUI::onPidTuning(ExtUI::result_t::PID_DONE)); | ||||||
|     TERN_(DWIN_CREALITY_LCD_ENHANCED, DWIN_PidTuning(PID_DONE)); |     TERN_(DWIN_LCD_PROUI, DWIN_PidTuning(PID_DONE)); | ||||||
|  |  | ||||||
|     EXIT_M303: |     EXIT_M303: | ||||||
|       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true); |       TERN_(NO_FAN_SLOWING_IN_PID_TUNING, adaptive_fan_slowing = true); | ||||||
|   | |||||||
| @@ -33,7 +33,7 @@ | |||||||
|  |  | ||||||
| #if ENABLED(DWIN_CREALITY_LCD) | #if ENABLED(DWIN_CREALITY_LCD) | ||||||
|   #include "../lcd/e3v2/creality/dwin.h" |   #include "../lcd/e3v2/creality/dwin.h" | ||||||
| #elif ENABLED(DWIN_CREALITY_LCD_ENHANCED) | #elif ENABLED(DWIN_LCD_PROUI) | ||||||
|   #include "../lcd/e3v2/proui/dwin.h" |   #include "../lcd/e3v2/proui/dwin.h" | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
|   | |||||||
| @@ -15,8 +15,8 @@ exec_test $1 $2 "Ender 3 v2 with CrealityUI" "$3" | |||||||
|  |  | ||||||
| use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" | use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" | ||||||
| opt_disable DWIN_CREALITY_LCD | opt_disable DWIN_CREALITY_LCD | ||||||
| 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 | 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 | ||||||
| exec_test $1 $2 "Ender 3 v2 with Enhanced UI" "$3" | exec_test $1 $2 "Ender 3 v2 with Pro UI" "$3" | ||||||
|  |  | ||||||
| use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" | use_example_configs "Creality/Ender-3 V2/CrealityV422/CrealityUI" | ||||||
| opt_disable DWIN_CREALITY_LCD | opt_disable DWIN_CREALITY_LCD | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ SOFT_I2C_EEPROM                        = SlowSoftI2CMaster, SlowSoftWire=https:/ | |||||||
| SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp> | SPI_EEPROM                             = src_filter=+<src/HAL/shared/eeprom_if_spi.cpp> | ||||||
| HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common> | HAS_DWIN_E3V2|IS_DWIN_MARLINUI         = src_filter=+<src/lcd/e3v2/common> | ||||||
| DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality> | DWIN_CREALITY_LCD                      = src_filter=+<src/lcd/e3v2/creality> | ||||||
| DWIN_CREALITY_LCD_ENHANCED             = src_filter=+<src/lcd/e3v2/proui> | DWIN_LCD_PROUI                         = src_filter=+<src/lcd/e3v2/proui> | ||||||
| DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui> | DWIN_CREALITY_LCD_JYERSUI              = src_filter=+<src/lcd/e3v2/jyersui> | ||||||
| IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui> | IS_DWIN_MARLINUI                       = src_filter=+<src/lcd/e3v2/marlinui> | ||||||
| HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft> | HAS_GRAPHICAL_TFT                      = src_filter=+<src/lcd/tft> | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user