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

Merge pull request #113 from PavelSindler/MK2 

M117 fixed
This commit is contained in:
PavelSindler 2017-05-26 14:12:07 +02:00 committed by GitHub
parent e331d7d569 36091dcde4
commit 024a50d2dc
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/Marlin_main.cpp
View File

@ -93,7 +93,6 @@
// PRUSA CODES // PRUSA CODES
// P F - Returns FW versions // P F - Returns FW versions
// P R - Returns revision of printer // P R - Returns revision of printer
// P Y - Starts filament allignment process for multicolor
// G0 -> G1 // G0 -> G1
// G1 - Coordinated Movement X Y Z E // G1 - Coordinated Movement X Y Z E
@ -2004,7 +2003,13 @@ void process_commands()
float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD; float tmp_motor_loud[3] = DEFAULT_PWM_MOTOR_CURRENT_LOUD;
int8_t SilentMode; int8_t SilentMode;
#endif #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 (code_seen("Ping")) { //PRUSA Ping
if (farm_mode) { if (farm_mode) {
PingTime = millis(); PingTime = millis();
@ -4335,12 +4340,12 @@ Sigma_Exit:
SERIAL_PROTOCOLRPGM(MSG_M115_REPORT); SERIAL_PROTOCOLRPGM(MSG_M115_REPORT);
} }
break; break;
case 117: // M117 display message /* case 117: // M117 display message
starpos = (strchr(strchr_pointer + 5,'*')); starpos = (strchr(strchr_pointer + 5,'*'));
if(starpos!=NULL) if(starpos!=NULL)
*(starpos)='\0'; *(starpos)='\0';
lcd_setstatus(strchr_pointer + 5); lcd_setstatus(strchr_pointer + 5);
break; break;*/
case 114: // M114 case 114: // M114
SERIAL_PROTOCOLPGM("X:"); SERIAL_PROTOCOLPGM("X:");
SERIAL_PROTOCOL(current_position[X_AXIS]); SERIAL_PROTOCOL(current_position[X_AXIS]);