Browse Source
Power-Loss initialization fix (#13553)
- Only save to PLR file on moves with E and X or Y
- Save to PLR after any long-ish Z downward move
pull/1/head
Scott Lahteine
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
6 additions and
3 deletions
-
Marlin/src/feature/power_loss_recovery.cpp
-
Marlin/src/gcode/gcode.cpp
|
|
|
@ -125,6 +125,9 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*= |
|
|
|
millis_t ms = millis(); |
|
|
|
#endif |
|
|
|
|
|
|
|
// Did Z change since the last call?
|
|
|
|
const float zmoved = current_position[Z_AXIS] - info.current_position[Z_AXIS]; |
|
|
|
|
|
|
|
if (force |
|
|
|
#if DISABLED(SAVE_EACH_CMD_MODE) // Always save state when enabled
|
|
|
|
#if PIN_EXISTS(POWER_LOSS) // Save if power loss pin is triggered
|
|
|
|
@ -133,8 +136,8 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*= |
|
|
|
#if SAVE_INFO_INTERVAL_MS > 0 // Save if interval is elapsed
|
|
|
|
|| ELAPSED(ms, next_save_ms) |
|
|
|
#endif |
|
|
|
// Save every time Z is higher than the last call
|
|
|
|
|| current_position[Z_AXIS] > info.current_position[Z_AXIS] |
|
|
|
|| zmoved > 0 // Z moved up (including Z-hop)
|
|
|
|
|| zmoved < -5 // Z moved down a lot (for some reason)
|
|
|
|
#endif |
|
|
|
) { |
|
|
|
|
|
|
|
|
|
|
|
@ -105,7 +105,7 @@ void GcodeSuite::get_destination_from_command() { |
|
|
|
|
|
|
|
#if ENABLED(POWER_LOSS_RECOVERY) |
|
|
|
// Only update power loss recovery on moves with E
|
|
|
|
if ((seen[E_AXIS] || seen[Z_AXIS]) && IS_SD_PRINTING()) recovery.save(); |
|
|
|
if (seen[E_AXIS] && (seen[X_AXIS] || seen[Y_AXIS]) && IS_SD_PRINTING()) recovery.save(); |
|
|
|
#endif |
|
|
|
|
|
|
|
if (parser.linearval('F') > 0) |
|
|
|
|
