thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Cancel Objects - As seen at ERRF2019 (#15590)

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

17
Marlin/src/Marlin.cpp
View File

@@ -342,18 +342,31 @@ void disable_all_steppers() {
#endif
#if ENABLED(ADVANCED_PAUSE_FEATURE)
#include "feature/pause.h"
#else
constexpr bool did_pause_print = false;
#endif
/**
* Printing is active when the print job timer is running
*/
bool printingIsActive() {
return print_job_timer.isRunning() || IS_SD_PRINTING();
return !did_pause_print && (print_job_timer.isRunning() || IS_SD_PRINTING());
}
/**
* Printing is paused according to SD or host indicators
*/
bool printingIsPaused() {
return print_job_timer.isPaused() || IS_SD_PAUSED();
return did_pause_print || print_job_timer.isPaused() || IS_SD_PAUSED();
}
void startOrResumeJob() {
#if ENABLED(CANCEL_OBJECTS)
if (!printingIsPaused()) cancelable.reset();
#endif
print_job_timer.start();
}
/**