3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-23 12:04:19 +00:00
Code Issues Releases Wiki Activity

🚸 Interruptible PLR (#25395)

Browse Source
This commit is contained in:
Scott Lahteine 2023-02-17 22:12:11 -06:00
parent 838df37efd
commit 94780bbb54
1 changed files with 49 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
Marlin/src/feature/powerloss.cpp
View File

@ -78,6 +78,14 @@ PrintJobRecovery recovery;
#define POWER_LOSS_RETRACT_LEN 0 #define POWER_LOSS_RETRACT_LEN 0
#endif #endif
// Allow power-loss recovery to be aborted
#define PLR_CAN_ABORT
#if ENABLED(PLR_CAN_ABORT)
#define PROCESS_SUBCOMMANDS_NOW(cmd) do { if (card.flag.abort_sd_printing) return; gcode.process_subcommands_now(cmd); }while(0)
#else
#define PROCESS_SUBCOMMANDS_NOW(cmd) gcode.process_subcommands_now(cmd)
#endif
/** /**
* Clear the recovery info * Clear the recovery info
*/ */
@ -352,12 +360,23 @@ void PrintJobRecovery::resume() {
// Apply the dry-run flag if enabled // Apply the dry-run flag if enabled
if (info.flag.dryrun) marlin_debug_flags |= MARLIN_DEBUG_DRYRUN; if (info.flag.dryrun) marlin_debug_flags |= MARLIN_DEBUG_DRYRUN;
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
struct OnExit {
uint8_t old_flags;
OnExit() {
old_flags = marlin_debug_flags;
marlin_debug_flags |= MARLIN_DEBUG_ECHO;
}
~OnExit() { marlin_debug_flags = old_flags; }
} on_exit;
#endif
// Restore cold extrusion permission // Restore cold extrusion permission
TERN_(PREVENT_COLD_EXTRUSION, thermalManager.allow_cold_extrude = info.flag.allow_cold_extrusion); TERN_(PREVENT_COLD_EXTRUSION, thermalManager.allow_cold_extrude = info.flag.allow_cold_extrusion);
#if HAS_LEVELING #if HAS_LEVELING
// Make sure leveling is off before any G92 and G28 // Make sure leveling is off before any G92 and G28
gcode.process_subcommands_now(F("M420 S0 Z0")); PROCESS_SUBCOMMANDS_NOW(F("M420S0"));
#endif #endif
#if HAS_HEATED_BED #if HAS_HEATED_BED
@ -365,7 +384,7 @@ void PrintJobRecovery::resume() {
if (bt) { if (bt) {
// Restore the bed temperature // Restore the bed temperature
sprintf_P(cmd, PSTR("M190S%i"), bt); sprintf_P(cmd, PSTR("M190S%i"), bt);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
#endif #endif
@ -376,10 +395,10 @@ void PrintJobRecovery::resume() {
if (et) { if (et) {
#if HAS_MULTI_HOTEND #if HAS_MULTI_HOTEND
sprintf_P(cmd, PSTR("T%iS"), e); sprintf_P(cmd, PSTR("T%iS"), e);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
sprintf_P(cmd, PSTR("M109S%i"), et); sprintf_P(cmd, PSTR("M109S%i"), et);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
} }
#endif #endif
@ -393,7 +412,7 @@ void PrintJobRecovery::resume() {
// establish the current position as best we can. // establish the current position as best we can.
// //
gcode.process_subcommands_now(F("G92.9E0")); // Reset E to 0 PROCESS_SUBCOMMANDS_NOW(F("G92.9E0")); // Reset E to 0
#if Z_HOME_TO_MAX #if Z_HOME_TO_MAX
@ -404,7 +423,7 @@ void PrintJobRecovery::resume() {
"G28R0\n" // Home all axes (no raise) "G28R0\n" // Home all axes (no raise)
"G1Z%sF1200" // Move Z down to (raised) height "G1Z%sF1200" // Move Z down to (raised) height
), dtostrf(z_now, 1, 3, str_1)); ), dtostrf(z_now, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#elif DISABLED(BELTPRINTER) #elif DISABLED(BELTPRINTER)
@ -417,18 +436,18 @@ void PrintJobRecovery::resume() {
#if !HOMING_Z_DOWN #if !HOMING_Z_DOWN
// Set Z to the real position // Set Z to the real position
sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 3, str_1)); sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
// Does Z need to be raised now? It should be raised before homing XY. // Does Z need to be raised now? It should be raised before homing XY.
if (z_raised > z_now) { if (z_raised > z_now) {
z_now = z_raised; z_now = z_raised;
sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1)); sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
// Home XY with no Z raise // Home XY with no Z raise
gcode.process_subcommands_now(F("G28R0XY")); // No raise during G28 PROCESS_SUBCOMMANDS_NOW(F("G28R0XY")); // No raise during G28
#endif #endif
@ -436,7 +455,7 @@ void PrintJobRecovery::resume() {
// Move to a safe XY position and home Z while avoiding the print. // Move to a safe XY position and home Z while avoiding the print.
const xy_pos_t p = xy_pos_t(POWER_LOSS_ZHOME_POS) TERN_(HOMING_Z_WITH_PROBE, - probe.offset_xy); const xy_pos_t p = xy_pos_t(POWER_LOSS_ZHOME_POS) TERN_(HOMING_Z_WITH_PROBE, - probe.offset_xy);
sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28HZ"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2)); sprintf_P(cmd, PSTR("G1X%sY%sF1000\nG28HZ"), dtostrf(p.x, 1, 3, str_1), dtostrf(p.y, 1, 3, str_2));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
// Mark all axes as having been homed (no effect on current_position) // Mark all axes as having been homed (no effect on current_position)
@ -447,12 +466,12 @@ void PrintJobRecovery::resume() {
// Leveling may already be enabled due to the ENABLE_LEVELING_AFTER_G28 option. // Leveling may already be enabled due to the ENABLE_LEVELING_AFTER_G28 option.
// TODO: Add a G28 parameter to leave leveling disabled. // TODO: Add a G28 parameter to leave leveling disabled.
sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1)); sprintf_P(cmd, PSTR("M420S%cZ%s"), '0' + (char)info.flag.leveling, dtostrf(info.fade, 1, 1, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#if !HOMING_Z_DOWN #if !HOMING_Z_DOWN
// The physical Z was adjusted at power-off so undo the M420S1 correction to Z with G92.9. // The physical Z was adjusted at power-off so undo the M420S1 correction to Z with G92.9.
sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 1, str_1)); sprintf_P(cmd, PSTR("G92.9Z%s"), dtostrf(z_now, 1, 1, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
#endif #endif
@ -460,7 +479,7 @@ void PrintJobRecovery::resume() {
// Z was homed down to the bed, so move up to the raised height. // Z was homed down to the bed, so move up to the raised height.
z_now = z_raised; z_now = z_raised;
sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1)); sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_now, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
// Recover volumetric extrusion state // Recover volumetric extrusion state
@ -468,16 +487,16 @@ void PrintJobRecovery::resume() {
#if HAS_MULTI_EXTRUDER #if HAS_MULTI_EXTRUDER
EXTRUDER_LOOP() { EXTRUDER_LOOP() {
sprintf_P(cmd, PSTR("M200T%iD%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1)); sprintf_P(cmd, PSTR("M200T%iD%s"), e, dtostrf(info.filament_size[e], 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
if (!info.flag.volumetric_enabled) { if (!info.flag.volumetric_enabled) {
sprintf_P(cmd, PSTR("M200T%iD0"), info.active_extruder); sprintf_P(cmd, PSTR("M200T%iD0"), info.active_extruder);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
#else #else
if (info.flag.volumetric_enabled) { if (info.flag.volumetric_enabled) {
sprintf_P(cmd, PSTR("M200D%s"), dtostrf(info.filament_size[0], 1, 3, str_1)); sprintf_P(cmd, PSTR("M200D%s"), dtostrf(info.filament_size[0], 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
#endif #endif
#endif #endif
@ -489,10 +508,10 @@ void PrintJobRecovery::resume() {
if (et) { if (et) {
#if HAS_MULTI_HOTEND #if HAS_MULTI_HOTEND
sprintf_P(cmd, PSTR("T%iS"), e); sprintf_P(cmd, PSTR("T%iS"), e);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
sprintf_P(cmd, PSTR("M109S%i"), et); sprintf_P(cmd, PSTR("M109S%i"), et);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
} }
#endif #endif
@ -500,7 +519,7 @@ void PrintJobRecovery::resume() {
// Restore the previously active tool (with no_move) // Restore the previously active tool (with no_move)
#if HAS_MULTI_EXTRUDER || HAS_MULTI_HOTEND #if HAS_MULTI_EXTRUDER || HAS_MULTI_HOTEND
sprintf_P(cmd, PSTR("T%i S"), info.active_extruder); sprintf_P(cmd, PSTR("T%i S"), info.active_extruder);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
// Restore print cooling fan speeds // Restore print cooling fan speeds
@ -509,7 +528,7 @@ void PrintJobRecovery::resume() {
const int f = info.fan_speed[i]; const int f = info.fan_speed[i];
if (f) { if (f) {
sprintf_P(cmd, PSTR("M106P%iS%i"), i, f); sprintf_P(cmd, PSTR("M106P%iS%i"), i, f);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
} }
} }
#endif #endif
@ -531,17 +550,17 @@ void PrintJobRecovery::resume() {
// Un-retract if there was a retract at outage // Un-retract if there was a retract at outage
#if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0 #if ENABLED(BACKUP_POWER_SUPPLY) && POWER_LOSS_RETRACT_LEN > 0
gcode.process_subcommands_now(F("G1F3000E" STRINGIFY(POWER_LOSS_RETRACT_LEN))); PROCESS_SUBCOMMANDS_NOW(F("G1F3000E" STRINGIFY(POWER_LOSS_RETRACT_LEN)));
#endif #endif
// Additional purge on resume if configured // Additional purge on resume if configured
#if POWER_LOSS_PURGE_LEN #if POWER_LOSS_PURGE_LEN
sprintf_P(cmd, PSTR("G1F3000E%d"), (POWER_LOSS_PURGE_LEN) + (POWER_LOSS_RETRACT_LEN)); sprintf_P(cmd, PSTR("G1F3000E%d"), (POWER_LOSS_PURGE_LEN) + (POWER_LOSS_RETRACT_LEN));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
#endif #endif
#if ENABLED(NOZZLE_CLEAN_FEATURE) #if ENABLED(NOZZLE_CLEAN_FEATURE)
gcode.process_subcommands_now(F("G12")); PROCESS_SUBCOMMANDS_NOW(F("G12"));
#endif #endif
// Move back over to the saved XY // Move back over to the saved XY
@ -549,19 +568,19 @@ void PrintJobRecovery::resume() {
dtostrf(info.current_position.x, 1, 3, str_1), dtostrf(info.current_position.x, 1, 3, str_1),
dtostrf(info.current_position.y, 1, 3, str_2) dtostrf(info.current_position.y, 1, 3, str_2)
); );
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
// Move back down to the saved Z for printing // Move back down to the saved Z for printing
sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_print, 1, 3, str_1)); sprintf_P(cmd, PSTR("G1Z%sF600"), dtostrf(z_print, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
// Restore the feedrate // Restore the feedrate
sprintf_P(cmd, PSTR("G1F%d"), info.feedrate); sprintf_P(cmd, PSTR("G1F%d"), info.feedrate);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
// Restore E position with G92.9 // Restore E position with G92.9
sprintf_P(cmd, PSTR("G92.9E%s"), dtostrf(info.current_position.e, 1, 3, str_1)); sprintf_P(cmd, PSTR("G92.9E%s"), dtostrf(info.current_position.e, 1, 3, str_1));
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
TERN_(GCODE_REPEAT_MARKERS, repeat = info.stored_repeat); TERN_(GCODE_REPEAT_MARKERS, repeat = info.stored_repeat);
TERN_(HAS_HOME_OFFSET, home_offset = info.home_offset); TERN_(HAS_HOME_OFFSET, home_offset = info.home_offset);
@ -573,22 +592,14 @@ void PrintJobRecovery::resume() {
// Relative axis modes // Relative axis modes
gcode.axis_relative = info.axis_relative; gcode.axis_relative = info.axis_relative;
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY)
const uint8_t old_flags = marlin_debug_flags;
marlin_debug_flags |= MARLIN_DEBUG_ECHO;
#endif
// Continue to apply PLR when a file is resumed! // Continue to apply PLR when a file is resumed!
enable(true); enable(true);
// Resume the SD file from the last position // Resume the SD file from the last position
char *fn = info.sd_filename; sprintf_P(cmd, M23_STR, &info.sd_filename[0]);
sprintf_P(cmd, M23_STR, fn); PROCESS_SUBCOMMANDS_NOW(cmd);
gcode.process_subcommands_now(cmd);
sprintf_P(cmd, PSTR("M24S%ldT%ld"), resume_sdpos, info.print_job_elapsed); sprintf_P(cmd, PSTR("M24S%ldT%ld"), resume_sdpos, info.print_job_elapsed);
gcode.process_subcommands_now(cmd); PROCESS_SUBCOMMANDS_NOW(cmd);
TERN_(DEBUG_POWER_LOSS_RECOVERY, marlin_debug_flags = old_flags);
} }
#if ENABLED(DEBUG_POWER_LOSS_RECOVERY) #if ENABLED(DEBUG_POWER_LOSS_RECOVERY)