CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto-check followup

Browse Source
This commit is contained in:
Scott Lahteine 2020-12-14 21:06:56 -06:00
parent 7be57ff9f0
commit 5a6fc3e5b7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/sd/M1001.cpp
View File

@ -65,7 +65,7 @@
*/ */
void GcodeSuite::M1001() { void GcodeSuite::M1001() {
// If there's another auto#.g file to run... // If there's another auto#.g file to run...
if (TERN(NO_SD_AUTOSTART, false, !card.autofile_check())) return; if (TERN(NO_SD_AUTOSTART, false, card.autofile_check())) return;
// Purge the recovery file... // Purge the recovery file...
TERN_(POWER_LOSS_RECOVERY, recovery.purge()); TERN_(POWER_LOSS_RECOVERY, recovery.purge());

8
Marlin/src/sd/cardreader.cpp
View File

@ -755,10 +755,10 @@ void CardReader::write_command(char * const buf) {
* - After finishing the previous auto#.g file * - After finishing the previous auto#.g file
* - From the LCD command to begin the auto#.g files * - From the LCD command to begin the auto#.g files
* *
* Return 'true' if there was nothing to do * Return 'true' if an auto file was started
*/ */
bool CardReader::autofile_check() { bool CardReader::autofile_check() {
if (!autofile_index) return true; if (!autofile_index) return false;
if (!isMounted()) if (!isMounted())
mount(); mount();
@ -773,11 +773,11 @@ void CardReader::write_command(char * const buf) {
cdroot(); cdroot();
openAndPrintFile(autoname); openAndPrintFile(autoname);
autofile_index++; autofile_index++;
return false; return true;
} }
} }
autofile_cancel(); autofile_cancel();
return true; return false;
} }
#endif #endif