Skip to content

Commit

Permalink
Don't call adjust_delta on SCARA
Browse files Browse the repository at this point in the history
  • Loading branch information
thinkyhead committed Jul 22, 2016
1 parent d5e2d52 commit b6afa02
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Marlin/Marlin_main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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);
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion Marlin/planner_bezier.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit b6afa02

Please sign in to comment.