diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2021-08-23 18:00:25 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2021-08-23 18:00:25 +0300 |
| commit | 59d8d5b76922cf2dc3ed20ba90034dc1a312070a (patch) | |
| tree | 58b4f5e32d40fcefd2c374ae0c57243177606de9 /src/GCodes/GCodes.cpp | |
| parent | 0f9331e76c5c4ed1ce49394c5bd741a00c46f359 (diff) | |
Work towards v3.4-b3
M955 outputs the configuration only if requested
Minor refactoring in the Linux interface files
Bug fix: M918 didn't update the boards seq number
Bug fix: RRF could leave "starting" mode too early
Diffstat (limited to 'src/GCodes/GCodes.cpp')
| -rw-r--r-- | src/GCodes/GCodes.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp index 3f2c0654..9a0c9c0b 100644 --- a/src/GCodes/GCodes.cpp +++ b/src/GCodes/GCodes.cpp @@ -389,7 +389,7 @@ bool GCodes::IsTriggerBusy() const noexcept // Copy the feed rate etc. from the channel that was running config.g to the input channels void GCodes::CheckFinishedRunningConfigFile(GCodeBuffer& gb) noexcept { - if (runningConfigFile) + if (runningConfigFile && gb.GetChannel() == GCodeChannel::Trigger) { gb.LatestMachineState().GetPrevious()->CopyStateFrom(gb.LatestMachineState()); // so that M83 etc. in nested file don't get forgotten if (gb.LatestMachineState().GetPrevious()->GetPrevious() == nullptr) @@ -480,9 +480,9 @@ void GCodes::Spin() noexcept #if HAS_LINUX_INTERFACE // Need to check if the print has been stopped by the SBC - if (reprap.UsingLinuxInterface() && reprap.GetLinuxInterface().HasPrintStopped()) + if (reprap.UsingLinuxInterface() && reprap.GetLinuxInterface().IsPrintAborted()) { - StopPrint(reprap.GetLinuxInterface().GetPrintStopReason()); + StopPrint(StopPrintReason::abort); } #endif |