Browse Source

General cleanup around high level move functions

- Use new `DEBUG_POS` macro for `DELTA` debug
- Neaten up `prepare_move` a smidgen
- Remove an old commented `prepare_move()` line
Scott Lahteine 8 years ago
parent
commit
abeab792cb
1 changed files with 6 additions and 14 deletions
  1. 6
    14
      Marlin/Marlin_main.cpp

+ 6
- 14
Marlin/Marlin_main.cpp View File

@@ -2343,7 +2343,6 @@ static void homeaxis(AxisEnum axis) {
2343 2343
         #else
2344 2344
           sync_plan_position();
2345 2345
         #endif
2346
-        //prepare_move();
2347 2346
       }
2348 2347
 
2349 2348
       feedrate = retract_recover_feedrate * 60;
@@ -7322,12 +7321,8 @@ void mesh_plan_buffer_line(float x, float y, float z, const float e, float feed_
7322 7321
         adjust_delta(target);
7323 7322
       #endif
7324 7323
 
7325
-      //SERIAL_ECHOPGM("target[X_AXIS]="); SERIAL_ECHOLN(target[X_AXIS]);
7326
-      //SERIAL_ECHOPGM("target[Y_AXIS]="); SERIAL_ECHOLN(target[Y_AXIS]);
7327
-      //SERIAL_ECHOPGM("target[Z_AXIS]="); SERIAL_ECHOLN(target[Z_AXIS]);
7328
-      //SERIAL_ECHOPGM("delta[X_AXIS]="); SERIAL_ECHOLN(delta[X_AXIS]);
7329
-      //SERIAL_ECHOPGM("delta[Y_AXIS]="); SERIAL_ECHOLN(delta[Y_AXIS]);
7330
-      //SERIAL_ECHOPGM("delta[Z_AXIS]="); SERIAL_ECHOLN(delta[Z_AXIS]);
7324
+      //DEBUG_POS("prepare_move_delta", target);
7325
+      //DEBUG_POS("prepare_move_delta", delta);
7331 7326
 
7332 7327
       plan_buffer_line(delta[X_AXIS], delta[Y_AXIS], delta[Z_AXIS], target[E_AXIS], feedrate / 60 * feedrate_multiplier / 100.0, active_extruder);
7333 7328
     }
@@ -7417,13 +7412,10 @@ void prepare_move() {
7417 7412
     if (!prepare_move_scara(destination)) return;
7418 7413
   #elif ENABLED(DELTA)
7419 7414
     if (!prepare_move_delta(destination)) return;
7420
-  #endif
7421
-
7422
-  #if ENABLED(DUAL_X_CARRIAGE)
7423
-    if (!prepare_move_dual_x_carriage()) return;
7424
-  #endif
7425
-
7426
-  #if DISABLED(DELTA) && DISABLED(SCARA)
7415
+  #else
7416
+    #if ENABLED(DUAL_X_CARRIAGE)
7417
+      if (!prepare_move_dual_x_carriage()) return;
7418
+    #endif
7427 7419
     if (!prepare_move_cartesian()) return;
7428 7420
   #endif
7429 7421
 

Loading…
Cancel
Save