From 7c0ead7bc280448667f315f3f510742748839131 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Sat, 18 Mar 2023 16:15:10 +0000 Subject: [PATCH] Add M24 into PROGMEM Change in memory: Flash: -8 bytes SRAM: 0 bytes --- Firmware/Marlin_main.cpp | 2 +- Firmware/cardreader.cpp | 2 +- Firmware/messages.cpp | 1 + Firmware/messages.h | 1 + Firmware/ultralcd.cpp | 2 +- 5 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 65933485a..6e3d3402e 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -4182,7 +4182,7 @@ void process_commands() } else if (code_seen_P(PSTR("uvlo"))) { // PRUSA uvlo eeprom_update_byte((uint8_t*)EEPROM_UVLO,0); - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); } else if (code_seen_P(PSTR("MMURES"))) // PRUSA MMURES { diff --git a/Firmware/cardreader.cpp b/Firmware/cardreader.cpp index 4f8ee6c58..bc54e24af 100644 --- a/Firmware/cardreader.cpp +++ b/Firmware/cardreader.cpp @@ -654,7 +654,7 @@ void CardReader::checkautostart(bool force) sprintf_P(cmd, PSTR("M23 %s"), autoname); enquecommand(cmd); // M24: Start/resume SD print - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); found=true; } } diff --git a/Firmware/messages.cpp b/Firmware/messages.cpp index b42a97e8f..0d5c0b84f 100644 --- a/Firmware/messages.cpp +++ b/Firmware/messages.cpp @@ -232,5 +232,6 @@ const char MSG_UNKNOWN_CODE[] PROGMEM_N1 = "Unknown %c code: %s\n"; // Common G-gcodes const char MSG_M701_NO_LIFT[] PROGMEM_N1 = "M701 Z0"; const char MSG_M702_NO_LIFT[] PROGMEM_N1 = "M702 Z0"; +const char MSG_M24[] PROGMEM_N1 = "M24"; const char MSG_M83[] PROGMEM_N1 = "M83"; const char MSG_M84[] PROGMEM_N1 = "M84"; diff --git a/Firmware/messages.h b/Firmware/messages.h index 54ab8466f..847e21cd0 100644 --- a/Firmware/messages.h +++ b/Firmware/messages.h @@ -238,6 +238,7 @@ extern const char MSG_UNKNOWN_CODE[]; // Common G-gcodes extern const char MSG_M701_NO_LIFT[]; extern const char MSG_M702_NO_LIFT[]; +extern const char MSG_M24[]; extern const char MSG_M83[]; extern const char MSG_M84[]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 710a6a1a8..df26ccf51 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7304,7 +7304,7 @@ static void menu_action_sdfile(const char* filename) } if (result) { enquecommand(cmd); - enquecommand_P(PSTR("M24")); + enquecommand_P(MSG_M24); } lcd_return_to_status();