diff options
| author | Christian Hammacher <bmasterc@gmail.com> | 2020-11-06 17:28:24 +0300 |
|---|---|---|
| committer | Christian Hammacher <bmasterc@gmail.com> | 2020-11-06 17:28:24 +0300 |
| commit | 342838ade37a020fae9bcec8092cf88fcadacc99 (patch) | |
| tree | 394654f9d10157326be5345b9ba9e0f9dec8ba56 /src/GCodes/GCodeMachineState.h | |
| parent | c79f317c07942ff7a169ea9929c158872b5af3b5 (diff) | |
Improvements for SBC mode
Refactored some SBC-related classes
Prepared some functions for dual operation of SD card with Linux interface
Bug fix: When macros were started, out-of-order replies and stack underruns were sometimes provoked
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index 0c45552b..371f7bc6 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -181,20 +181,19 @@ public: FileData fileState; #endif #if HAS_LINUX_INTERFACE - uint32_t fileId; // virtual file ID to deal with stack push/pops when a file is being cancelled or finished in the wrong stack level + uint8_t fileId; // virtual file ID to deal with stack push/pops when a file is being cancelled or finished in the wrong stack level #endif ResourceBitmap lockedResources; BlockState blockStates[MaxBlockIndent]; uint32_t lineNumber; - uint32_t + uint16_t drivesRelative : 1, axesRelative : 1, #if HAS_LINUX_INTERFACE lastCodeFromSbc : 1, - isMacroFromCode : 1, - isFileFinished : 1, - fileError: 1, + macroStartedByCode : 1, + fileFinished : 1, #endif doingFileMacro : 1, waitWhileCooling : 1, @@ -205,9 +204,6 @@ public: runningSystemMacro : 1, // true if running a system macro file usingInches : 1, // true if units are inches not mm waitingForAcknowledgement : 1, -#if HAS_LINUX_INTERFACE - waitingForAcknowledgementSent : 1, -#endif messageAcknowledged : 1, messageCancelled : 1; |