Browse Source

Don't call adjust_delta on SCARA

Scott Lahteine 8 years ago
parent
commit
b6afa028f4
2 changed files with 4 additions and 4 deletions
  1. 3
    3
      Marlin/Marlin_main.cpp
  2. 1
    1
      Marlin/planner_bezier.cpp

+ 3
- 3
Marlin/Marlin_main.cpp View File

@@ -7998,7 +7998,7 @@ void mesh_line_to_destination(float fr_mm_m, uint8_t x_splits = 0xff, uint8_t y_
7998 7998
 
7999 7999
       inverse_kinematics(target);
8000 8000
 
8001
-      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
8001
+      #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
8002 8002
         if (!bed_leveling_in_progress) adjust_delta(target);
8003 8003
       #endif
8004 8004
 
@@ -8248,7 +8248,7 @@ void prepare_move_to_destination() {
8248 8248
 
8249 8249
       #if ENABLED(DELTA) || ENABLED(SCARA)
8250 8250
         inverse_kinematics(arc_target);
8251
-        #if ENABLED(AUTO_BED_LEVELING_FEATURE)
8251
+        #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
8252 8252
           adjust_delta(arc_target);
8253 8253
         #endif
8254 8254
         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() {
8260 8260
     // Ensure last segment arrives at target location.
8261 8261
     #if ENABLED(DELTA) || ENABLED(SCARA)
8262 8262
       inverse_kinematics(target);
8263
-      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
8263
+      #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
8264 8264
         adjust_delta(target);
8265 8265
       #endif
8266 8266
       planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], fr_mm_s, active_extruder);

+ 1
- 1
Marlin/planner_bezier.cpp View File

@@ -190,7 +190,7 @@ void cubic_b_spline(const float position[NUM_AXIS], const float target[NUM_AXIS]
190 190
 
191 191
     #if ENABLED(DELTA) || ENABLED(SCARA)
192 192
       inverse_kinematics(bez_target);
193
-      #if ENABLED(AUTO_BED_LEVELING_FEATURE)
193
+      #if ENABLED(DELTA) && ENABLED(AUTO_BED_LEVELING_FEATURE)
194 194
         adjust_delta(bez_target);
195 195
       #endif
196 196
       planner.buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], bez_target[E_AXIS], fr_mm_s, extruder);

Loading…
Cancel
Save