Skip to content

Commit d9f7de7

Browse files
committed
🐛 ExtUI F() followups
Followup to 12b5d99
1 parent 3d102a7 commit d9f7de7

File tree

4 files changed

+8
-7
lines changed

4 files changed

+8
-7
lines changed

Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -315,15 +315,15 @@ void ChironTFT::PrintComplete() {
315315
setSoftEndstopState(true); // enable endstops
316316
}
317317

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
319319
#if ACDEBUG(AC_SOME)
320320
SERIAL_ECHOF(fstr);
321321
#endif
322322
PGM_P str = FTOP(fstr);
323323
while (const char c = pgm_read_byte(str++)) TFTSer.write(c);
324324
}
325325

326-
void ChironTFT::SendtoTFTLN(FSTR_P const fstr) {
326+
void ChironTFT::SendtoTFTLN(FSTR_P const fstr/*=nullptr*/) {
327327
if (fstr) {
328328
#if ACDEBUG(AC_SOME)
329329
SERIAL_ECHOPGM("> ");

Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ class ChironTFT {
6767
static void StatusChange(const char * const);
6868
static void PowerLossRecovery();
6969
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);
7272
private:
7373
static void DetectPanelType();
7474
static bool ReadTFTCommand();

Marlin/src/lcd/extui/nextion/nextion_tft.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ void NextionTFT::StatusChange(const char * const msg) {
110110
SEND_VALasTXT("tmppage.M117", msg);
111111
}
112112

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
114114
#if NEXDEBUG(N_SOME)
115115
DEBUG_ECHOF(fstr);
116116
#endif

Marlin/src/lcd/extui/nextion/nextion_tft.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ class NextionTFT {
4242
NextionTFT();
4343
static void Startup();
4444
static void IdleLoop();
45-
static void PrinterKilled(PGM_P, PGM_P);
45+
static void PrinterKilled(FSTR_P const, FSTR_P const);
4646
static void ConfirmationRequest(const char * const);
4747
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);
4950
static void UpdateOnChange();
5051
static void PrintFinished();
5152
static void PanelInfo(uint8_t);

0 commit comments

Comments
 (0)