From a3a47856c226b9dfa4d57da6b4e646a1bf3f9bfd Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Tue, 21 Jul 2020 08:25:45 +0200 Subject: [PATCH] Use PROGMEM for TFT string handling --- Marlin/src/lcd/anycubic_touchscreen.cpp | 116 ++++++++++++------------ 1 file changed, 58 insertions(+), 58 deletions(-) diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index efec31f0..eb2ea4b4 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -558,80 +558,80 @@ void AnycubicTouchscreenClass::AnycubicTouchscreen() switch (filenumber) { case 0: // Page 1 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; #if DISABLED(KNUTWURST_BLTOUCH) case 4: // Page 2 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; case 8: // Page 3 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; case 12: // Page 4 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; case 16: // Page 5 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; #endif #if ENABLED(KNUTWURST_BLTOUCH) case 4: // Page 2 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; case 8: // Page 3 - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); break; #endif @@ -663,15 +663,15 @@ void AnycubicTouchscreenClass::AnycubicTouchscreen() { if (strcmp(card.getWorkDirName(), "/") == 0) { - HARDWARE_SERIAL_PROTOCOLLN(""); - HARDWARE_SERIAL_PROTOCOLLN(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); + HARDWARE_SERIAL_PROTOCOLLNPGM(""); SERIAL_ECHO(count); SERIAL_ECHOLNPGM(""); } else { - HARDWARE_SERIAL_PROTOCOLLN("/.."); - HARDWARE_SERIAL_PROTOCOLLN("/.."); + HARDWARE_SERIAL_PROTOCOLLNPGM("/.."); + HARDWARE_SERIAL_PROTOCOLLNPGM("/.."); SERIAL_ECHO(count); SERIAL_ECHOLNPGM("/.."); }