SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Power-Loss initialization fix (#13553)

Browse source 
- Only save to PLR file on moves with E and X or Y
- Save to PLR after any long-ish Z downward move
This commit is contained in:
Scott Lahteine 2019-04-01 17:52:45 -05:00 committed by GitHub
parent 8b7c3eec83
commit a0a5c31c05
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/feature/power_loss_recovery.cpp
View file

@ -125,6 +125,9 @@ void PrintJobRecovery::save(const bool force/*=false*/, const bool save_queue/*=
millis_t ms = millis(); millis_t ms = millis();
#endif #endif
// Did Z change since the last call?
const float zmoved = current_position[Z_AXIS] - info.current_position[Z_AXIS];
if (force if (force
#if DISABLED(SAVE_EACH_CMD_MODE) // Always save state when enabled #if DISABLED(SAVE_EACH_CMD_MODE) // Always save state when enabled
#if PIN_EXISTS(POWER_LOSS) // Save if power loss pin is triggered #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 #if SAVE_INFO_INTERVAL_MS > 0 // Save if interval is elapsed
|| ELAPSED(ms, next_save_ms) || ELAPSED(ms, next_save_ms)
#endif #endif
// Save every time Z is higher than the last call || zmoved > 0 // Z moved up (including Z-hop)
|| current_position[Z_AXIS] > info.current_position[Z_AXIS] || zmoved < -5 // Z moved down a lot (for some reason)
#endif #endif
) { ) {

2
Marlin/src/gcode/gcode.cpp
View file

@ -105,7 +105,7 @@ void GcodeSuite::get_destination_from_command() {
#if ENABLED(POWER_LOSS_RECOVERY) #if ENABLED(POWER_LOSS_RECOVERY)
// Only update power loss recovery on moves with E // 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 #endif
if (parser.linearval('F') > 0) if (parser.linearval('F') > 0)