From 1067c43107a1ec307eb5ae9f7cf6a09e19f145d4 Mon Sep 17 00:00:00 2001
From: Giuliano <3684609+GMagician@users.noreply.github.com>
Date: Sat, 14 Jul 2018 06:13:29 +0200
Subject: [PATCH] [1.1.x] fix kill printer (#11261)
This will fix kill message on dual printer with 0 alignment offset
---
Marlin/Marlin_main.cpp | 30 ++++++++++++++++++------------
1 file changed, 18 insertions(+), 12 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index fd84f745d7..dd2741e88a 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -3132,28 +3132,34 @@ static void homeaxis(const AxisEnum axis) {
#if ENABLED(X_DUAL_ENDSTOPS)
if (axis == X_AXIS) {
const float adj = ABS(endstops.x_endstop_adj);
- if (pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0)) stepper.set_x_lock(true); else stepper.set_x2_lock(true);
- do_homing_move(axis, pos_dir ? -adj : adj);
- stepper.set_x_lock(false);
- stepper.set_x2_lock(false);
+ if (adj) {
+ if (pos_dir ? (endstops.x_endstop_adj > 0) : (endstops.x_endstop_adj < 0)) stepper.set_x_lock(true); else stepper.set_x2_lock(true);
+ do_homing_move(axis, pos_dir ? -adj : adj);
+ stepper.set_x_lock(false);
+ stepper.set_x2_lock(false);
+ }
}
#endif
#if ENABLED(Y_DUAL_ENDSTOPS)
if (axis == Y_AXIS) {
const float adj = ABS(endstops.y_endstop_adj);
- if (pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0)) stepper.set_y_lock(true); else stepper.set_y2_lock(true);
- do_homing_move(axis, pos_dir ? -adj : adj);
- stepper.set_y_lock(false);
- stepper.set_y2_lock(false);
+ if (adj) {
+ if (pos_dir ? (endstops.y_endstop_adj > 0) : (endstops.y_endstop_adj < 0)) stepper.set_y_lock(true); else stepper.set_y2_lock(true);
+ do_homing_move(axis, pos_dir ? -adj : adj);
+ stepper.set_y_lock(false);
+ stepper.set_y2_lock(false);
+ }
}
#endif
#if ENABLED(Z_DUAL_ENDSTOPS)
if (axis == Z_AXIS) {
const float adj = ABS(endstops.z_endstop_adj);
- if (pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0)) stepper.set_z_lock(true); else stepper.set_z2_lock(true);
- do_homing_move(axis, pos_dir ? -adj : adj);
- stepper.set_z_lock(false);
- stepper.set_z2_lock(false);
+ if (adj) {
+ if (pos_dir ? (endstops.z_endstop_adj > 0) : (endstops.z_endstop_adj < 0)) stepper.set_z_lock(true); else stepper.set_z2_lock(true);
+ do_homing_move(axis, pos_dir ? -adj : adj);
+ stepper.set_z_lock(false);
+ stepper.set_z2_lock(false);
+ }
}
#endif
stepper.set_homing_dual_axis(false);