zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🐛 ExtUI F() followups

Browse source 
Followup to 12b5d997a2
This commit is contained in:
Scott Lahteine 2021-10-04 19:50:14 -05:00 committed by Scott Lahteine
parent 3d102a77ca
commit d9f7de7a24
4 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.cpp
View file

@ -315,7 +315,7 @@ void ChironTFT::PrintComplete() {
setSoftEndstopState(true); // enable endstops 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) #if ACDEBUG(AC_SOME)
SERIAL_ECHOF(fstr); SERIAL_ECHOF(fstr);
#endif #endif
@ -323,7 +323,7 @@ void ChironTFT::SendtoTFT(FSTR_P const fstr) { // A helper to print PROGMEM str
while (const char c = pgm_read_byte(str++)) TFTSer.write(c); 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 (fstr) {
#if ACDEBUG(AC_SOME) #if ACDEBUG(AC_SOME)
SERIAL_ECHOPGM("> "); SERIAL_ECHOPGM("> ");

4
Marlin/src/lcd/extui/anycubic_chiron/chiron_tft.h
View file

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

2
Marlin/src/lcd/extui/nextion/nextion_tft.cpp
View file

@ -110,7 +110,7 @@ void NextionTFT::StatusChange(const char * const msg) {
SEND_VALasTXT("tmppage.M117", 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) #if NEXDEBUG(N_SOME)
DEBUG_ECHOF(fstr); DEBUG_ECHOF(fstr);
#endif #endif

5
Marlin/src/lcd/extui/nextion/nextion_tft.h
View file

@ -42,10 +42,11 @@ class NextionTFT {
NextionTFT(); NextionTFT();
static void Startup(); static void Startup();
static void IdleLoop(); 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 ConfirmationRequest(const char * const);
static void StatusChange(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 UpdateOnChange();
static void PrintFinished(); static void PrintFinished();
static void PanelInfo(uint8_t); static void PanelInfo(uint8_t);