From 9f251cc4bdd510c8a92ea9696a92c588f70cd53f Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Mon, 31 Mar 2025 03:16:16 -0400 Subject: [PATCH 01/11] edit M550.cpp --- Marlin/src/gcode/config/M550.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index 6ff0c506de..b64664143f 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -29,31 +29,35 @@ #include "../../lcd/marlinui.h" /** - * M550: Set machine name + * M550: Set machine name (RepRapFirmware) * * Parameters: - * P "" Set the name using the 'P' parameter (RepRapFirmware) - * "" Set the name using the "string" parameter + * P Set the name using the 'P' parameter (NOTE: Without quotes results in all capital letters) + * P "" Set the name using the 'P' and "string" parameter (GCODE_QUOTED_STRINGS must be enabled) + * "" Set the name using the "string" parameter (GCODE_QUOTED_STRINGS must be enabled) + * Print the name only */ void GcodeSuite::M550() { bool did_set = true; if (parser.seenval('P')) machine_name = parser.value_string(); - else if (TERN(GCODE_QUOTED_STRINGS, false, parser.seen('P'))) - machine_name = parser.string_arg[0] == 'P' ? &parser.string_arg[1] : parser.string_arg; - else if (parser.string_arg && parser.string_arg[0]) - machine_name = parser.string_arg; + #if ENABLED(GCODE_QUOTED_STRINGS) + else if (parser.seen('P')) + machine_name = &parser.string_arg[1]; + else if (parser.string_arg && parser.string_arg[0]) + machine_name = parser.string_arg + #endif else did_set = false; if (did_set) { machine_name.trim(); ui.reset_status(false); + SERIAL_ECHOLN("RepRap name change OK"); } else SERIAL_ECHOLNPGM("RepRap name: ", &machine_name); - } #endif // CONFIGURABLE_MACHINE_NAME From 8d98b88878195a26df3a2749d48d64b764e17166 Mon Sep 17 00:00:00 2001 From: classicrocker883 Date: Mon, 31 Mar 2025 03:18:10 -0400 Subject: [PATCH 02/11] remove sanity check --- Marlin/src/inc/SanityCheck.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h index 62e16b0156..f14630b438 100644 --- a/Marlin/src/inc/SanityCheck.h +++ b/Marlin/src/inc/SanityCheck.h @@ -4507,10 +4507,6 @@ static_assert(WITHIN(MULTISTEPPING_LIMIT, 1, 128) && IS_POWER_OF_2(MULTISTEPPING #error "Only enable ULTIPANEL_FEEDMULTIPLY or ULTIPANEL_FLOWPERCENT, but not both." #endif -#if ENABLED(CONFIGURABLE_MACHINE_NAME) && DISABLED(GCODE_QUOTED_STRINGS) - #error "CONFIGURABLE_MACHINE_NAME requires GCODE_QUOTED_STRINGS." -#endif - // Misc. Cleanup #undef _TEST_PWM #undef _NUM_AXES_STR From 6b7211e4fdbc2da093a61f0068829186818efae2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 31 Mar 2025 23:59:32 -0500 Subject: [PATCH 03/11] parser.has_string --- Marlin/src/gcode/control/T.cpp | 2 +- Marlin/src/gcode/lcd/M117.cpp | 2 +- Marlin/src/gcode/parser.h | 2 ++ Marlin/src/gcode/stats/M75-M78.cpp | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Marlin/src/gcode/control/T.cpp b/Marlin/src/gcode/control/T.cpp index 9f6fb2bb00..ce6428950e 100644 --- a/Marlin/src/gcode/control/T.cpp +++ b/Marlin/src/gcode/control/T.cpp @@ -69,7 +69,7 @@ void GcodeSuite::T(const int8_t tool_index) { reset_stepper_timeout(); #if HAS_PRUSA_MMU3 - if (parser.string_arg) { + if (parser.has_string()) { mmu3.tool_change(parser.string_arg[0], uint8_t(tool_index)); // Special commands T?/Tx/Tc return; } diff --git a/Marlin/src/gcode/lcd/M117.cpp b/Marlin/src/gcode/lcd/M117.cpp index 57a26851fd..e8b9cc46f6 100644 --- a/Marlin/src/gcode/lcd/M117.cpp +++ b/Marlin/src/gcode/lcd/M117.cpp @@ -32,7 +32,7 @@ */ void GcodeSuite::M117() { - if (parser.string_arg && parser.string_arg[0]) + if (parser.has_string()) ui.set_status_no_expire(parser.string_arg); else ui.reset_status(); diff --git a/Marlin/src/gcode/parser.h b/Marlin/src/gcode/parser.h index 401548b309..e56a723087 100644 --- a/Marlin/src/gcode/parser.h +++ b/Marlin/src/gcode/parser.h @@ -97,6 +97,8 @@ public: FORCE_INLINE static void cancel_motion_mode() { motion_mode_codenum = -1; } #endif + FORCE_INLINE static bool has_string() { return string_arg && string_arg[0]; } + #if ENABLED(DEBUG_GCODE_PARSER) static void debug(); #endif diff --git a/Marlin/src/gcode/stats/M75-M78.cpp b/Marlin/src/gcode/stats/M75-M78.cpp index 03e76d531d..8ab94577ef 100644 --- a/Marlin/src/gcode/stats/M75-M78.cpp +++ b/Marlin/src/gcode/stats/M75-M78.cpp @@ -43,7 +43,7 @@ void GcodeSuite::M75() { startOrResumeJob(); // ... ExtUI::onPrintTimerStarted() #if ENABLED(DWIN_LCD_PROUI) // TODO: Remove if M75 is never used - if (!IS_SD_PRINTING()) dwinPrintHeader(parser.string_arg && parser.string_arg[0] ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT)); + if (!IS_SD_PRINTING()) dwinPrintHeader(parser.has_string() ? parser.string_arg : GET_TEXT(MSG_HOST_START_PRINT)); #endif } From 1a8fd8a19c682237712d30fcb962a2a395c5b76a Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Mon, 31 Mar 2025 23:59:58 -0500 Subject: [PATCH 04/11] clean up --- Marlin/src/gcode/config/M550.cpp | 28 +++++++++++-------- .../lcd/extui/ia_creality/ia_creality_rts.cpp | 2 +- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index b64664143f..7ebb400536 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -29,24 +29,29 @@ #include "../../lcd/marlinui.h" /** - * M550: Set machine name (RepRapFirmware) + * M550: Set machine name * * Parameters: - * P Set the name using the 'P' parameter (NOTE: Without quotes results in all capital letters) - * P "" Set the name using the 'P' and "string" parameter (GCODE_QUOTED_STRINGS must be enabled) - * "" Set the name using the "string" parameter (GCODE_QUOTED_STRINGS must be enabled) - * Print the name only + * P - Set the name using the 'P' parameter and following string without spaces + * (NOTE: ALL CAPS unless GCODE_CASE_INSENSITIVE is enabled.) + * + * With GCODE_QUOTED_STRINGS: + * P "" Get the name from the 'P' parameter, quoting required for spaces in the name + * "" Get the name from the "string" parameter */ void GcodeSuite::M550() { bool did_set = true; - if (parser.seenval('P')) - machine_name = parser.value_string(); - #if ENABLED(GCODE_QUOTED_STRINGS) - else if (parser.seen('P')) + if (parser.seenval('P')) { + #if ENABLED(GCODE_QUOTED_STRINGS) machine_name = &parser.string_arg[1]; - else if (parser.string_arg && parser.string_arg[0]) - machine_name = parser.string_arg + #else + machine_name = parser.value_string(); + #endif + } + #if ENABLED(GCODE_QUOTED_STRINGS) + else if (parser.has_string()) + machine_name = parser.string_arg; #endif else did_set = false; @@ -54,7 +59,6 @@ void GcodeSuite::M550() { if (did_set) { machine_name.trim(); ui.reset_status(false); - SERIAL_ECHOLN("RepRap name change OK"); } else SERIAL_ECHOLNPGM("RepRap name: ", &machine_name); diff --git a/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp b/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp index 660d7faed7..8fb672931d 100644 --- a/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp +++ b/Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp @@ -100,7 +100,7 @@ void RTS::onStartup() { delay_ms(400); // Delay to allow screen to configure #if ENABLED(CONFIGURABLE_MACHINE_NAME) - const MString<32> ready(message_string, " Ready"); + const MString<32> ready(machine_name, " Ready"); onStatusChanged(ready); #else onStatusChanged(F(MACHINE_NAME " Ready")); From 824b2feba4ba785d81a8e789c70c62cdc84d7b99 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 1 Apr 2025 01:42:41 -0500 Subject: [PATCH 05/11] ideas --- Marlin/src/gcode/config/M550.cpp | 40 ++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index 7ebb400536..7e4f5cb61e 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -28,40 +28,44 @@ #include "../../MarlinCore.h" #include "../../lcd/marlinui.h" +//#define DEBUG_OUT 1 +#include "../../core/debug_out.h" + /** * M550: Set machine name * * Parameters: - * P - Set the name using the 'P' parameter and following string without spaces + * P - Set the name using the 'P' parameter and following string * (NOTE: ALL CAPS unless GCODE_CASE_INSENSITIVE is enabled.) * - * With GCODE_QUOTED_STRINGS: + * With GCODE_QUOTED_STRINGS these can also be used: * P "" Get the name from the 'P' parameter, quoting required for spaces in the name * "" Get the name from the "string" parameter */ void GcodeSuite::M550() { - bool did_set = true; - - if (parser.seenval('P')) { - #if ENABLED(GCODE_QUOTED_STRINGS) - machine_name = &parser.string_arg[1]; - #else - machine_name = parser.value_string(); - #endif - } #if ENABLED(GCODE_QUOTED_STRINGS) + if (parser.seenval('P')) + machine_name = parser.value_string(); + //machine_name = &parser.string_arg[1]; + else if (parser.has_string()) + machine_name = parser.string_arg; + #else + if (parser.seenval('P')) + machine_name = parser.value_string(); + //machine_name = &parser.string_arg[1]; else if (parser.has_string()) machine_name = parser.string_arg; #endif - else - did_set = false; - if (did_set) { - machine_name.trim(); - ui.reset_status(false); - } - else + else { SERIAL_ECHOLNPGM("RepRap name: ", &machine_name); + return; + } + + machine_name.trim(); + ui.reset_status(false); + + DEBUG_ECHOLNPGM("RepRap name: ", &machine_name); } #endif // CONFIGURABLE_MACHINE_NAME From 29c7a7fdd0f366de8878271447ebe914c53b0f45 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Tue, 1 Apr 2025 03:11:43 -0500 Subject: [PATCH 06/11] Menu code cleanup --- Marlin/src/lcd/marlinui.cpp | 44 +++++++++++++-------------- Marlin/src/lcd/menu/menu_filament.cpp | 17 ++++------- Marlin/src/lcd/menu/menu_item.h | 5 ++- 3 files changed, 29 insertions(+), 37 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 2114209b98..384bf65211 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -527,29 +527,27 @@ void MarlinUI::init() { #define ADC_MIN_KEY_DELAY 100 if (keypad_buttons) { - #if HAS_ENCODER_ACTION - refresh(LCDVIEW_REDRAW_NOW); - #if HAS_MARLINUI_MENU - if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation - if (RRK(EN_KEYPAD_UP)) encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; - else if (RRK(EN_KEYPAD_DOWN)) encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM; - else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); } - else if (RRK(EN_KEYPAD_RIGHT)) { return_to_status(); quick_feedback(); } - } - else - #endif - { - #if HAS_MARLINUI_MENU - if (RRK(EN_KEYPAD_UP)) encoderPosition -= epps; - else if (RRK(EN_KEYPAD_DOWN)) encoderPosition += epps; - else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); } - else if (RRK(EN_KEYPAD_RIGHT)) encoderPosition = 0; - #else - if (RRK(EN_KEYPAD_UP) || RRK(EN_KEYPAD_LEFT)) encoderPosition -= epps; - else if (RRK(EN_KEYPAD_DOWN) || RRK(EN_KEYPAD_RIGHT)) encoderPosition += epps; - #endif + refresh(LCDVIEW_REDRAW_NOW); + #if HAS_MARLINUI_MENU + if (encoderDirection == -(ENCODERBASE)) { // HAS_ADC_BUTTONS forces REVERSE_MENU_DIRECTION, so this indicates menu navigation + if (RRK(EN_KEYPAD_UP)) encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; + else if (RRK(EN_KEYPAD_DOWN)) encoderPosition -= ENCODER_STEPS_PER_MENU_ITEM; + else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); } + else if (RRK(EN_KEYPAD_RIGHT)) { return_to_status(); quick_feedback(); } } + else #endif + { + #if HAS_MARLINUI_MENU + if (RRK(EN_KEYPAD_UP)) encoderPosition -= epps; + else if (RRK(EN_KEYPAD_DOWN)) encoderPosition += epps; + else if (RRK(EN_KEYPAD_LEFT)) { MenuItem_back::action(); quick_feedback(); } + else if (RRK(EN_KEYPAD_RIGHT)) encoderPosition = 0; + #else + if (RRK(EN_KEYPAD_UP) || RRK(EN_KEYPAD_LEFT)) encoderPosition -= epps; + else if (RRK(EN_KEYPAD_DOWN) || RRK(EN_KEYPAD_RIGHT)) encoderPosition += epps; + #endif + } next_button_update_ms = millis() + ADC_MIN_KEY_DELAY; return true; } @@ -1337,11 +1335,11 @@ void MarlinUI::init() { const int8_t pulses = epps * encoderDirection; if (BUTTON_PRESSED(UP)) { - encoderDiff = (ENCODER_STEPS_PER_MENU_ITEM) * pulses; + encoderDiff = pulses * (ENCODER_STEPS_PER_MENU_ITEM); next_button_update_ms = now + 300; } else if (BUTTON_PRESSED(DOWN)) { - encoderDiff = -(ENCODER_STEPS_PER_MENU_ITEM) * pulses; + encoderDiff = pulses * -(ENCODER_STEPS_PER_MENU_ITEM); next_button_update_ms = now + 300; } else if (BUTTON_PRESSED(LEFT)) { diff --git a/Marlin/src/lcd/menu/menu_filament.cpp b/Marlin/src/lcd/menu/menu_filament.cpp index 46ebf85ba4..8d6e1b8adb 100644 --- a/Marlin/src/lcd/menu/menu_filament.cpp +++ b/Marlin/src/lcd/menu/menu_filament.cpp @@ -235,18 +235,15 @@ static FSTR_P pause_header() { // Portions from STATIC_ITEM... #define HOTEND_STATUS_ITEM() do { \ - if (_menuLineNr == _thisItemNr) { \ + if ( MY_LINE()) { \ if (ui.should_draw()) { \ IF_DISABLED(HAS_GRAPHICAL_TFT, MenuItem_static::draw(_lcdLineNr, GET_TEXT_F(MSG_FILAMENT_CHANGE_NOZZLE), SS_INVERT)); \ ui.draw_hotend_status(_lcdLineNr, hotend_status_extruder); \ } \ - if (_skipStatic && encoderLine <= _thisItemNr) { \ - ui.encoderPosition += ENCODER_STEPS_PER_MENU_ITEM; \ - ++encoderLine; \ - } \ + STATIC_SKIP(); \ ui.refresh(LCDVIEW_CALL_REDRAW_NEXT); \ } \ - ++_thisItemNr; \ + NEXT_ITEM(); \ }while(0) void menu_pause_option() { @@ -307,11 +304,9 @@ void lcd_pause_waiting_message() { _lcd_pause_message(GET_TEXT_F(MSG_ADVANCED_P void lcd_pause_resume_message() { _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_RESUME)); } void lcd_pause_purge_message() { - #if ENABLED(ADVANCED_PAUSE_CONTINUOUS_PURGE) - _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_CONT_PURGE)); - #else - _lcd_pause_message(GET_TEXT_F(MSG_FILAMENT_CHANGE_PURGE)); - #endif + _lcd_pause_message(GET_TEXT_F( + TERN(ADVANCED_PAUSE_CONTINUOUS_PURGE, MSG_FILAMENT_CHANGE_CONT_PURGE, MSG_FILAMENT_CHANGE_PURGE) + )); } FORCE_INLINE screenFunc_t ap_message_screen(const PauseMessage message) { diff --git a/Marlin/src/lcd/menu/menu_item.h b/Marlin/src/lcd/menu/menu_item.h index d81b1a8843..df2c90425c 100644 --- a/Marlin/src/lcd/menu/menu_item.h +++ b/Marlin/src/lcd/menu/menu_item.h @@ -401,7 +401,7 @@ class MenuItem_bool : public MenuEditItemBase { #define PSTRING_ITEM_F_P(FLABEL, PVAL, STYL) do{ \ constexpr int m = 20; \ char msg[m + 1]; \ - if (_menuLineNr == _thisItemNr) { \ + if (MY_LINE()) { \ msg[0] = ':'; msg[1] = ' '; \ strlcpy_P(msg + 2, PVAL, m - 1); \ if (msg[m - 1] & 0x80) msg[m - 1] = '\0'; \ @@ -410,8 +410,7 @@ class MenuItem_bool : public MenuEditItemBase { }while(0) #define PSTRING_ITEM_N_F_P(N, V...) do{ \ - if (_menuLineNr == _thisItemNr) \ - MenuItemBase::init(N); \ + if (MY_LINE()) MenuItemBase::init(N); \ PSTRING_ITEM_F_P(V); \ }while(0) From d583a81f06f19afa55733ae52e7b8800f697bd59 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 6 Apr 2025 13:59:44 -0500 Subject: [PATCH 07/11] debug tweak --- Marlin/src/gcode/config/M550.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index 1400621959..b27c343e1b 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -69,7 +69,7 @@ void GcodeSuite::M550() { machine_name.trim(); ui.reset_status(false); - DEBUG_ECHOLNPGM("RepRap name: ", &machine_name); + DEBUG_ECHOLNPGM("RepRap name => ", &machine_name); } #endif // CONFIGURABLE_MACHINE_NAME From 8d0cc9afce2c180ce3b853afee8dabf9cc0bf374 Mon Sep 17 00:00:00 2001 From: Andrew Date: Thu, 12 Jun 2025 04:42:09 -0400 Subject: [PATCH 08/11] Update M550 --- Marlin/src/gcode/config/M550.cpp | 30 +++++++----------------------- 1 file changed, 7 insertions(+), 23 deletions(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index b27c343e1b..96e744aa31 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -32,35 +32,19 @@ #include "../../core/debug_out.h" /** - * M550: Set machine name + * M550: Set or Report Machine Name * - * Parameters: - * P - Set the name using the 'P' parameter and following string - * (NOTE: ALL CAPS unless GCODE_CASE_INSENSITIVE is enabled.) + * - Set the name using the "string" parameter * - * With GCODE_QUOTED_STRINGS these can also be used: - * P "" Get the name from the 'P' parameter, quoting required for spaces in the name - * "" Get the name from the "string" parameter + * With GCODE_QUOTED_STRINGS: + * "" - Set the name using the "string" parameter in quotes (Optional) + * + * Without parameters, this reports the current machine name */ void GcodeSuite::M550() { - #if ENABLED(GCODE_QUOTED_STRINGS) - if (parser.seenval('P')) { - machine_name = parser.value_string(); - //machine_name = &parser.string_arg[1]; - } - else if (parser.has_string()) { + if (parser.has_string()) { machine_name = parser.string_arg; } - #else - if (parser.seenval('P')) { - machine_name = parser.value_string(); - //machine_name = &parser.string_arg[1]; - } - else if (parser.has_string()) { - machine_name = parser.string_arg; - } - #endif - else { SERIAL_ECHOLNPGM("RepRap name: ", &machine_name); return; From 4044ef2bc650b263acfea5d1fd3b3683baee87b2 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 13 Jun 2025 00:06:14 -0400 Subject: [PATCH 09/11] update M550, remove debug --- Marlin/src/gcode/config/M550.cpp | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Marlin/src/gcode/config/M550.cpp b/Marlin/src/gcode/config/M550.cpp index 96e744aa31..6bfe568407 100644 --- a/Marlin/src/gcode/config/M550.cpp +++ b/Marlin/src/gcode/config/M550.cpp @@ -28,32 +28,28 @@ #include "../../MarlinCore.h" #include "../../lcd/marlinui.h" -//#define DEBUG_OUT 1 -#include "../../core/debug_out.h" - /** * M550: Set or Report Machine Name * * - Set the name using the "string" parameter * * With GCODE_QUOTED_STRINGS: - * "" - Set the name using the "string" parameter in quotes (Optional) + * "" - Set the name using the "string" parameter in quotes + * NOTE: Works with or without quotes * * Without parameters, this reports the current machine name */ void GcodeSuite::M550() { if (parser.has_string()) { machine_name = parser.string_arg; + machine_name.trim(); } else { SERIAL_ECHOLNPGM("RepRap name: ", &machine_name); return; } - machine_name.trim(); ui.reset_status(false); - - DEBUG_ECHOLNPGM("RepRap name => ", &machine_name); } #endif // CONFIGURABLE_MACHINE_NAME From 9e51dcf5d249c0a3997c1fbaecb5847f329975c9 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 13 Jun 2025 00:07:03 -0400 Subject: [PATCH 10/11] make machine_name TString --- Marlin/src/MarlinCore.cpp | 2 +- Marlin/src/MarlinCore.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp index aa229e80b6..09b8ab87a3 100644 --- a/Marlin/src/MarlinCore.cpp +++ b/Marlin/src/MarlinCore.cpp @@ -276,7 +276,7 @@ PGMSTR(M112_KILL_STR, "M112 Shutdown"); #if ENABLED(CONFIGURABLE_MACHINE_NAME) - MString<64> machine_name; + TString machine_name; #endif MarlinState marlin_state = MarlinState::MF_INITIALIZING; diff --git a/Marlin/src/MarlinCore.h b/Marlin/src/MarlinCore.h index ecab0e3630..2cb3b5be04 100644 --- a/Marlin/src/MarlinCore.h +++ b/Marlin/src/MarlinCore.h @@ -42,7 +42,7 @@ void kill(FSTR_P const lcd_error=nullptr, FSTR_P const lcd_component=nullptr, co void minkill(const bool steppers_off=false); #if ENABLED(CONFIGURABLE_MACHINE_NAME) - extern MString<64> machine_name; + extern TString machine_name; #endif // Global State of the firmware From de33a118be455a16ffd7046dc66491252eab7a66 Mon Sep 17 00:00:00 2001 From: Andrew Date: Fri, 13 Jun 2025 02:31:07 -0400 Subject: [PATCH 11/11] update settings,cpp --- Marlin/src/lcd/marlinui.cpp | 1 - Marlin/src/module/settings.cpp | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/Marlin/src/lcd/marlinui.cpp b/Marlin/src/lcd/marlinui.cpp index 9cfc6498a8..8adb5f4e6d 100644 --- a/Marlin/src/lcd/marlinui.cpp +++ b/Marlin/src/lcd/marlinui.cpp @@ -1589,7 +1589,6 @@ uint8_t expand_u8str_P(char * const outstr, PGM_P const ptpl, const int8_t ind, msg = GET_TEXT_F(WELCOME_MSG); #endif } - else if (ENABLED(STATUS_DO_CLEAR_EMPTY)) msg = F(""); else diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp index 0d197b2d12..ea44895054 100644 --- a/Marlin/src/module/settings.cpp +++ b/Marlin/src/module/settings.cpp @@ -589,7 +589,7 @@ typedef struct SettingsDataStruct { // CONFIGURABLE_MACHINE_NAME // #if ENABLED(CONFIGURABLE_MACHINE_NAME) - MString<64> machine_name; // M550 P + TString machine_name; // M550 #endif //