From b6afa028f4701d3844001e899b1d61f159bcaaa3 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <sourcetree@thinkyhead.com>
Date: Fri, 22 Jul 2016 16:19:41 -0700
Subject: [PATCH] Don't call adjust_delta on SCARA
---
Marlin/Marlin_main.cpp | 6 +++---
Marlin/planner_bezier.cpp | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index faef1820f6..3677ad2d89 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -7998,7 +7998,7 @@ void mesh_line_to_destination(float fr_mm_m, uint8_t x_splits = 0xff, uint8_t y_
inverse_kinematics(target);
- #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+ #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
if (!bed_leveling_in_progress) adjust_delta(target);
#endif
@@ -8248,7 +8248,7 @@ void prepare_move_to_destination() {
#if ENABLED(DELTA) || ENABLED(SCARA)
inverse_kinematics(arc_target);
- #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+ #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
adjust_delta(arc_target);
#endif
planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], arc_target[E_AXIS], fr_mm_s, active_extruder);
@@ -8260,7 +8260,7 @@ void prepare_move_to_destination() {
// Ensure last segment arrives at target location.
#if ENABLED(DELTA) || ENABLED(SCARA)
inverse_kinematics(target);
- #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+ #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
adjust_delta(target);
#endif
planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], fr_mm_s, active_extruder);
diff --git a/Marlin/planner_bezier.cpp b/Marlin/planner_bezier.cpp
index 9ad57fbc05..6ca7afd1d6 100644
--- a/Marlin/planner_bezier.cpp
+++ b/Marlin/planner_bezier.cpp
@@ -190,7 +190,7 @@ void cubic_b_spline(const float position[NUM_AXIS], const float target[NUM_AXIS]
#if ENABLED(DELTA) || ENABLED(SCARA)
inverse_kinematics(bez_target);
- #if ENABLED(AUTO_BED_LEVELING_FEATURE)
+ #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
adjust_delta(bez_target);
#endif
planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], bez_target[E_AXIS], fr_mm_s, extruder);
--
GitLab