Cancel Objects - As seen at ERRF2019 (#15590)

This commit is contained in:
Scott Lahteine
2019-10-24 15:35:40 -05:00
committed by GitHub
parent f6a799c7b3
commit 93f0012959
104 changed files with 1015 additions and 105 deletions

View File

@@ -42,6 +42,8 @@
#include "../../feature/power_loss_recovery.h"
#endif
#include "../../Marlin.h" // for startOrResumeJob
/**
* M24: Start or Resume SD Print
*/
@@ -54,14 +56,14 @@ void GcodeSuite::M24() {
#if ENABLED(PARK_HEAD_ON_PAUSE)
if (did_pause_print) {
resume_print();
resume_print(); // will call print_job_timer.start()
return;
}
#endif
if (card.isFileOpen()) {
card.startFileprint();
print_job_timer.start();
card.startFileprint(); // SD card will now be read for commands
startOrResumeJob(); // Start (or resume) the print job timer
#if ENABLED(POWER_LOSS_RECOVERY)
recovery.prepare();
#endif