diff --git a/Marlin/src/feature/pause.cpp b/Marlin/src/feature/pause.cpp index bbdceb3bb9ab3e2706696ec64682de4feeb581ab..b26babf730996327d7965ae56d1e85b8b5ff66c0 100644 --- a/Marlin/src/feature/pause.cpp +++ b/Marlin/src/feature/pause.cpp @@ -357,11 +357,12 @@ bool pause_print(const float &retract, const point_t &park_point, const float &u // Pause the print job and timer #if ENABLED(SDSUPPORT) - if (card.sdprinting) { + if (IS_SD_PRINTING()) { card.pauseSDPrint(); ++did_pause_print; // Indicate SD pause also } #endif + print_job_timer.pause(); // Save current position diff --git a/Marlin/src/gcode/queue.cpp b/Marlin/src/gcode/queue.cpp index b72af75e5adfc0954f8b74ec6ff8bf2ca86ce444..57d26dec784b34b57ab034e800da2c434fbeb7a1 100644 --- a/Marlin/src/gcode/queue.cpp +++ b/Marlin/src/gcode/queue.cpp @@ -749,7 +749,7 @@ inline void get_serial_commands() { card.printingHasFinished(); - if (card.sdprinting) + if (IS_SD_PRINTING()) sd_count = 0; // If a sub-file was printing, continue from call point else { SERIAL_PROTOCOLLNPGM(MSG_FILE_PRINTED); @@ -888,7 +888,7 @@ void advance_command_queue() { else { gcode.process_next_command(); #if ENABLED(POWER_LOSS_RECOVERY) - if (card.cardOK && card.sdprinting) save_job_recovery_info(); + if (card.cardOK && IS_SD_PRINTING()) save_job_recovery_info(); #endif } diff --git a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp index d1e7ac5a56657282f9ed33370e400c921cf4986c..a8de7f44b7df9ffec02e42e2b1defd93f0cc1ead 100644 --- a/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp +++ b/Marlin/src/gcode/sdcard/M20-M30_M32-M34_M524_M928.cpp @@ -226,7 +226,7 @@ void GcodeSuite::M30() { * */ void GcodeSuite::M32() { - if (card.sdprinting) planner.synchronize(); + if (IS_SD_PRINTING()) planner.synchronize(); if (card.cardOK) { const bool call_procedure = parser.boolval('P'); diff --git a/Marlin/src/lcd/extensible_ui/ui_api.cpp b/Marlin/src/lcd/extensible_ui/ui_api.cpp index a93b226faf6fa6ac8d72a9eb98d0b3a5b31f7856..8d329642c0a87084a7f9861b3105b0f073c7a2aa 100644 --- a/Marlin/src/lcd/extensible_ui/ui_api.cpp +++ b/Marlin/src/lcd/extensible_ui/ui_api.cpp @@ -570,7 +570,7 @@ namespace UI { } bool isPrintingFromMediaPaused() { - return IFSD(isPrintingFromMedia() && !card.sdprinting, false); + return IFSD(isPrintingFromMedia() && !IS_SD_PRINTING(), false); } bool isPrintingFromMedia() { @@ -728,7 +728,7 @@ void lcd_reset_status() { if (print_job_timer.isPaused()) msg = paused; #if ENABLED(SDSUPPORT) - else if (card.sdprinting) + else if (IS_SD_PRINTING()) return lcd_setstatus(card.longest_filename(), true); #endif else if (print_job_timer.isRunning()) diff --git a/Marlin/src/lcd/malyanlcd.cpp b/Marlin/src/lcd/malyanlcd.cpp index 24c633536d50c6832bbc5a38a40ba90be7b7583b..1e90cea24a7bb78aeb1e6c7bfb62b6b9860e529a 100644 --- a/Marlin/src/lcd/malyanlcd.cpp +++ b/Marlin/src/lcd/malyanlcd.cpp @@ -444,13 +444,13 @@ void lcd_update() { // If there was a print in progress, we need to emit the final // print status as {TQ:100}. Reset last percent done so a new print will // issue a percent of 0. - const uint8_t percent_done = card.sdprinting ? card.percentDone() : last_printing_status ? 100 : 0; + const uint8_t percent_done = IS_SD_PRINTING() ? card.percentDone() : last_printing_status ? 100 : 0; if (percent_done != last_percent_done) { char message_buffer[10]; sprintf_P(message_buffer, PSTR("{TQ:%03i}"), percent_done); write_to_lcd(message_buffer); last_percent_done = percent_done; - last_printing_status = card.sdprinting; + last_printing_status = IS_SD_PRINTING(); } #endif } diff --git a/Marlin/src/lcd/menu/menu_main.cpp b/Marlin/src/lcd/menu/menu_main.cpp index 2d227b34f0fa1d62ac35cfefb31e9a9fb59c302a..ae661a3b5422341fbe24e329599a1ce033b08aad 100644 --- a/Marlin/src/lcd/menu/menu_main.cpp +++ b/Marlin/src/lcd/menu/menu_main.cpp @@ -88,7 +88,7 @@ void menu_main() { #if ENABLED(SDSUPPORT) if (card.cardOK) { if (card.isFileOpen()) { - if (card.sdprinting) + if (IS_SD_PRINTING()) MENU_ITEM(function, MSG_PAUSE_PRINT, lcd_sdcard_pause); else MENU_ITEM(function, MSG_RESUME_PRINT, lcd_sdcard_resume); diff --git a/Marlin/src/lcd/ultralcd.cpp b/Marlin/src/lcd/ultralcd.cpp index f0e5b88f84ed223d940c2933e5c3e139928dab4d..572e55ff9a54dae06333a925dc57ff5a8426302f 100644 --- a/Marlin/src/lcd/ultralcd.cpp +++ b/Marlin/src/lcd/ultralcd.cpp @@ -432,7 +432,7 @@ void lcd_reset_status() { if (print_job_timer.isPaused()) msg = paused; #if ENABLED(SDSUPPORT) - else if (card.sdprinting) + else if (IS_SD_PRINTING()) return lcd_setstatus(card.longest_filename(), true); #endif else if (print_job_timer.isRunning())