Browse Source

Merge Special sections as requested

Alex Voinea 4 years ago
parent
commit
ea51696a68
1 changed files with 10 additions and 11 deletions
  1. 10 11
      Firmware/Marlin_main.cpp

+ 10 - 11
Firmware/Marlin_main.cpp

@@ -3600,16 +3600,7 @@ void process_commands()
   ### M117 - Display Message <a href="https://reprap.org/wiki/G-code#M117:_Display_Message">M117: Display Message</a>
   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)
 	{