Skip to content

Commit

Permalink
fixed merge resolve issue
Browse files Browse the repository at this point in the history
  • Loading branch information
scottmudge committed Mar 6, 2023
1 parent 8dad4a5 commit d485a05
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions Firmware/cmdqueue.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -415,9 +415,8 @@ void get_command()
checksum = checksum^(*p++);
if (code_value_short() != (int16_t)checksum) {
SERIAL_ERROR_START;
SERIAL_ERRORRPGM(_n("Line Number is not Last Line Number+1, Last Line: "));////MSG_ERR_LINE_NO
SERIAL_ERRORRPGM(_n("checksum mismatch, Last Line: "));////MSG_ERR_CHECKSUM_MISMATCH
SERIAL_ERRORLN(gcode_LastN);
//Serial.println(gcode_N);
FlushSerialRequestResend();
serial_count = 0;
return;
Expand Down

0 comments on commit d485a05

Please sign in to comment.