diff options
| author | David Crocker <dcrocker@eschertech.com> | 2019-08-31 13:05:27 +0300 |
|---|---|---|
| committer | David Crocker <dcrocker@eschertech.com> | 2019-08-31 13:05:27 +0300 |
| commit | 477b701b71194d7eef1c98a11cd04b34dd51bacf (patch) | |
| tree | 2e58ba42b4eded8ffc1e6fe2a1618aedbecf7b3f /src/GCodes/GCodeMachineState.h | |
| parent | 16a395bc6a90e8ba7cfb69cb0ecc6d07f61acdc7 (diff) | |
Combined Linux interface and SD card versions
The standard Duet3_V06 build now supports both the Linux interface and the SD card. The SD card is used if the card can be mounted and config,g or default.g can be run. Otherwise the Linux interface is used.
Diffstat (limited to 'src/GCodes/GCodeMachineState.h')
| -rw-r--r-- | src/GCodes/GCodeMachineState.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/GCodes/GCodeMachineState.h b/src/GCodes/GCodeMachineState.h index bb208e53..3f94605f 100644 --- a/src/GCodes/GCodeMachineState.h +++ b/src/GCodes/GCodeMachineState.h @@ -153,7 +153,8 @@ public: float feedRate; #if HAS_MASS_STORAGE FileData fileState; -#elif HAS_LINUX_INTERFACE +#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 #endif ResourceBitmap lockedResources; @@ -188,15 +189,14 @@ public: static GCodeMachineState *Allocate() post(!result.IsLive(); result.state == GCodeState::normal); -#if HAS_MASS_STORAGE - bool DoingFile() const { return fileState.IsLive(); } -#elif HAS_LINUX_INTERFACE - bool DoingFile() const { return fileId == 0; } + bool DoingFile() const; + void CloseFile(); +#if HAS_LINUX_INTERFACE void SetFileExecuting(); void SetFileFinished(bool error); #endif - void CloseFile(); + bool UsingMachineCoordinates() const { return g53Active || runningSystemMacro; } // Copy values that may have been altered into this state record |