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

Merge pull request #341 from PavelSindler/resend 

Resend always contains OK
This commit is contained in:
PavelSindler 2017-12-22 19:24:00 +01:00 committed by GitHub
parent 6f7a2ba263 7114772784
commit bf6fbdd44d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/Marlin_main.cpp
View File

@ -1703,7 +1703,7 @@ void homeaxis(int axis)
feedrate = homing_feedrate[axis]; feedrate = homing_feedrate[axis];
#ifdef TMC2130 #ifdef TMC2130
tmc2130_home_enter(X_AXIS_MASK << axis); tmc2130_home_enter(X_AXIS_MASK << axis);
#endif #endif
// Move right a bit, so that the print head does not touch the left end position, // Move right a bit, so that the print head does not touch the left end position,
@ -6159,7 +6159,8 @@ void FlushSerialRequestResend()
MYSERIAL.flush(); MYSERIAL.flush();
SERIAL_PROTOCOLRPGM(MSG_RESEND); SERIAL_PROTOCOLRPGM(MSG_RESEND);
SERIAL_PROTOCOLLN(gcode_LastN + 1); SERIAL_PROTOCOLLN(gcode_LastN + 1);
ClearToSend(); previous_millis_cmd = millis();
SERIAL_PROTOCOLLNRPGM(MSG_OK);
} }
// Confirm the execution of a command, if sent from a serial line. // Confirm the execution of a command, if sent from a serial line.