From 86e4056680dbaa5f048035f198efc728ae43011d Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Tue, 23 May 2017 15:06:32 +0200 Subject: [PATCH 1/2] removed unused gcode description --- Firmware/Marlin_main.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index ceaafbac5..5f5fd5d53 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -93,7 +93,6 @@ // PRUSA CODES // P F - Returns FW versions // P R - Returns revision of printer -// P Y - Starts filament allignment process for multicolor // G0 -> G1 // G1 - Coordinated Movement X Y Z E From 36091dcde4f1c83440186f4c112c1eeef3c5ea78 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Fri, 26 May 2017 14:10:50 +0200 Subject: [PATCH 2/2] M117 command fixed to be able to print strings without restrictions --- Firmware/Marlin_main.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index 5f5fd5d53..8002c1d9d 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -2003,7 +2003,13 @@ void process_commands() float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD; int8_t SilentMode; #endif - if(code_seen("PRUSA")){ + 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); + } + else if(code_seen("PRUSA")){ if (code_seen("Ping")) { //PRUSA Ping if (farm_mode) { PingTime = millis(); @@ -4334,12 +4340,12 @@ Sigma_Exit: SERIAL_PROTOCOLRPGM(MSG_M115_REPORT); } break; - case 117: // M117 display message +/* case 117: // M117 display message starpos = (strchr(strchr_pointer + 5,'*')); if(starpos!=NULL) *(starpos)='\0'; lcd_setstatus(strchr_pointer + 5); - break; + break;*/ case 114: // M114 SERIAL_PROTOCOLPGM("X:"); SERIAL_PROTOCOL(current_position[X_AXIS]);