🩹 Minor ExtUI/DGUS code fix/cleanup

thinkyhead · thinkyhead · commit 585cbbb20316 · 2025-04-29T13:42:02.000-05:00
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_extui.cpp
@@ -70,13 +70,11 @@ namespace ExtUI {
   void onUserConfirmRequired(const char * const msg) { chiron.confirmationRequest(msg); }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp b/Marlin/src/lcd/extui/anycubic_i3mega/anycubic_extui.cpp
@@ -58,13 +58,11 @@ namespace ExtUI {
   void onUserConfirmRequired(const char * const msg) { anycubicTFT.onUserConfirmRequired(msg); }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp b/Marlin/src/lcd/extui/anycubic_vyper/vyper_extui.cpp
@@ -70,13 +70,11 @@ namespace ExtUI {
   void onUserConfirmRequired(const char * const msg) { dgus.confirmationRequest(msg); }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp b/Marlin/src/lcd/extui/dgus_e3s1pro/dgus_e3s1pro_extui.cpp
@@ -88,13 +88,11 @@ namespace ExtUI {
   }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp b/Marlin/src/lcd/extui/dgus_reloaded/DGUSRxHandler.cpp
@@ -503,7 +503,7 @@ void DGUSRxHandler::probe(DGUS_VP &vp, void *data_ptr) {
   UNUSED(data_ptr);
 
   #if ENABLED(MESH_BED_LEVELING)
-    screen.setStatusMessage(FPSTR(DGUS_MSG_ABL_REQUIRED));
+    screen.setStatusMessage(GET_TEXT_F(DGUS_MSG_ABL_REQUIRED));
     return;
   #endif
 
diff --git a/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp b/Marlin/src/lcd/extui/dgus_reloaded/dgus_reloaded_extui.cpp
@@ -83,13 +83,11 @@ namespace ExtUI {
   }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/ftdi_eve_extui.cpp
@@ -133,13 +133,11 @@ namespace ExtUI {
   #endif
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp b/Marlin/src/lcd/extui/ia_creality/ia_creality_extui.cpp
@@ -233,13 +233,11 @@ void onUserConfirmRequired(const char *const msg) {
 }
 
 // For fancy LCDs include an icon ID, message, and translated button title
-void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
   onUserConfirmRequired(cstr);
-  UNUSED(icon); UNUSED(fBtn);
 }
-void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
   onUserConfirmRequired(fstr);
-  UNUSED(icon); UNUSED(fBtn);
 }
 
 #if ENABLED(ADVANCED_PAUSE_FEATURE)
diff --git a/Marlin/src/lcd/extui/nextion/nextion_extui.cpp b/Marlin/src/lcd/extui/nextion/nextion_extui.cpp
@@ -56,13 +56,11 @@ namespace ExtUI {
   void onUserConfirmRequired(const char * const msg) { nextion.confirmationRequest(msg); }
 
   // For fancy LCDs include an icon ID, message, and translated button title
-  void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {
     onUserConfirmRequired(cstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
-  void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {
+  void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {
     onUserConfirmRequired(fstr);
-    UNUSED(icon); UNUSED(fBtn);
   }
 
   #if ENABLED(ADVANCED_PAUSE_FEATURE)

Original file line number	Diff line number	Diff line change
`@@ -70,13 +70,11 @@ namespace ExtUI {`
`70`	`70`	`void onUserConfirmRequired(const char * const msg) { chiron.confirmationRequest(msg); }`
`71`	`71`
`72`	`72`	`// For fancy LCDs include an icon ID, message, and translated button title`
`73`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`73`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`74`	`74`	`onUserConfirmRequired(cstr);`
`75`		`- UNUSED(icon); UNUSED(fBtn);`
`76`	`75`	`}`
`77`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`76`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`78`	`77`	`onUserConfirmRequired(fstr);`
`79`		`- UNUSED(icon); UNUSED(fBtn);`
`80`	`78`	`}`
`81`	`79`
`82`	`80`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -58,13 +58,11 @@ namespace ExtUI {`
`58`	`58`	`void onUserConfirmRequired(const char * const msg) { anycubicTFT.onUserConfirmRequired(msg); }`
`59`	`59`
`60`	`60`	`// For fancy LCDs include an icon ID, message, and translated button title`
`61`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`61`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`62`	`62`	`onUserConfirmRequired(cstr);`
`63`		`- UNUSED(icon); UNUSED(fBtn);`
`64`	`63`	`}`
`65`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`64`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`66`	`65`	`onUserConfirmRequired(fstr);`
`67`		`- UNUSED(icon); UNUSED(fBtn);`
`68`	`66`	`}`
`69`	`67`
`70`	`68`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -88,13 +88,11 @@ namespace ExtUI {`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`// For fancy LCDs include an icon ID, message, and translated button title`
`91`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`91`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`92`	`92`	`onUserConfirmRequired(cstr);`
`93`		`- UNUSED(icon); UNUSED(fBtn);`
`94`	`93`	`}`
`95`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`94`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`96`	`95`	`onUserConfirmRequired(fstr);`
`97`		`- UNUSED(icon); UNUSED(fBtn);`
`98`	`96`	`}`
`99`	`97`
`100`	`98`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,11 @@ namespace ExtUI {`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`// For fancy LCDs include an icon ID, message, and translated button title`
`86`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`86`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`87`	`87`	`onUserConfirmRequired(cstr);`
`88`		`- UNUSED(icon); UNUSED(fBtn);`
`89`	`88`	`}`
`90`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`89`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`91`	`90`	`onUserConfirmRequired(fstr);`
`92`		`- UNUSED(icon); UNUSED(fBtn);`
`93`	`91`	`}`
`94`	`92`
`95`	`93`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -133,13 +133,11 @@ namespace ExtUI {`
`133`	`133`	`#endif`
`134`	`134`
`135`	`135`	`// For fancy LCDs include an icon ID, message, and translated button title`
`136`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`136`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`137`	`137`	`onUserConfirmRequired(cstr);`
`138`		`- UNUSED(icon); UNUSED(fBtn);`
`139`	`138`	`}`
`140`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`139`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`141`	`140`	`onUserConfirmRequired(fstr);`
`142`		`- UNUSED(icon); UNUSED(fBtn);`
`143`	`141`	`}`
`144`	`142`
`145`	`143`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -233,13 +233,11 @@ void onUserConfirmRequired(const char *const msg) {`
`233`	`233`	`}`
`234`	`234`
`235`	`235`	`// For fancy LCDs include an icon ID, message, and translated button title`
`236`		`-void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`236`	`+void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`237`	`237`	`onUserConfirmRequired(cstr);`
`238`		`- UNUSED(icon); UNUSED(fBtn);`
`239`	`238`	`}`
`240`		`-void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`239`	`+void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`241`	`240`	`onUserConfirmRequired(fstr);`
`242`		`- UNUSED(icon); UNUSED(fBtn);`
`243`	`241`	`}`
`244`	`242`
`245`	`243`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`
Original file line number	Diff line number	Diff line change
`@@ -56,13 +56,11 @@ namespace ExtUI {`
`56`	`56`	`void onUserConfirmRequired(const char * const msg) { nextion.confirmationRequest(msg); }`
`57`	`57`
`58`	`58`	`// For fancy LCDs include an icon ID, message, and translated button title`
`59`		`- void onUserConfirmRequired(const int icon, const char * const cstr, FSTR_P const fBtn) {`
	`59`	`+ void onUserConfirmRequired(const int, const char * const cstr, FSTR_P const) {`
`60`	`60`	`onUserConfirmRequired(cstr);`
`61`		`- UNUSED(icon); UNUSED(fBtn);`
`62`	`61`	`}`
`63`		`- void onUserConfirmRequired(const int icon, FSTR_P const fstr, FSTR_P const fBtn) {`
	`62`	`+ void onUserConfirmRequired(const int, FSTR_P const fstr, FSTR_P const) {`
`64`	`63`	`onUserConfirmRequired(fstr);`
`65`		`- UNUSED(icon); UNUSED(fBtn);`
`66`	`64`	`}`
`67`	`65`
`68`	`66`	`#if ENABLED(ADVANCED_PAUSE_FEATURE)`