Browse Source

🐛 ExtUI F() followups

Followup to 12b5d997a2
Scott Lahteine 2 years ago
parent
commit
e8459ae63c

+ 2
- 2
Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp View File

@@ -315,7 +315,7 @@ void ChironTFT::PrintComplete() {
315 315
   setSoftEndstopState(true); // enable endstops
316 316
 }
317 317
 
318
-void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM string to the panel
318
+void ChironTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) {  // A helper to print PROGMEM string to the panel
319 319
   #if ACDEBUG(AC_SOME)
320 320
     SERIAL_ECHOF(fstr);
321 321
   #endif
@@ -323,7 +323,7 @@ void ChironTFT::SendtoTFT(FSTR_P const fstr) {  // A helper to print PROGMEM str
323 323
   while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
324 324
 }
325 325
 
326
-void ChironTFT::SendtoTFTLN(FSTR_P const fstr) {
326
+void ChironTFT::SendtoTFTLN(FSTR_P const fstr/*=nullptr*/) {
327 327
   if (fstr) {
328 328
     #if ACDEBUG(AC_SOME)
329 329
       SERIAL_ECHOPGM("> ");

+ 2
- 2
Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h View File

@@ -67,8 +67,8 @@ class ChironTFT {
67 67
     static void StatusChange(const char * const);
68 68
     static void PowerLossRecovery();
69 69
     static void PrintComplete();
70
-    static void SendtoTFT(FSTR_P const);
71
-    static void SendtoTFTLN(FSTR_P const);
70
+    static void SendtoTFT(FSTR_P const=nullptr);
71
+    static void SendtoTFTLN(FSTR_P const=nullptr);
72 72
   private:
73 73
     static void DetectPanelType();
74 74
     static bool ReadTFTCommand();

+ 1
- 1
Marlin/src/lcd/extui/nextion/nextion_tft.cpp View File

@@ -110,7 +110,7 @@ void NextionTFT::StatusChange(const char * const msg) {
110 110
   SEND_VALasTXT("tmppage.M117", msg);
111 111
 }
112 112
 
113
-void NextionTFT::SendtoTFT(FSTR_P fstr) { // A helper to print PROGMEM string to the panel
113
+void NextionTFT::SendtoTFT(FSTR_P const fstr/*=nullptr*/) { // A helper to print PROGMEM string to the panel
114 114
   #if NEXDEBUG(N_SOME)
115 115
     DEBUG_ECHOF(fstr);
116 116
   #endif

+ 3
- 2
Marlin/src/lcd/extui/nextion/nextion_tft.h View File

@@ -42,10 +42,11 @@ class NextionTFT {
42 42
     NextionTFT();
43 43
     static void Startup();
44 44
     static void IdleLoop();
45
-    static void PrinterKilled(PGM_P, PGM_P);
45
+    static void PrinterKilled(FSTR_P const, FSTR_P const);
46 46
     static void ConfirmationRequest(const char * const);
47 47
     static void StatusChange(const char * const);
48
-    static void SendtoTFT(FSTR_P const);
48
+    static void SendtoTFT(FSTR_P const=nullptr);
49
+    //static void SendtoTFTLN(FSTR_P const=nullptr);
49 50
     static void UpdateOnChange();
50 51
     static void PrintFinished();
51 52
     static void PanelInfo(uint8_t);

Loading…
Cancel
Save