diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-07-30 22:44:51 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2021-07-31 10:02:15 +0300 |
| commit | 81200e40d6f69dd6f6f1d5e218958646c20c2653 (patch) | |
| tree | 7b3b232012bb4d8006376aac2ba5c93ef0cdb715 /src/GCodes/GCodes2.cpp | |
| parent | 3fda1ba333e3ea3df3e50a4630f1d64128ab21c6 (diff) | |
More improvements for SBC mode
Improved performance of the Linux task once again
Added more debug info for spurious "failed to close macro file" messages
Added new timeout when waiting for SPI transfers on SAM5Ex series
Bug fix: Linux task spun longer than anticipated
Bug fix: New cancelling state was broken
Bug fix: File deletion from RRF on SBC wasn't working
Diffstat (limited to 'src/GCodes/GCodes2.cpp')
| -rw-r--r-- | src/GCodes/GCodes2.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index d5dc4af4..6bb56c5a 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -533,10 +533,10 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx // If we are cancelling a paused print with M0 and we are homed and cancel.g exists then run it and do nothing else if (oldPauseState != PauseState::notPaused && code == 0 && AllAxesAreHomed() && DoFileMacro(gb, CANCEL_G, false, SystemHelperMacroCode)) { + pauseState = PauseState::cancelling; break; } - pauseState = PauseState::cancelling; const bool leaveHeatersOn = (gb.Seen('H') && gb.GetIValue() > 0); gb.SetState((leaveHeatersOn) ? GCodeState::stoppingWithHeatersOn : GCodeState::stoppingWithHeatersOff); (void)DoFileMacro(gb, (code == 0) ? STOP_G : SLEEP_G, false, SystemHelperMacroCode); |