From 0cb0df6bee75ae201c912364fcea8d838a9f3807 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 10 Oct 2020 12:17:07 -0500 Subject: [PATCH] Update G34_M422.cpp --- Marlin/src/gcode/calibrate/G34_M422.cpp | 17 +++-------------- 1 file changed, 3 insertions(+), 14 deletions(-) diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp index 8e501326b6..250a0eb1b0 100644 --- a/Marlin/src/gcode/calibrate/G34_M422.cpp +++ b/Marlin/src/gcode/calibrate/G34_M422.cpp @@ -534,21 +534,10 @@ void GcodeSuite::M422() { do_blocking_move_to(safe_pos, MMM_TO_MMS(GANTRY_CALIBRATION_XY_PARK_FEEDRATE)); #endif + constexpr float dir = (GANTRY_CALIBRATION_DIRECTION == 1) ? -1 : 1; const float move_distance = parser.intval('Z', GANTRY_CALIBRATION_EXTRA_HEIGHT), - zpounce = ( - #if GANTRY_CALIBRATION_DIRECTION == 1 - (Z_MAX_POS) - move_distance - #else - (Z_MIN_POS) + move_distance - #endif - ), - zgrind = ( - #if GANTRY_CALIBRATION_DIRECTION == 1 - (Z_MAX_POS) + move_distance - #else - (Z_MIN_POS) - move_distance - #endif - ); + zpounce = (Z_MIN_POS) + (dir * move_distance), + zgrind = (Z_MAX_POS) - (dir * move_distance); // Move Z to pounce position if (DEBUGGING(LEVELING)) DEBUG_ECHOLNPGM("Setting Z Pounce");