josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

M0/M1/M117 fix: Use CUSTOM_MSG states in M0/1/M117 

Now that we have the new CUSTOM_MSG states, we can use them in the M0/M1
and M117 handlers to force the user message to be displayed even when
the printer is printing from a SD card and displaying a file name.
This commit is contained in:
Vojtech Pavlik 2019-06-06 14:25:36 +02:00
parent 5494f23942
commit a4bc91ed2f
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Firmware/Marlin_main.cpp
View File

@ -3430,6 +3430,7 @@ void process_commands()
if (starpos != NULL) if (starpos != NULL)
*(starpos) = '\0'; *(starpos) = '\0';
lcd_setstatus(strchr_pointer + 5); lcd_setstatus(strchr_pointer + 5);
custom_message_type = CUSTOM_MSG_TYPE_MSGUPD;
} }
else if (code_seen("M0 ") || code_seen("M1 ")) { // M0 and M1 - (Un)conditional stop - Wait for user buttn press on LCD else if (code_seen("M0 ") || code_seen("M1 ")) { // M0 and M1 - (Un)conditional stop - Wait for user buttn press on LCD
@ -3450,6 +3451,7 @@ void process_commands()
starpos = strchr(src, '*'); starpos = strchr(src, '*');
if (starpos != NULL) *(starpos) = '\0'; if (starpos != NULL) *(starpos) = '\0';
while (*src == ' ') ++src; while (*src == ' ') ++src;
custom_message_type = CUSTOM_MSG_TYPE_M0WAIT;
if (!hasP && !hasS && *src != '\0') { if (!hasP && !hasS && *src != '\0') {
lcd_setstatus(src); lcd_setstatus(src);
} else { } else {
@ -3476,6 +3478,7 @@ void process_commands()
LCD_MESSAGERPGM(_T(MSG_RESUMING_PRINT)); LCD_MESSAGERPGM(_T(MSG_RESUMING_PRINT));
else else
LCD_MESSAGERPGM(_T(WELCOME_MSG)); LCD_MESSAGERPGM(_T(WELCOME_MSG));
custom_message_type = CUSTOM_MSG_TYPE_MSGUPD;
} }
#ifdef TMC2130 #ifdef TMC2130