From 053fb55af60a3b9bec7d2e65740e666e42917d42 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Mon, 7 Nov 2016 00:18:44 -0600
Subject: [PATCH] Fix modes ordering in prepare_move_to_destination_dualx
---
Marlin/Marlin_main.cpp | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 1599c7ba5b..da69727f1a 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -9223,23 +9223,6 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
switch (dual_x_carriage_mode) {
case DXC_FULL_CONTROL_MODE:
break;
- case DXC_DUPLICATION_MODE:
- if (active_extruder == 0) {
- // move duplicate extruder into correct duplication position.
- planner.set_position_mm(
- LOGICAL_X_POSITION(inactive_extruder_x_pos),
- current_position[Y_AXIS],
- current_position[Z_AXIS],
- current_position[E_AXIS]
- );
- planner.buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset,
- current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[X_AXIS], 1);
- SYNC_PLAN_POSITION_KINEMATIC();
- stepper.synchronize();
- extruder_duplication_enabled = true;
- active_extruder_parked = false;
- }
- break;
case DXC_AUTO_PARK_MODE:
if (current_position[E_AXIS] == destination[E_AXIS]) {
// This is a travel move (with no extrusion)
@@ -9259,6 +9242,23 @@ void set_current_from_steppers_for_axis(const AxisEnum axis) {
planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[Z_AXIS], active_extruder);
active_extruder_parked = false;
break;
+ case DXC_DUPLICATION_MODE:
+ if (active_extruder == 0) {
+ // move duplicate extruder into correct duplication position.
+ planner.set_position_mm(
+ LOGICAL_X_POSITION(inactive_extruder_x_pos),
+ current_position[Y_AXIS],
+ current_position[Z_AXIS],
+ current_position[E_AXIS]
+ );
+ planner.buffer_line(current_position[X_AXIS] + duplicate_extruder_x_offset,
+ current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], planner.max_feedrate_mm_s[X_AXIS], 1);
+ SYNC_PLAN_POSITION_KINEMATIC();
+ stepper.synchronize();
+ extruder_duplication_enabled = true;
+ active_extruder_parked = false;
+ }
+ break;
}
}
return true;
--
GitLab