From 78d3cf1de1a3fecb028ea9d6b2ee782e33341142 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 21 May 2024 15:47:45 -0500 Subject: [PATCH] =?UTF-8?q?=F0=9F=8E=A8=20PGM=20=3D>=20=5FP=20rename?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extui/dgus_reloaded/DGUSScreenHandler.cpp | 16 ++++++++-------- .../lcd/extui/dgus_reloaded/DGUSScreenHandler.h | 4 ++-- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp index 181d1ae34c..bb31a1d71a 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.cpp @@ -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); } diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h index ed8b163d87..d233ed6fe3 100644 --- a/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h +++ b/Marlin/src/lcd/extui/dgus_reloaded/DGUSScreenHandler.h @@ -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);