From d6c36f5bb929eb4d5c95aa5f5b2ff4c87a7a314f Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Wed, 2 Nov 2016 21:36:50 -0500
Subject: [PATCH] Fix Z raise with DXC_AUTO_PARK_MODE
---
Marlin/Marlin_main.cpp | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index a14dab7c33..219ab0d7e3 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -7305,6 +7305,16 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
current_position[X_AXIS] = LOGICAL_X_POSITION(inactive_extruder_x_pos);
inactive_extruder_x_pos = RAW_X_POSITION(destination[X_AXIS]);
break;
+ case DXC_AUTO_PARK_MODE:
+ // record raised toolhead position for use by unpark
+ memcpy(raised_parked_position, current_position, sizeof(raised_parked_position));
+ raised_parked_position[Z_AXIS] += TOOLCHANGE_UNPARK_ZLIFT;
+ #if ENABLED(max_software_endstops)
+ NOMORE(raised_parked_position[Z_AXIS], soft_endstop_max[Z_AXIS]);
+ #endif
+ active_extruder_parked = true;
+ delayed_move_time = 0;
+ break;
case DXC_DUPLICATION_MODE:
active_extruder_parked = (active_extruder == 0); // this triggers the second extruder to move into the duplication position
if (active_extruder_parked)
@@ -7314,13 +7324,6 @@ void tool_change(const uint8_t tmp_extruder, const float fr_mm_s/*=0.0*/, bool n
inactive_extruder_x_pos = RAW_X_POSITION(destination[X_AXIS]);
extruder_duplication_enabled = false;
break;
- default:
- // record raised toolhead position for use by unpark
- memcpy(raised_parked_position, current_position, sizeof(raised_parked_position));
- raised_parked_position[Z_AXIS] += TOOLCHANGE_UNPARK_ZLIFT;
- active_extruder_parked = true;
- delayed_move_time = 0;
- break;
}
#if ENABLED(DEBUG_LEVELING_FEATURE)
--
GitLab