diff options
author | David Crocker <dcrocker@eschertech.com> | 2019-07-02 00:50:12 +0300 |
---|---|---|
committer | David Crocker <dcrocker@eschertech.com> | 2019-07-02 00:50:12 +0300 |
commit | c6e580f7b3fa94e9707a225af50922c8daa8a6cf (patch) | |
tree | be06ac0a62fbc3c45aeb8137e86c6b7baee4fc69 /src/GCodes/GCodeMachineState.cpp | |
parent | e14f84e930073bd33d6ecc2ebdad9c3147ed6e18 (diff) |
Consolidation after merge
Reverted some changes to Linux/MessageFormats.h and Linux/BinaryParser.cpp for compatibility with the existing SDF release
Added HAS_MASS_STORAGE definition
Removed lots of mass storage code when HAS_MASS_STORAGE is false
Removed non-RTOS code
Moved SPI channel usage definitions into CoreNG
Added some new CAN message formats (not used by this project yet)
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 f638e59c..019d738a 100644 --- a/src/GCodes/GCodeMachineState.cpp +++ b/src/GCodes/GCodeMachineState.cpp @@ -48,7 +48,7 @@ void GCodeMachineState::SetFileFinished() // Close the currently executing file void GCodeMachineState::CloseFile() { -#if HAS_HIGH_SPEED_SD +#if HAS_MASS_STORAGE fileState.Close(); #elif HAS_LINUX_INTERFACE for (GCodeMachineState *ms = this; ms != nullptr; ms = ms->previous) @@ -83,7 +83,7 @@ void GCodeMachineState::CloseFile() /*static*/ void GCodeMachineState::Release(GCodeMachineState *ms) { -#if HAS_HIGH_SPEED_SD +#if HAS_MASS_STORAGE ms->fileState.Close(); #elif HAS_LINUX_INTERFACE ms->fileId = 0; |