zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #8197 from thinkyhead/bf2_asterisk_not_special

Browse source 
Allow asterisks in G-Code commands
This commit is contained in:
Scott Lahteine 2017-10-31 21:53:43 -05:00 committed by GitHub
parent 3a81646c9a 0108d5181f
commit 32a9db3e93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Marlin/src/gcode/queue.cpp
View file

@ -230,18 +230,17 @@ inline void get_serial_commands() {
*/ */
if (serial_char == '\n' || serial_char == '\r') { if (serial_char == '\n' || serial_char == '\r') {
serial_comment_mode = false; // end of line == end of comment serial_comment_mode = false; // end of line == end of comment
if (!serial_count) continue; // skip empty lines if (!serial_count) continue; // Skip empty lines
serial_line_buffer[serial_count] = 0; // terminate string serial_line_buffer[serial_count] = 0; // Terminate string
serial_count = 0; //reset buffer serial_count = 0; // Reset buffer
char* command = serial_line_buffer; char* command = serial_line_buffer;
while (*command == ' ') command++; // skip any leading spaces while (*command == ' ') command++; // Skip leading spaces
char *npos = (*command == 'N') ? command : NULL, // Require the N parameter to start the line char *npos = (*command == 'N') ? command : NULL; // Require the N parameter to start the line
*apos = strchr(command, '*');
if (npos) { if (npos) {
@ -259,15 +258,14 @@ inline void get_serial_commands() {
return; return;
} }
char *apos = strrchr(command, '*');
if (apos) { if (apos) {
byte checksum = 0, count = 0; uint8_t checksum = 0, count = uint8_t(apos - command);
while (command[count] != '*') checksum ^= command[count++]; while (count) checksum ^= command[--count];
if (strtol(apos + 1, NULL, 10) != checksum) { if (strtol(apos + 1, NULL, 10) != checksum) {
gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH)); gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH));
return; return;
} }
// if no errors, continue parsing
} }
else { else {
gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM)); gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM));
@ -275,11 +273,6 @@ inline void get_serial_commands() {
} }
gcode_LastN = gcode_N; gcode_LastN = gcode_N;
// if no errors, continue parsing
}
else if (apos) { // No '*' without 'N'
gcode_line_error(PSTR(MSG_ERR_NO_LINENUMBER_WITH_CHECKSUM), false);
return;
} }
// Movement commands alert when stopped // Movement commands alert when stopped