3DPrinting/Prusa-Firmware
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #341 from PavelSindler/resend

Browse source 
Resend always contains OK
This commit is contained in:
PavelSindler 2017-12-22 19:24:00 +01:00 committed by GitHub
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];
#ifdef TMC2130
tmc2130_home_enter(X_AXIS_MASK << axis);
tmc2130_home_enter(X_AXIS_MASK << axis);
#endif
// Move right a bit, so that the print head does not touch the left end position,
@ -6159,7 +6159,8 @@ void FlushSerialRequestResend()
MYSERIAL.flush();
SERIAL_PROTOCOLRPGM(MSG_RESEND);
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.

2
Firmware/cmdqueue.cpp
View file

@ -480,7 +480,7 @@ void get_command()
kill("", 2);
// Store the current line into buffer, move to the next line.
cmdbuffer[bufindw] = CMDBUFFER_CURRENT_TYPE_USB;
cmdbuffer[bufindw] = CMDBUFFER_CURRENT_TYPE_USB;
#ifdef CMDBUFFER_DEBUG
SERIAL_ECHO_START;
SERIAL_ECHOPGM("Storing a command line to buffer: ");