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

Merge pull request #27 from AndreeeCZ/MK2 

main: ignore handling of 'N' symbols (line number) when dealing with special PRUSA commands
This commit is contained in:
Michal Průša 2016-12-14 16:03:11 +01:00 committed by GitHub
parent 5169c17d2f 83dbcc2985
commit e4b7219239
1 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

92
Firmware/Marlin_main.cpp
View File

@ -1239,53 +1239,55 @@ void get_command()
cmdbuffer[bufindw+serial_count+1] = 0; //terminate string cmdbuffer[bufindw+serial_count+1] = 0; //terminate string
if(!comment_mode){ if(!comment_mode){
comment_mode = false; //for new command comment_mode = false; //for new command
if ((strchr_pointer = strchr(cmdbuffer+bufindw+1, 'N')) != NULL) if ((strchr_pointer = strstr(cmdbuffer+bufindw+1, "PRUSA")) == NULL && (strchr_pointer = strchr(cmdbuffer+bufindw+1, 'N')) != NULL) {
{ if ((strchr_pointer = strchr(cmdbuffer+bufindw+1, 'N')) != NULL)
// Line number met. When sending a G-code over a serial line, each line may be stamped with its index, {
// and Marlin tests, whether the successive lines are stamped with an increasing line number ID. // Line number met. When sending a G-code over a serial line, each line may be stamped with its index,
gcode_N = (strtol(strchr_pointer+1, NULL, 10)); // and Marlin tests, whether the successive lines are stamped with an increasing line number ID.
if(gcode_N != gcode_LastN+1 && (strstr_P(cmdbuffer+bufindw+1, PSTR("M110")) == NULL) ) { gcode_N = (strtol(strchr_pointer+1, NULL, 10));
// M110 - set current line number. if(gcode_N != gcode_LastN+1 && (strstr_P(cmdbuffer+bufindw+1, PSTR("M110")) == NULL) ) {
// Line numbers not sent in succession. // M110 - set current line number.
SERIAL_ERROR_START; // Line numbers not sent in succession.
SERIAL_ERRORRPGM(MSG_ERR_LINE_NO); SERIAL_ERROR_START;
SERIAL_ERRORLN(gcode_LastN); SERIAL_ERRORRPGM(MSG_ERR_LINE_NO);
//Serial.println(gcode_N); SERIAL_ERRORLN(gcode_LastN);
FlushSerialRequestResend(); //Serial.println(gcode_N);
serial_count = 0; FlushSerialRequestResend();
return; serial_count = 0;
} return;
if((strchr_pointer = strchr(cmdbuffer+bufindw+1, '*')) != NULL)
{
byte checksum = 0;
char *p = cmdbuffer+bufindw+1;
while (p != strchr_pointer)
checksum = checksum^(*p++);
if (int(strtol(strchr_pointer+1, NULL, 10)) != int(checksum)) {
SERIAL_ERROR_START;
SERIAL_ERRORRPGM(MSG_ERR_CHECKSUM_MISMATCH);
SERIAL_ERRORLN(gcode_LastN);
FlushSerialRequestResend();
serial_count = 0;
return;
} }
// If no errors, remove the checksum and continue parsing.
*strchr_pointer = 0;
}
else
{
SERIAL_ERROR_START;
SERIAL_ERRORRPGM(MSG_ERR_NO_CHECKSUM);
SERIAL_ERRORLN(gcode_LastN);
FlushSerialRequestResend();
serial_count = 0;
return;
}
gcode_LastN = gcode_N; if((strchr_pointer = strchr(cmdbuffer+bufindw+1, '*')) != NULL)
//if no errors, continue parsing {
} // end of 'N' command byte checksum = 0;
char *p = cmdbuffer+bufindw+1;
while (p != strchr_pointer)
checksum = checksum^(*p++);
if (int(strtol(strchr_pointer+1, NULL, 10)) != int(checksum)) {
SERIAL_ERROR_START;
SERIAL_ERRORRPGM(MSG_ERR_CHECKSUM_MISMATCH);
SERIAL_ERRORLN(gcode_LastN);
FlushSerialRequestResend();
serial_count = 0;
return;
}
// If no errors, remove the checksum and continue parsing.
*strchr_pointer = 0;
}
else
{
SERIAL_ERROR_START;
SERIAL_ERRORRPGM(MSG_ERR_NO_CHECKSUM);
SERIAL_ERRORLN(gcode_LastN);
FlushSerialRequestResend();
serial_count = 0;
return;
}
gcode_LastN = gcode_N;
//if no errors, continue parsing
} // end of 'N' command
}
else // if we don't receive 'N' but still see '*' else // if we don't receive 'N' but still see '*'
{ {
if((strchr(cmdbuffer+bufindw+1, '*') != NULL)) if((strchr(cmdbuffer+bufindw+1, '*') != NULL))