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

serial resend request always contains OK

This commit is contained in:
PavelSindler 2017-12-22 18:54:55 +01:00
parent 6f7a2ba263
commit 3aca1271ed
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
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,14 +6159,15 @@ 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.
// Execution of a command from a SD card will not be confirmed. // Execution of a command from a SD card will not be confirmed.
void ClearToSend() void ClearToSend()
{ {
previous_millis_cmd = millis(); previous_millis_cmd = millis();
if (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB) if (CMDBUFFER_CURRENT_TYPE == CMDBUFFER_CURRENT_TYPE_USB)
SERIAL_PROTOCOLLNRPGM(MSG_OK); SERIAL_PROTOCOLLNRPGM(MSG_OK);
} }

2
Firmware/cmdqueue.cpp
View File

@ -480,7 +480,7 @@ void get_command()
kill("", 2); kill("", 2);
// Store the current line into buffer, move to the next line. // 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 #ifdef CMDBUFFER_DEBUG
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOPGM("Storing a command line to buffer: "); SERIAL_ECHOPGM("Storing a command line to buffer: ");