diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2019-07-21 00:19:39 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2019-07-21 00:19:39 +0300 |
| commit | bd09eee4ed60955db72f3a28dcbb758d3f26ded5 (patch) | |
| tree | d410684917916ab6c3873bb737e0594a4900095e /src/GCodes/GCodeMachineState.cpp | |
| parent | 082e47e3da0c3c748474878f425366b4a14713ef (diff) | |
More improvements
Improved GCodeBuffer backend
Moved compatibility setting to machine state
Cleaned up some of the Linux buffering code
Bug fix: Output of M111 was reported in multiple chunks and could not be seen via DWS
Bug fix: Unsupported codes were not reported as such
Diffstat (limited to 'src/GCodes/GCodeMachineState.cpp')
| -rw-r--r-- | src/GCodes/GCodeMachineState.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/GCodes/GCodeMachineState.cpp b/src/GCodes/GCodeMachineState.cpp index 019d738a..59523f5d 100644 --- a/src/GCodes/GCodeMachineState.cpp +++ b/src/GCodes/GCodeMachineState.cpp @@ -18,15 +18,14 @@ static unsigned int LastFileId = 1; // Create a default initialised GCodeMachineState GCodeMachineState::GCodeMachineState() - : previous(nullptr), feedRate(DefaultFeedRate * SecondsToMinutes), lockedResources(0), errorMessage(nullptr), lineNumber(0), - drivesRelative(false), axesRelative(false), doingFileMacro(false), runningM501(false), runningM502(false), - volumetricExtrusion(false), g53Active(false), runningSystemMacro(false), usingInches(false), - waitingForAcknowledgement(false), messageAcknowledged(false), - indentLevel(0), state(GCodeState::normal) + : previous(nullptr), feedRate(DefaultFeedRate * SecondsToMinutes), lockedResources(0), errorMessage(nullptr), + lineNumber(0), drivesRelative(false), axesRelative(false), doingFileMacro(false), runningM501(false), + runningM502(false), volumetricExtrusion(false), g53Active(false), runningSystemMacro(false), usingInches(false), + waitingForAcknowledgement(false), messageAcknowledged(false), indentLevel(0), state(GCodeState::normal) { #if HAS_LINUX_INTERFACE fileId = 0; - isFileFinished = false; + isFileFinished = fileError = false; #endif } @@ -35,13 +34,14 @@ GCodeMachineState::GCodeMachineState() void GCodeMachineState::SetFileExecuting() { fileId = LastFileId++; - isFileFinished = false; + isFileFinished = fileError = false; } // Mark the currently executing file as finished -void GCodeMachineState::SetFileFinished() +void GCodeMachineState::SetFileFinished(bool error) { isFileFinished = true; + fileError = error; } #endif |