From ea51696a688d496b9865a2ef45d9008457e227c2 Mon Sep 17 00:00:00 2001 From: Alex Voinea Date: Wed, 15 Jan 2020 22:30:43 +0200 Subject: [PATCH] Merge Special sections as requested --- Firmware/Marlin_main.cpp | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 60aa0d294..6090867fe 100755 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -3600,16 +3600,7 @@ void process_commands() ### M117 - Display Message M117: Display Message This causes the given message to be shown in the status line on an attached LCD. It is processed early as to allow printing messages that contain G, M, N or T. - */ - if (code_seen("M117")) { //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^" - starpos = (strchr(strchr_pointer + 5, '*')); - if (starpos != NULL) - *(starpos) = '\0'; - lcd_setstatus(strchr_pointer + 5); - } - -#ifdef TMC2130 - /*! + --------------------------------------------------------------------------------- ### Special internal commands These are used by internal functions to process certain actions in the right order. Some of these are also usable by the user. @@ -3621,7 +3612,15 @@ void process_commands() - TMC_SET_WAVE - TMC_SET_STEP - TMC_SET_CHOP - */ + */ + if (code_seen("M117")) { //moved to highest priority place to be able to to print strings which includes "G", "PRUSA" and "^" + starpos = (strchr(strchr_pointer + 5, '*')); + if (starpos != NULL) + *(starpos) = '\0'; + lcd_setstatus(strchr_pointer + 5); + } + +#ifdef TMC2130 else if (strncmp_P(CMDBUFFER_CURRENT_STRING, PSTR("CRASH_"), 6) == 0) {