Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix, Improve Power-Loss Recovery #22828

Merged
merged 13 commits into from
Feb 9, 2022
Merged

Fix, Improve Power-Loss Recovery #22828

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a22cb8f
Home XY and then home Z if needed
moham96 Sep 23, 2021
6fb4a2c
Override Z_SAFE_HOMING with POWER_LOSS_ZHOME_POS
thinkyhead Sep 25, 2021
ebd2107
Add 'M413 C' to test PLR
thinkyhead Sep 25, 2021
01ca409
Update G92.9 calls
thinkyhead Sep 25, 2021
5dbc820
Store a position in the block with sdpos
thinkyhead Sep 25, 2021
fb5a37b
Apply probe offset to POWER_LOSS_ZHOME_POS
thinkyhead Sep 25, 2021
f9f5abf
Save the *logical* position
thinkyhead Sep 25, 2021
ca4852e
better G92.9 E
thinkyhead Sep 25, 2021
e4715fe
include probe.h
thinkyhead Sep 25, 2021
0901fb2
Merge branch 'bugfix-2.0.x' into pr/22828
thinkyhead Jan 25, 2022
a043ec9
merge followup
thinkyhead Jan 25, 2022
995ca16
Merge 'bugfix-2.0.x' into pr/22828
thinkyhead Feb 9, 2022
4139524
Update comment
thinkyhead Feb 9, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions Marlin/src/feature/powerloss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,10 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW

#endif

#endif // POWER_LOSS_PIN

#if PIN_EXISTS(POWER_LOSS) || ENABLED(DEBUG_POWER_LOSS_RECOVERY)

/**
* An outage was detected by a sensor pin.
* - If not SD printing, let the machine turn off on its own with no "KILL" screen
Expand All @@ -273,7 +277,7 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
* - If backup power is available Retract E and Raise Z
* - Go to the KILL screen
*/
void PrintJobRecovery::_outage() {
void PrintJobRecovery::_outage(TERN_(DEBUG_POWER_LOSS_RECOVERY, const bool simulated/*=false*/)) {
#if ENABLED(BACKUP_POWER_SUPPLY)
static bool lock = false;
if (lock) return; // No re-entrance from idle() during retract_and_lift()
Expand Down Expand Up @@ -301,10 +305,16 @@ void PrintJobRecovery::save(const bool force/*=false*/, const float zraise/*=POW
retract_and_lift(zraise);
#endif

kill(GET_TEXT(MSG_OUTAGE_RECOVERY));
if (TERN0(DEBUG_POWER_LOSS_RECOVERY, simulated)) {
card.fileHasFinished();
current_position.reset();
sync_plan_position();
}
else
kill(GET_TEXT(MSG_OUTAGE_RECOVERY));
}

#endif
#endif // POWER_LOSS_PIN || DEBUG_POWER_LOSS_RECOVERY

/**
* Save the recovery info the recovery file
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/feature/powerloss.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ class PrintJobRecovery {
static void retract_and_lift(const_float_t zraise);
#endif

#if PIN_EXISTS(POWER_LOSS)
#if PIN_EXISTS(POWER_LOSS) || ENABLED(DEBUG_POWER_LOSS_RECOVERY)
friend class GcodeSuite;
static void _outage();
static void _outage(TERN_(DEBUG_POWER_LOSS_RECOVERY, const bool simulated=false));
#endif
};

Expand Down
5 changes: 2 additions & 3 deletions Marlin/src/gcode/feature/powerloss/M413.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,9 +48,8 @@ void GcodeSuite::M413() {
if (parser.seen_test('W')) recovery.save(true);
if (parser.seen_test('P')) recovery.purge();
if (parser.seen_test('D')) recovery.debug(PSTR("M413"));
#if PIN_EXISTS(POWER_LOSS)
if (parser.seen_test('O')) recovery._outage();
#endif
if (parser.seen_test('O')) recovery._outage();
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
if (parser.seen_test('C')) recovery.check();
if (parser.seen_test('E')) SERIAL_ECHOPGM_P(recovery.exists() ? PSTR("PLR Exists\n") : PSTR("No PLR\n"));
if (parser.seen_test('V')) SERIAL_ECHOPGM_P(recovery.valid() ? PSTR("Valid\n") : PSTR("Invalid\n"));
#endif
Expand Down