Browse Source

serial resend request always contains OK

PavelSindler 6 years ago
parent
commit
3aca1271ed
2 changed files with 5 additions and 4 deletions
  1. 4 3
      Firmware/Marlin_main.cpp
  2. 1 1
      Firmware/cmdqueue.cpp

+ 4 - 3
Firmware/Marlin_main.cpp

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

+ 1 - 1
Firmware/cmdqueue.cpp

@@ -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: ");