diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2020-09-26 18:56:37 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2020-09-26 18:56:37 +0300 |
| commit | 6c1cd2de6156cc48b6942a00a49afd2eb4bc27da (patch) | |
| tree | e9e9a4c967ad7b4911fc7edd0ca0cc1d88ecdff3 /src/GCodes/GCodeMachineState.cpp | |
| parent | e9d24ce9ffe2c1f664d070502144eecfbf6c94c2 (diff) | |
More improvements for SBC mode
RRF now keeps track of the binary GB states per stack level
Removed "FinishBinaryMode" work-arounds from a few places
Bug fix: When executing config.g the macro mutex is awaited forever in SBC mode
Diffstat (limited to 'src/GCodes/GCodeMachineState.cpp')
| -rw-r--r-- | src/GCodes/GCodeMachineState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp index 2377a0ad..d9c932ea 100644 --- a/src/GCodes/GCodeMachineState.cpp +++ b/src/GCodes/GCodeMachineState.cpp @@ -23,7 +23,7 @@ GCodeMachineState::GCodeMachineState() noexcept lineNumber(0), compatibility(Compatibility::RepRapFirmware), drivesRelative(false), axesRelative(false), #if HAS_LINUX_INTERFACE - isFileFinished(false), fileError(false), + lastCodeFromSbc(false), isMacroFromCode(false), isFileFinished(false), fileError(false), #endif doingFileMacro(false), waitWhileCooling(false), runningM501(false), runningM502(false), volumetricExtrusion(false), g53Active(false), runningSystemMacro(false), usingInches(false), @@ -47,7 +47,7 @@ GCodeMachineState::GCodeMachineState(GCodeMachineState& prev, bool withinSameFil lineNumber((withinSameFile) ? prev.lineNumber : 0), compatibility(prev.compatibility), drivesRelative(prev.drivesRelative), axesRelative(prev.axesRelative), #if HAS_LINUX_INTERFACE - isFileFinished(prev.isFileFinished), fileError(false), + lastCodeFromSbc(prev.lastCodeFromSbc), isMacroFromCode(prev.isMacroFromCode), isFileFinished(prev.isFileFinished), fileError(false), #endif doingFileMacro(prev.doingFileMacro), waitWhileCooling(prev.waitWhileCooling), runningM501(prev.runningM501), runningM502(prev.runningM502), volumetricExtrusion(false), g53Active(false), runningSystemMacro(prev.runningSystemMacro), usingInches(prev.usingInches), |