Browse Source

🐛 ExtUI F() followups

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

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

315
   setSoftEndstopState(true); // enable endstops
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
   #if ACDEBUG(AC_SOME)
319
   #if ACDEBUG(AC_SOME)
320
     SERIAL_ECHOF(fstr);
320
     SERIAL_ECHOF(fstr);
321
   #endif
321
   #endif
323
   while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
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
   if (fstr) {
327
   if (fstr) {
328
     #if ACDEBUG(AC_SOME)
328
     #if ACDEBUG(AC_SOME)
329
       SERIAL_ECHOPGM("> ");
329
       SERIAL_ECHOPGM("> ");

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

67
     static void StatusChange(const char * const);
67
     static void StatusChange(const char * const);
68
     static void PowerLossRecovery();
68
     static void PowerLossRecovery();
69
     static void PrintComplete();
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
   private:
72
   private:
73
     static void DetectPanelType();
73
     static void DetectPanelType();
74
     static bool ReadTFTCommand();
74
     static bool ReadTFTCommand();

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

110
   SEND_VALasTXT("tmppage.M117", msg);
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
   #if NEXDEBUG(N_SOME)
114
   #if NEXDEBUG(N_SOME)
115
     DEBUG_ECHOF(fstr);
115
     DEBUG_ECHOF(fstr);
116
   #endif
116
   #endif

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

42
     NextionTFT();
42
     NextionTFT();
43
     static void Startup();
43
     static void Startup();
44
     static void IdleLoop();
44
     static void IdleLoop();
45
-    static void PrinterKilled(PGM_P, PGM_P);
45
+    static void PrinterKilled(FSTR_P const, FSTR_P const);
46
     static void ConfirmationRequest(const char * const);
46
     static void ConfirmationRequest(const char * const);
47
     static void StatusChange(const char * const);
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
     static void UpdateOnChange();
50
     static void UpdateOnChange();
50
     static void PrintFinished();
51
     static void PrintFinished();
51
     static void PanelInfo(uint8_t);
52
     static void PanelInfo(uint8_t);

Loading…
Cancel
Save