sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🎨 PGM => _P rename

Browse Source
This commit is contained in:
Scott Lahteine
2024-05-21 15:47:45 -05:00
parent 521e7eafce
commit 78d3cf1de1
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
View File

@@ -149,7 +149,7 @@ void DGUSScreenHandler::loop() {
void DGUSScreenHandler::printerKilled(FSTR_P const error, FSTR_P const component) {
setMessageLine(error, 1);
setMessageLine(component, 2);
setMessageLinePGM(NUL_STR, 3);
setMessageLine_P(NUL_STR, 3);
setMessageLine(GET_TEXT_F(MSG_PLEASE_RESET), 4);
dgus.playSound(3, 1, 200);
@@ -158,10 +158,10 @@ void DGUSScreenHandler::printerKilled(FSTR_P const error, FSTR_P const component
}
void DGUSScreenHandler::userConfirmRequired(const char * const msg) {
setMessageLinePGM(NUL_STR, 1);
setMessageLine_P(NUL_STR, 1);
setMessageLine(msg, 2);
setMessageLinePGM(NUL_STR, 3);
setMessageLinePGM(NUL_STR, 4);
setMessageLine_P(NUL_STR, 3);
setMessageLine_P(NUL_STR, 4);
dgus.playSound(3);
@@ -351,7 +351,7 @@ void DGUSScreenHandler::setMessageLine(const char * const msg, const uint8_t lin
}
}
void DGUSScreenHandler::setMessageLinePGM(PGM_P const msg, const uint8_t line) {
void DGUSScreenHandler::setMessageLine_P(PGM_P const msg, const uint8_t line) {
switch (line) {
default: return;
case 1:
@@ -389,10 +389,10 @@ void DGUSScreenHandler::showWaitScreen(const DGUS_ScreenID return_screenID, cons
}
void DGUSScreenHandler::showWaitScreen(FSTR_P const msg, const DGUS_ScreenID return_screenID, const bool has_continue/*=false*/) {
setMessageLinePGM(NUL_STR, 1);
setMessageLine_P(NUL_STR, 1);
setMessageLine(msg, 2);
setMessageLinePGM(NUL_STR, 3);
setMessageLinePGM(NUL_STR, 4);
setMessageLine_P(NUL_STR, 3);
setMessageLine_P(NUL_STR, 4);
showWaitScreen(return_screenID, has_continue);
}

4
Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
View File

@@ -70,8 +70,8 @@ public:
#endif
static void setMessageLine(const char * const msg, const uint8_t line);
static void setMessageLinePGM(PGM_P const msg, const uint8_t line);
static void setMessageLine(FSTR_P const msg, const uint8_t line) { setMessageLinePGM(FTOP(msg), line); }
static void setMessageLine_P(PGM_P const msg, const uint8_t line);
static void setMessageLine(FSTR_P const msg, const uint8_t line) { setMessageLine_P(FTOP(msg), line); }
static void setStatusMessage(const char* msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
static void setStatusMessage(FSTR_P const msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);