diff options
author | Christian Hammacher <bmasterc@gmail.com> | 2021-07-29 20:04:19 +0300 |
---|---|---|
committer | Christian Hammacher <bmasterc@gmail.com> | 2021-07-29 20:04:19 +0300 |
commit | d7fd1866ffbfbb87229fa89ae2c7add48307cd8a (patch) | |
tree | 571bd76255c3083a50bf198c0871b06bf629c328 /src/GCodes/GCodes2.cpp | |
parent | 448c585f89bb48fcb1b1e728001a0b2f4ca32197 (diff) |
Further improvements
Added support for expression lists (untested in standalone mode)
M23/M32 are invoked again by DSF in SBC mode
Increased SBC task priority
Bug fix: CAN diagnostics output extra NL
Bug fix: M999 P"ERASE" was not working on the Mini5+ series
Diffstat (limited to 'src/GCodes/GCodes2.cpp')
-rw-r--r-- | src/GCodes/GCodes2.cpp | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp index 894630b0..d5dc4af4 100644 --- a/src/GCodes/GCodes2.cpp +++ b/src/GCodes/GCodes2.cpp @@ -831,7 +831,9 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx result = MassStorage::Unmount(card, reply); } break; +#endif +#if HAS_MASS_STORAGE || HAS_LINUX_INTERFACE case 23: // Set file to print case 32: // Select file and start SD print // We now allow a file that is being printed to chain to another file. This is required for the resume-after-power-fail functionality. @@ -849,7 +851,17 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx { String<MaxFilenameLength> filename; gb.GetUnprecedentedString(filename.GetRef()); - if (QueueFileToPrint(filename.c_str(), reply)) + if ( +#if HAS_LINUX_INTERFACE + reprap.UsingLinuxInterface() +# if HAS_MASS_STORAGE + || +# endif +#endif +#if HAS_MASS_STORAGE + QueueFileToPrint(filename.c_str(), reply) +#endif + ) { reprap.GetPrintMonitor().StartingPrint(filename.c_str()); if (gb.LatestMachineState().compatibility == Compatibility::Marlin) |