bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

🎨 Apply F() to kill / sendinfoscreen

Browse Source
This commit is contained in:
Scott Lahteine
2021-09-28 20:15:52 -05:00
parent 492d70424d
commit 3d102a77ca
52 changed files with 149 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/control/M108_M112_M410.cpp
View File

@ -40,7 +40,7 @@ void GcodeSuite::M108() {
* M112: Full Shutdown
*/
void GcodeSuite::M112() {
kill(M112_KILL_STR, nullptr, true);
kill(FPSTR(M112_KILL_STR), nullptr, true);
}
/**

2
Marlin/src/gcode/gcode.cpp
View File

@ -262,7 +262,7 @@ void GcodeSuite::dwell(millis_t time) {
#ifdef ACTION_ON_CANCEL
host_action_cancel();
#endif
kill(GET_TEXT(MSG_LCD_PROBING_FAILED));
kill(GET_TEXT_F(MSG_LCD_PROBING_FAILED));
#endif
}

2
Marlin/src/gcode/gcode_d.cpp
View File

@ -58,7 +58,7 @@ void GcodeSuite::D(const int16_t dcode) {
break;
case 10:
kill(PSTR("D10"), PSTR("KILL TEST"), parser.seen_test('P'));
kill(F("D10"), F("KILL TEST"), parser.seen_test('P'));
break;
case 1: {

2
Marlin/src/gcode/host/M16.cpp
View File

@ -33,7 +33,7 @@
void GcodeSuite::M16() {
if (strcmp_P(parser.string_arg, PSTR(MACHINE_NAME)))
kill(GET_TEXT(MSG_KILL_EXPECTED_PRINTER));
kill(GET_TEXT_F(MSG_KILL_EXPECTED_PRINTER));
}

2
Marlin/src/gcode/lcd/M0_M1.cpp
View File

@ -67,7 +67,7 @@ void GcodeSuite::M0_M1() {
#elif ENABLED(EXTENSIBLE_UI)
if (parser.string_arg)
ExtUI::onUserConfirmRequired(parser.string_arg); // Can this take an SRAM string??
ExtUI::onUserConfirmRequired(parser.string_arg); // String in an SRAM buffer
else
ExtUI::onUserConfirmRequired(GET_TEXT_F(MSG_USERWAIT));
#elif ENABLED(DWIN_CREALITY_LCD_ENHANCED)

2
Marlin/src/gcode/queue.cpp
View File

@ -523,7 +523,7 @@ void GCodeQueue::get_serial_commands() {
// Process critical commands early
if (command[0] == 'M') switch (command[3]) {
case '8': if (command[2] == '0' && command[1] == '1') { wait_for_heatup = false; TERN_(HAS_LCD_MENU, wait_for_user = false); } break;
case '2': if (command[2] == '1' && command[1] == '1') kill(M112_KILL_STR, nullptr, true); break;
case '2': if (command[2] == '1' && command[1] == '1') kill(FPSTR(M112_KILL_STR), nullptr, true); break;
case '0': if (command[1] == '4' && command[2] == '1') quickstop_stepper(); break;
}
#endif