bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

RETRACT_ZLIFT => RETRACT_ZRAISE

Browse Source
This commit is contained in:
Scott Lahteine
2018-10-16 16:46:24 -05:00
parent 056561df93
commit 8bf596bd4c
90 changed files with 95 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/src/feature/fwretract.cpp
View File

@ -65,7 +65,7 @@ void FWRetract::reset() {
#endif
settings.retract_length = RETRACT_LENGTH;
settings.retract_feedrate_mm_s = RETRACT_FEEDRATE;
settings.retract_zlift = RETRACT_ZLIFT;
settings.retract_zraise = RETRACT_ZRAISE;
settings.retract_recover_length = RETRACT_RECOVER_LENGTH;
settings.retract_recover_feedrate_mm_s = RETRACT_RECOVER_FEEDRATE;
settings.swap_retract_length = RETRACT_LENGTH_SWAP;
@ -159,8 +159,8 @@ void FWRetract::retract(const bool retracting
planner.synchronize(); // Wait for move to complete
// Is a Z hop set, and has the hop not yet been done?
if (settings.retract_zlift > 0.01 && !current_hop) { // Apply hop only once
current_hop += settings.retract_zlift; // Add to the hop total (again, only once)
if (settings.retract_zraise > 0.01 && !current_hop) { // Apply hop only once
current_hop += settings.retract_zraise; // Add to the hop total (again, only once)
feedrate_mm_s = planner.settings.max_feedrate_mm_s[Z_AXIS] * unscale_fr; // Maximum Z feedrate
prepare_move_to_destination(); // Raise up, set_current_to_destination
planner.synchronize(); // Wait for move to complete