🐛 ExtUI F() followups

Followup to 12b5d99
CR30-Users · Dec 25, 2021 · d9f7de7 · d9f7de7
1 parent 3d102a7
commit d9f7de7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
@@ -315,15 +315,15 @@ void ChironTFT::PrintComplete() {
   setSoftEndstopState(true); // enable endstops
 }
 
-void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM string to the panel
+void ChironTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) {  // A helper to print PROGMEM string to the panel
   #if ACDEBUG(AC_SOME)
     SERIAL_ECHOF(fstr);
   #endif
   PGM_P str = FTOP(fstr);
   while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
 }
 
-void ChironTFT::SendtoTFTLN(FSTR_P const fstr) {
+void ChironTFT::SendtoTFTLN(FSTR_P const fstr/*=nullptr*/) {
   if (fstr) {
     #if ACDEBUG(AC_SOME)
       SERIAL_ECHOPGM("> ");

diff --git a/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h b/Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
@@ -67,8 +67,8 @@ class ChironTFT {
     static void StatusChange(const char * const);
     static void PowerLossRecovery();
     static void PrintComplete();
-    static void SendtoTFT(FSTR_P const);
-    static void SendtoTFTLN(FSTR_P const);
+    static void SendtoTFT(FSTR_P const=nullptr);
+    static void SendtoTFTLN(FSTR_P const=nullptr);
   private:
     static void DetectPanelType();
     static bool ReadTFTCommand();

diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.cpp b/Marlin/src/lcd/extui/nextion/nextion_tft.cpp
@@ -110,7 +110,7 @@ void NextionTFT::StatusChange(const char * const msg) {
   SEND_VALasTXT("tmppage.M117", msg);
 }
 
-void NextionTFT::SendtoTFT(FSTR_P fstr) { // A helper to print PROGMEM string to the panel
+void NextionTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) { // A helper to print PROGMEM string to the panel
   #if NEXDEBUG(N_SOME)
     DEBUG_ECHOF(fstr);
   #endif

diff --git a/Marlin/src/lcd/extui/nextion/nextion_tft.h b/Marlin/src/lcd/extui/nextion/nextion_tft.h
@@ -42,10 +42,11 @@ class NextionTFT {
     NextionTFT();
     static void Startup();
     static void IdleLoop();
-    static void PrinterKilled(PGM_P, PGM_P);
+    static void PrinterKilled(FSTR_P const, FSTR_P const);
     static void ConfirmationRequest(const char * const);
     static void StatusChange(const char * const);
-    static void SendtoTFT(FSTR_P const);
+    static void SendtoTFT(FSTR_P const=nullptr);
+    //static void SendtoTFTLN(FSTR_P const=nullptr);
     static void UpdateOnChange();
     static void PrintFinished();
     static void PanelInfo(uint8_t);