From 27cc75b95cb6677a20b2604f9207501494a6f8e7 Mon Sep 17 00:00:00 2001 From: InsanityAutomation Date: Sun, 8 Nov 2020 17:50:46 -0500 Subject: [PATCH] Tweaks --- Marlin/src/gcode/calibrate/G28.cpp | 2 +- Marlin/src/gcode/calibrate/G34_M422.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Marlin/src/gcode/calibrate/G28.cpp b/Marlin/src/gcode/calibrate/G28.cpp index 42f8b3272a..b81c46558f 100644 --- a/Marlin/src/gcode/calibrate/G28.cpp +++ b/Marlin/src/gcode/calibrate/G28.cpp @@ -376,7 +376,7 @@ void GcodeSuite::G28() { #if Z_HOME_DIR < 0 if (doZ) { - #if ENABLED(Z_STEPPER_AUTO_ALIGN) + #if EITHER(Z_MULTI_ENDSTOPS, Z_STEPPER_AUTO_ALIGN) stepper.set_all_z_lock(false); stepper.set_separate_multi_axis(false); #endif diff --git a/Marlin/src/gcode/calibrate/G34_M422.cpp b/Marlin/src/gcode/calibrate/G34_M422.cpp index 61ae7c7c17..67ebed398f 100644 --- a/Marlin/src/gcode/calibrate/G34_M422.cpp +++ b/Marlin/src/gcode/calibrate/G34_M422.cpp @@ -65,7 +65,7 @@ void GcodeSuite::G34() { int zStepper; bool state; parser.intval('Z', zStepper); - parser.boolval(S, state); + parser.boolval('S', state); stepper.set_separate_multi_axis(true); @@ -73,18 +73,18 @@ void GcodeSuite::G34() { switch(zStepper) { case 1 : - set_z1_lock(state); + stepper.set_z1_lock(state); break; case 2 : - set_z2_lock(state); + stepper.set_z2_lock(state); break; #if NUM_Z_STEPPER_DRIVERS >= 3 case 3 : - set_z3_lock(state); + stepper.set_z3_lock(state); break; #if NUM_Z_STEPPER_DRIVERS >= 4 case 4 : - set_z4_lock(state); + stepper.set_z4_lock(state); break; #endif default: