From 8bf38f49a0bc3920ce664f1093d56b8ff0bb1423 Mon Sep 17 00:00:00 2001 From: Knutwurst <36196269+knutwurst@users.noreply.github.com> Date: Sun, 7 Nov 2021 11:25:06 +0100 Subject: [PATCH] Adapt new setAxis implementation --- Marlin/Configuration.h | 1 - Marlin/src/lcd/anycubic_touchscreen.cpp | 7 ++++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h index 6a3da34d..c7ed7d92 100755 --- a/Marlin/Configuration.h +++ b/Marlin/Configuration.h @@ -1534,7 +1534,6 @@ #endif #if ENABLED(KNUTWURST_TFT_LEVELING) - //#define NOZZLE_TO_PROBE_OFFSET { 0, 0, -17 } // Chiron Default Value! #define NOZZLE_TO_PROBE_OFFSET { 0, 0, -16.8 } #endif diff --git a/Marlin/src/lcd/anycubic_touchscreen.cpp b/Marlin/src/lcd/anycubic_touchscreen.cpp index 7b094bb0..b84bec7e 100755 --- a/Marlin/src/lcd/anycubic_touchscreen.cpp +++ b/Marlin/src/lcd/anycubic_touchscreen.cpp @@ -79,8 +79,9 @@ char _conv[8]; void setAxisPosition_mm(const float position, const axis_t axis, const feedRate_t feedrate/*=0*/) { // Get motion limit from software endstops, if any float min, max; - max = soft_endstop.max[axis]; - min = soft_endstop.min[axis]; + //max = soft_endstop.max[axis]; + //min = soft_endstop.min[axis]; + soft_endstop.get_manual_axis_limits((AxisEnum)axis, min, max); current_position[axis] = constrain(position, min, max); line_to_current_position(feedrate ?: 60); @@ -94,7 +95,7 @@ char _conv[8]; #endif ABL_VAR xy_pos_t probe_position_lf, probe_position_rb; - ABL_VAR xy_float_t gridSpacing = { 0, 0 }; + //ABL_VAR xy_float_t gridSpacing = { 0, 0 }; const float x_min = probe.min_x(), x_max = probe.max_x(), y_min = probe.min_y(), y_max = probe.max_y();