From a4bc91ed2f1c8b79ca5e0cd6d629898d945fbd39 Mon Sep 17 00:00:00 2001 From: Vojtech Pavlik Date: Thu, 6 Jun 2019 14:25:36 +0200 Subject: [PATCH] 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. --- Firmware/Marlin_main.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 314514f0a..586bdbe97 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3430,6 +3430,7 @@ void process_commands() if (starpos != NULL) *(starpos) = '\0'; 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 @@ -3450,6 +3451,7 @@ void process_commands() starpos = strchr(src, '*'); if (starpos != NULL) *(starpos) = '\0'; while (*src == ' ') ++src; + custom_message_type = CUSTOM_MSG_TYPE_M0WAIT; if (!hasP && !hasS && *src != '\0') { lcd_setstatus(src); } else { @@ -3476,6 +3478,7 @@ void process_commands() LCD_MESSAGERPGM(_T(MSG_RESUMING_PRINT)); else LCD_MESSAGERPGM(_T(WELCOME_MSG)); + custom_message_type = CUSTOM_MSG_TYPE_MSGUPD; } #ifdef TMC2130