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

Keep a pointer past the line number in cmdqueue 

This allows to skip line numbers transparently and perform faster
checks on the actual command to process.
This commit is contained in:
Yuri D'Elia 2022-12-13 23:33:41 +01:00
parent 5c4ec5dd4f
commit c7865a83f2
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
Firmware/cmdqueue.cpp
View File

@ -366,22 +366,24 @@ void get_command()
comment_mode = false; //for new command comment_mode = false; //for new command
return; return;
} }
cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; //terminate string cmdbuffer[bufindw+serial_count+CMDHDRSIZE] = 0; // terminate string
char* cmd_head = cmdbuffer+bufindw+CMDHDRSIZE; // current command pointer
char* cmd_start = cmd_head; // pointer past the line number (if any)
if(!comment_mode){ if(!comment_mode){
long gcode_N = -1; // seen line number
long gcode_N = -1;
// Line numbers must be first in buffer // Line numbers must be first in buffer
if ((strstr_P(cmdbuffer+bufindw+CMDHDRSIZE, PSTR("PRUSA")) == NULL) && if ((strstr_P(cmdbuffer+bufindw+CMDHDRSIZE, PSTR("PRUSA")) == NULL) &&
(cmdbuffer[bufindw+CMDHDRSIZE] == 'N')) { (*cmd_head == 'N')) {
// Line number met. When sending a G-code over a serial line, each line may be stamped with its index, // Line number met: decode the number, then move cmd_start past all spaces.
// and Marlin tests, whether the successive lines are stamped with an increasing line number ID gcode_N = (strtol(cmd_head+1, &cmd_start, 10));
gcode_N = (strtol(cmdbuffer+bufindw+CMDHDRSIZE+1, NULL, 10)); while (*cmd_start == ' ') ++cmd_start;
if(gcode_N != gcode_LastN+1 && (strstr_P(cmdbuffer+bufindw+CMDHDRSIZE, PSTR("M110")) == NULL) ) {
// M110 - set current line number. // Test whether the successive lines are stamped with an increasing line number ID.
// Line numbers not sent in succession. if(gcode_N != gcode_LastN+1 && strncmp_P(cmd_start, PSTR("M110"), 4)) {
// Line numbers not sent in succession and M110 not seen.
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORRPGM(_n("Line Number is not Last Line Number+1, Last Line: "));////MSG_ERR_LINE_NO SERIAL_ERRORRPGM(_n("Line Number is not Last Line Number+1, Last Line: "));////MSG_ERR_LINE_NO
SERIAL_ERRORLN(gcode_LastN); SERIAL_ERRORLN(gcode_LastN);
@ -391,10 +393,10 @@ void get_command()
return; return;
} }
if((strchr_pointer = strchr(cmdbuffer+bufindw+CMDHDRSIZE, '*')) != NULL) if((strchr_pointer = strchr(cmd_start, '*')) != NULL)
{ {
byte checksum = 0; byte checksum = 0;
char *p = cmdbuffer+bufindw+CMDHDRSIZE; char *p = cmd_head;
while (p != strchr_pointer) while (p != strchr_pointer)
checksum = checksum^(*p++); checksum = checksum^(*p++);
if (code_value_short() != (int16_t)checksum) { if (code_value_short() != (int16_t)checksum) {
@ -422,9 +424,8 @@ void get_command()
cmdbuffer[bufindw + CMDHDRSIZE] = '$'; cmdbuffer[bufindw + CMDHDRSIZE] = '$';
} }
// if we don't receive 'N' but still see '*' // if we don't receive 'N' but still see '*'
if ((cmdbuffer[bufindw + CMDHDRSIZE] != 'N') && (cmdbuffer[bufindw + CMDHDRSIZE] != '$') && (strchr(cmdbuffer+bufindw+CMDHDRSIZE, '*') != NULL)) if ((*cmd_head != 'N') && (cmdbuffer[bufindw + CMDHDRSIZE] != '$') && (strchr(cmd_start, '*') != NULL))
{ {
SERIAL_ERROR_START; SERIAL_ERROR_START;
SERIAL_ERRORRPGM(_n("No Line Number with checksum, Last Line: "));////MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM SERIAL_ERRORRPGM(_n("No Line Number with checksum, Last Line: "));////MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM
SERIAL_ERRORLN(gcode_LastN); SERIAL_ERRORLN(gcode_LastN);
@ -432,15 +433,15 @@ void get_command()
serial_count = 0; serial_count = 0;
return; return;
} }
// Handle KILL early, even when Stopped // Handle KILL early, even when Stopped
if(strcmp(cmdbuffer+bufindw+CMDHDRSIZE, "M112") == 0) if(strcmp_P(cmd_start, PSTR("M112")) == 0)
kill(MSG_M112_KILL, 2); kill(MSG_M112_KILL, 2);
// Handle the USB timer // Handle the USB timer
if ((strchr_pointer = strchr(cmdbuffer+bufindw+CMDHDRSIZE, 'G')) != NULL) { if ((*cmd_start == 'G') && !IS_SD_PRINTING)
if (!IS_SD_PRINTING) { usb_timer.start();
usb_timer.start();
}
}
if (Stopped == true) { if (Stopped == true) {
// Stopped can be set either during error states (thermal error: cannot continue), or // Stopped can be set either during error states (thermal error: cannot continue), or
// when a printer-initiated action is processed. In such case the printer will send to // when a printer-initiated action is processed. In such case the printer will send to