Standardize active/paused functions

This commit is contained in:
Scott Lahteine
2019-10-02 18:54:20 -05:00
parent 719615a6b6
commit 72d791a736
8 changed files with 34 additions and 19 deletions

View File

@ -381,7 +381,7 @@ bool unload_filament(const float &unload_length, const bool show_lcd/*=false*/,
* - Park the nozzle at the given position
* - Call unload_filament (if a length was specified)
*
* Returns 'true' if pause was completed, 'false' for abort
* Return 'true' if pause was completed, 'false' for abort
*/
uint8_t did_pause_print = 0;
@ -603,7 +603,7 @@ void wait_for_confirmation(const bool is_reload/*=false*/, const int8_t max_beep
/**
* Resume or Start print procedure
*
* - Abort if not paused
* - If not paused, do nothing and return
* - Reset heater idle timers
* - Load filament if specified, but only if:
* - a nozzle timed out, or

View File

@ -98,7 +98,7 @@ class TFilamentMonitor : public FilamentMonitorBase {
// Give the response a chance to update its counter.
static inline void run() {
if (enabled && !filament_ran_out && (IS_SD_PRINTING() || print_job_timer.isRunning()
if (enabled && !filament_ran_out && (printingIsActive()
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|| did_pause_print
#endif