diff options
| author | David Crocker <dcrocker@eschertech.com> | 2020-10-26 12:51:26 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2020-10-26 12:51:26 +0300 |
| commit | 4aa0d32ed3d173588e1b700ff253e1959461bf00 (patch) | |
| tree | e613297abf98593d219ca5b3fe337ef8bb66cf03 /src/GCodes/GCodeMachineState.cpp | |
| parent | af1cc41faf492fedd93cf00c2159cb358108c52a (diff) | |
Implemented filament-error macro files
Diffstat (limited to 'src/GCodes/GCodeMachineState.cpp')
| -rw-r--r-- | src/GCodes/GCodeMachineState.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp index bd73bbfc..bcf4eb18 100644 --- a/src/GCodes/GCodeMachineState.cpp +++ b/src/GCodes/GCodeMachineState.cpp @@ -21,13 +21,14 @@ GCodeMachineState::GCodeMachineState() noexcept fileId(0), #endif lineNumber(0), - compatibility(Compatibility::RepRapFirmware), drivesRelative(false), axesRelative(false), + drivesRelative(false), axesRelative(false), #if HAS_LINUX_INTERFACE 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), - waitingForAcknowledgement(false), messageAcknowledged(false), blockNesting(0), + waitingForAcknowledgement(false), messageAcknowledged(false), + compatibility(Compatibility::RepRapFirmware), blockNesting(0), previous(nullptr), errorMessage(nullptr), state(GCodeState::normal), stateMachineResult(GCodeResult::ok) { @@ -45,13 +46,14 @@ GCodeMachineState::GCodeMachineState(GCodeMachineState& prev, bool withinSameFil #endif lockedResources(prev.lockedResources), lineNumber((withinSameFile) ? prev.lineNumber : 0), - compatibility(prev.compatibility), drivesRelative(prev.drivesRelative), axesRelative(prev.axesRelative), + drivesRelative(prev.drivesRelative), axesRelative(prev.axesRelative), #if HAS_LINUX_INTERFACE 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), - waitingForAcknowledgement(false), messageAcknowledged(false), blockNesting((withinSameFile) ? prev.blockNesting : 0), + waitingForAcknowledgement(false), messageAcknowledged(false), + compatibility(prev.compatibility), blockNesting((withinSameFile) ? prev.blockNesting : 0), previous(&prev), errorMessage(nullptr), state(GCodeState::normal), stateMachineResult(GCodeResult::ok) { |