Skip to content

Commit

Permalink
Merge pull request #3789 from jbrazio/feature/m999-s-arg
Browse files Browse the repository at this point in the history
Implements S1 argument in M999
  • Loading branch information
thinkyhead committed May 18, 2016
2 parents 138c5c8 + e6effb8 commit 8aa591c
Showing 1 changed file with 11 additions and 1 deletion.
12 changes: 11 additions & 1 deletion Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -3645,7 +3645,7 @@ inline void gcode_G28() {
#if ENABLED(MECHANICAL_PROBE)
stow_z_probe();
#endif

#ifdef Z_PROBE_END_SCRIPT
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) {
Expand Down Expand Up @@ -6335,10 +6335,20 @@ inline void gcode_M907() {

/**
* M999: Restart after being stopped
*
* Default behaviour is to flush the serial buffer and request
* a resend to the host starting on the last N line received.
*
* Sending "M999 S1" will resume printing without flushing the
* existing command buffer.
*
*/
inline void gcode_M999() {
Running = true;
lcd_reset_alert_level();

if (code_seen('S') && code_value_short() == 1) return;

// gcode_LastN = Stopped_gcode_LastN;
FlushSerialRequestResend();
}
Expand Down

0 comments on commit 8aa591c

Please sign in to comment.