3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-05 22:27:43 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

🧑‍💻 Add Parser::has_string

Browse source
This commit is contained in:
Scott Lahteine 2025-04-06 13:48:01 -05:00
parent 493c5eec21
commit bc85f5bebf
6 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/gcode/config/M550.cpp
View file

@ -42,7 +42,7 @@ void GcodeSuite::M550() {
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])
else if (parser.has_string())
machine_name = parser.string_arg;
else
did_set = false;

2
Marlin/src/gcode/control/T.cpp
View file

@ -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;
}

2
Marlin/src/gcode/lcd/M117.cpp
View file

@ -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();

2
Marlin/src/gcode/parser.h
View file

@ -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

2
Marlin/src/gcode/stats/M75-M78.cpp
View file

@ -43,7 +43,7 @@ void GcodeSuite::M75() {
startOrResumeJob(); // ... ExtUI::onPrintTimerStarted()
#if ENABLED(DWIN_LCD_PROUI)
// TODO: Remove if M75 <string> 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
}

2
Marlin/src/lcd/extui/ia_creality/ia_creality_rts.cpp
View file

@ -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"));