bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🔧 DWIN_CREALITY_LCD_ENHANCED => DWIN_LCD_PROUI

Browse Source 
Followup to #23624
This commit is contained in:
Scott Lahteine
2022-03-10 22:07:47 -06:00
committed by Scott Lahteine
parent 152ec49b8b
commit b669aa49cc
35 changed files with 94 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/e3v2/proui/dwin.cpp
View File

@ -31,7 +31,7 @@
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#if ENABLED(DWIN_LCD_PROUI)
#include "dwin.h"
#include "dwin_popup.h"
@ -3974,4 +3974,4 @@ void Draw_Steps_Menu() {
}
#endif
#endif // DWIN_CREALITY_LCD_ENHANCED
#endif // DWIN_LCD_PROUI

4
Marlin/src/lcd/e3v2/proui/dwin_lcd.cpp
View File

@ -31,7 +31,7 @@
#include "../../../inc/MarlinConfigPre.h"
#if ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#if ENABLED(DWIN_LCD_PROUI)
#include "../../../inc/MarlinConfig.h"
@ -159,4 +159,4 @@ void DWIN_SRAMToPic(uint8_t picID) {
// DWIN_Send(i);
//}
#endif // DWIN_CREALITY_LCD_ENHANCED
#endif // DWIN_LCD_PROUI

4
Marlin/src/lcd/e3v2/proui/dwin_popup.cpp
View File

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

4
Marlin/src/lcd/e3v2/proui/dwinui.cpp
View File

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

4
Marlin/src/lcd/e3v2/proui/endstop_diag.cpp
View File

@ -32,7 +32,7 @@
#include "../../../inc/MarlinConfigPre.h"
#include "dwin_defines.h"
#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_ESDIAG)
#if BOTH(DWIN_LCD_PROUI, HAS_ESDIAG)
#include "endstop_diag.h"
@ -108,4 +108,4 @@ void ESDiagClass::Update() {
DWIN_UpdateLCD();
}
#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_ESDIAG
#endif // DWIN_LCD_PROUI && HAS_ESDIAG

4
Marlin/src/lcd/e3v2/proui/lockscreen.cpp
View File

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

4
Marlin/src/lcd/e3v2/proui/meshviewer.cpp
View File

@ -31,7 +31,7 @@
#include "../../../inc/MarlinConfigPre.h"
#if BOTH(DWIN_CREALITY_LCD_ENHANCED, HAS_MESH)
#if BOTH(DWIN_LCD_PROUI, HAS_MESH)
#include "meshviewer.h"
@ -109,4 +109,4 @@ void MeshViewerClass::Draw() {
);
}
#endif // DWIN_CREALITY_LCD_ENHANCED && HAS_MESH
#endif // DWIN_LCD_PROUI && HAS_MESH

4
Marlin/src/lcd/e3v2/proui/printstats.cpp
View File

@ -31,7 +31,7 @@
#include "../../../inc/MarlinConfigPre.h"
#if BOTH(DWIN_CREALITY_LCD_ENHANCED, PRINTCOUNTER)
#if BOTH(DWIN_LCD_PROUI, PRINTCOUNTER)
#include "printstats.h"
@ -75,4 +75,4 @@ void PrintStatsClass::Reset() {
HMI_AudioFeedback();
}
#endif // DWIN_CREALITY_LCD_ENHANCED && PRINTCOUNTER
#endif // DWIN_LCD_PROUI && PRINTCOUNTER

8
Marlin/src/lcd/marlinui.cpp
View File

@ -47,7 +47,7 @@ MarlinUI ui;
#if ENABLED(DWIN_CREALITY_LCD)
#include "e3v2/creality/dwin.h"
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#elif ENABLED(DWIN_LCD_PROUI)
#include "fontutils.h"
#include "e3v2/proui/dwin.h"
#elif ENABLED(DWIN_CREALITY_LCD_JYERSUI)
@ -69,7 +69,7 @@ MarlinUI ui;
constexpr uint8_t epps = ENCODER_PULSES_PER_STEP;
#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
#endif
char MarlinUI::status_message[MAX_MESSAGE_LENGTH + 1];
@ -1522,13 +1522,13 @@ void MarlinUI::init() {
#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;
#endif
TERN_(EXTENSIBLE_UI, ExtUI::onStatusChanged(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));
}

8
Marlin/src/lcd/marlinui.h
View File

@ -57,7 +57,7 @@
#if ENABLED(DWIN_CREALITY_LCD)
#include "e3v2/creality/dwin.h"
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)
#elif ENABLED(DWIN_LCD_PROUI)
#include "e3v2/proui/dwin.h"
#endif
@ -333,7 +333,7 @@ public:
#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)
#define MAX_MESSAGE_LENGTH _MAX(LONG_FILENAME_LENGTH, MAX_LANG_CHARSIZE * 2 * (LCD_WIDTH))
#else
@ -367,7 +367,7 @@ public:
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, ...);
#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);
#if DISABLED(LIGHTWEIGHT_UI)
static void draw_status_message(const bool blink);
@ -619,7 +619,7 @@ public:
static bool use_click() { return false; }
#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);
#else
static void _pause_show_message() {}