Skip to content

Commit 78d3cf1

Browse files
committed
🎨 PGM => _P rename
1 parent 521e7ea commit 78d3cf1

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ void DGUSScreenHandler::loop() {
149149
void DGUSScreenHandler::printerKilled(FSTR_P const error, FSTR_P const component) {
150150
setMessageLine(error, 1);
151151
setMessageLine(component, 2);
152-
setMessageLinePGM(NUL_STR, 3);
152+
setMessageLine_P(NUL_STR, 3);
153153
setMessageLine(GET_TEXT_F(MSG_PLEASE_RESET), 4);
154154

155155
dgus.playSound(3, 1, 200);
@@ -158,10 +158,10 @@ void DGUSScreenHandler::printerKilled(FSTR_P const error, FSTR_P const component
158158
}
159159

160160
void DGUSScreenHandler::userConfirmRequired(const char * const msg) {
161-
setMessageLinePGM(NUL_STR, 1);
161+
setMessageLine_P(NUL_STR, 1);
162162
setMessageLine(msg, 2);
163-
setMessageLinePGM(NUL_STR, 3);
164-
setMessageLinePGM(NUL_STR, 4);
163+
setMessageLine_P(NUL_STR, 3);
164+
setMessageLine_P(NUL_STR, 4);
165165

166166
dgus.playSound(3);
167167

@@ -351,7 +351,7 @@ void DGUSScreenHandler::setMessageLine(const char * const msg, const uint8_t lin
351351
}
352352
}
353353

354-
void DGUSScreenHandler::setMessageLinePGM(PGM_P const msg, const uint8_t line) {
354+
void DGUSScreenHandler::setMessageLine_P(PGM_P const msg, const uint8_t line) {
355355
switch (line) {
356356
default: return;
357357
case 1:
@@ -389,10 +389,10 @@ void DGUSScreenHandler::showWaitScreen(const DGUS_ScreenID return_screenID, cons
389389
}
390390

391391
void DGUSScreenHandler::showWaitScreen(FSTR_P const msg, const DGUS_ScreenID return_screenID, const bool has_continue/*=false*/) {
392-
setMessageLinePGM(NUL_STR, 1);
392+
setMessageLine_P(NUL_STR, 1);
393393
setMessageLine(msg, 2);
394-
setMessageLinePGM(NUL_STR, 3);
395-
setMessageLinePGM(NUL_STR, 4);
394+
setMessageLine_P(NUL_STR, 3);
395+
setMessageLine_P(NUL_STR, 4);
396396
showWaitScreen(return_screenID, has_continue);
397397
}
398398

Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ class DGUSScreenHandler {
7070
#endif
7171

7272
static void setMessageLine(const char * const msg, const uint8_t line);
73-
static void setMessageLinePGM(PGM_P const msg, const uint8_t line);
74-
static void setMessageLine(FSTR_P const msg, const uint8_t line) { setMessageLinePGM(FTOP(msg), line); }
73+
static void setMessageLine_P(PGM_P const msg, const uint8_t line);
74+
static void setMessageLine(FSTR_P const msg, const uint8_t line) { setMessageLine_P(FTOP(msg), line); }
7575

7676
static void setStatusMessage(const char* msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);
7777
static void setStatusMessage(FSTR_P const msg, const millis_t duration=DGUS_STATUS_EXPIRATION_MS);

0 commit comments

Comments
 (0)