Merge pull request #8197 from thinkyhead/bf2_asterisk_not_special

Allow asterisks in G-Code commands

Marlin/src/gcode/queue.cpp

@@ -232,16 +232,15 @@ inline void get_serial_commands() {
 
       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;
 
-      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) {
 
@@ -259,15 +258,14 @@ inline void get_serial_commands() {
           return;
         }
 
+        char *apos = strrchr(command, '*');
         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) {
             gcode_line_error(PSTR(MSG_ERR_CHECKSUM_MISMATCH));
             return;
           }
-          // if no errors, continue parsing
         }
         else {
           gcode_line_error(PSTR(MSG_ERR_NO_CHECKSUM));
@@ -275,11 +273,6 @@ inline void get_serial_commands() {
         }
 
         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