Skip to content

Safe Z homing for Power Loss Recovery #16909

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

Merged
thinkyhead merged 17 commits into from
Mar 1, 2021
Merged

Safe Z homing for Power Loss Recovery #16909

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
4caf671
Add switch to restore lost Z-axis position during power loss recovery
SwiftNick Feb 20, 2020
4a256cb
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_plr_upd…
thinkyhead Apr 20, 2020
80f96df
Fixup
thinkyhead Apr 25, 2020
a83e5d9
Update powerloss.cpp
thinkyhead Apr 25, 2020
632641a
Update powerloss.cpp
thinkyhead Apr 25, 2020
8fc4e3f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_plr_upd…
thinkyhead Apr 25, 2020
e1a8dfb
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into bf2_plr_upd…
thinkyhead Apr 25, 2020
c547f87
After home XY, Restore Z above print
SwiftNick Jun 6, 2020
104d938
Add settings for power loss Z home safe position
SwiftNick Jun 7, 2020
f1be6af
Move to safe Z Home position on power loss recovery
SwiftNick Jun 7, 2020
d1adcb6
Added test for POWER_LOSS_ZHOME
SwiftNick Jun 7, 2020
30e1a7f
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/16909
thinkyhead Nov 30, 2020
2282adf
Followup to merge
thinkyhead Nov 30, 2020
57b24ff
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/16909
thinkyhead Mar 1, 2021
9a4c58d
sanity check for POWER_LOSS_ZHOME_POS
thinkyhead Mar 1, 2021
22d9645
test
thinkyhead Mar 1, 2021
9c5585e
Fix compile warning
thinkyhead Mar 1, 2021
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
1 change: 1 addition & 0 deletions Marlin/Configuration_adv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1089,6 +1089,7 @@
#if ENABLED(POWER_LOSS_RECOVERY)
#define PLR_ENABLED_DEFAULT false // Power Loss Recovery enabled by default. (Set with 'M413 Sn' & M500)
//#define BACKUP_POWER_SUPPLY // Backup power / UPS to move the steppers on power loss
//#define POWER_LOSS_ZHOME // Home Z-Axis during recovery
//#define POWER_LOSS_ZRAISE 2 // (mm) Z axis raise on resume (on power loss with UPS)
//#define POWER_LOSS_PIN 44 // Pin to detect power loss. Set to -1 to disable default pin on boards without module.
//#define POWER_LOSS_STATE HIGH // State of pin indicating power loss
Expand Down
18 changes: 9 additions & 9 deletions Marlin/src/feature/powerloss.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@ void PrintJobRecovery::resume() {
"G28R0"
#if ENABLED(MARLIN_DEV_MODE)
"S"
#elif !IS_KINEMATIC
#elif NONE(IS_KINEMATIC, POWER_LOSS_ZHOME)
"XY"
#endif
#endif
Expand Down Expand Up @@ -407,23 +407,23 @@ void PrintJobRecovery::resume() {
gcode.process_subcommands_now(cmd);
#endif

// Move back to the saved XY
sprintf_P(cmd, PSTR("G1 X%s Y%s F3000"),
dtostrf(info.current_position.x, 1, 3, str_1),
dtostrf(info.current_position.y, 1, 3, str_2)
);
gcode.process_subcommands_now(cmd);

// Move back to the saved Z
dtostrf(info.current_position.z, 1, 3, str_1);
#if Z_HOME_DIR > 0
#if Z_HOME_DIR > 0 || ENABLED(POWER_LOSS_ZHOME)
sprintf_P(cmd, PSTR("G1 Z%s F200"), str_1);
#else
gcode.process_subcommands_now_P(PSTR("G1 Z0 F200"));
sprintf_P(cmd, PSTR("G92.9 Z%s"), str_1);
#endif
gcode.process_subcommands_now(cmd);

// Move back to the saved XY
sprintf_P(cmd, PSTR("G1 X%s Y%s F3000"),
dtostrf(info.current_position.x, 1, 3, str_1),
dtostrf(info.current_position.y, 1, 3, str_2)
);
gcode.process_subcommands_now(cmd);

Copy link
Member

@thinkyhead thinkyhead Apr 25, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is a bad idea. You don't want to do a sideways move when Z is at the lower height. Power Loss Recovery currently does the sideways move before lowering the Z axis in order to avoid knocking over the model.

Copy link
Contributor Author

@SwiftNick SwiftNick Jun 6, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I had swapped the Z and XY resume moves, but a better option would be to restore Z above the print before moving back to resume printing.

// Un-retract
#if POWER_LOSS_PURGE_LEN
//sprintf_P(cmd, PSTR("G1 E%d F3000"), POWER_LOSS_PURGE_LEN);
Expand Down