Skip to content

Commit

Permalink
🎨 PGM => _P rename
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed May 22, 2024
1 parent 521e7ea commit 78d3cf1
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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);

Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -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);
}

Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,8 @@ class DGUSScreenHandler {
#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);
Expand Down

0 comments on commit 78d3cf1

Please sign in to comment.