From 94ffb58da7d85f82c6a48917c2cf739f53f5e846 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Tue, 13 Dec 2016 08:23:43 -0800
Subject: [PATCH] Prevent retract un-hop at wrong height
---
Marlin/Marlin_main.cpp | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 8736051c82..b8ac334596 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2741,6 +2741,8 @@ static void homeaxis(AxisEnum axis) {
void retract(bool retracting, bool swapping = false) {
+ static float hop_height;
+
if (retracting == retracted[active_extruder]) return;
float old_feedrate_mm_s = feedrate_mm_s;
@@ -2755,14 +2757,19 @@ static void homeaxis(AxisEnum axis) {
prepare_move_to_destination();
if (retract_zlift > 0.01) {
+ hop_height = current_position[Z_AXIS];
+ // Pretend current position is lower
current_position[Z_AXIS] -= retract_zlift;
SYNC_PLAN_POSITION_KINEMATIC();
+ // Raise up to the old current_position
prepare_move_to_destination();
}
}
else {
- if (retract_zlift > 0.01) {
+ // If the height hasn't been altered, undo the Z hop
+ if (retract_zlift > 0.01 && hop_height == current_position[Z_AXIS]) {
+ // Pretend current position is higher. Z will lower on the next move
current_position[Z_AXIS] += retract_zlift;
SYNC_PLAN_POSITION_KINEMATIC();
}
@@ -2771,6 +2778,8 @@ static void homeaxis(AxisEnum axis) {
float move_e = swapping ? retract_length_swap + retract_recover_length_swap : retract_length + retract_recover_length;
current_position[E_AXIS] -= move_e / volumetric_multiplier[active_extruder];
sync_plan_position_e();
+
+ // Lower Z and recover E
prepare_move_to_destination();
}
--
GitLab