Browse Source

prepare_move_to_destination_raw => prepare_uninterpolated_move_to_destination

Scott Lahteine 9 years ago
parent
commit
8542ebcecd
1 changed files with 6 additions and 6 deletions
  1. 6
    6
      Marlin/Marlin_main.cpp

+ 6
- 6
Marlin/Marlin_main.cpp View File

@@ -1475,9 +1475,9 @@ inline void set_destination_to_current() { memcpy(destination, current_position,
1475 1475
   /**
1476 1476
    * Calculate delta, start a line, and set current_position to destination
1477 1477
    */
1478
-  void prepare_move_to_destination_raw() {
1478
+  void prepare_uninterpolated_move_to_destination() {
1479 1479
     #if ENABLED(DEBUG_LEVELING_FEATURE)
1480
-      if (DEBUGGING(LEVELING)) DEBUG_POS("prepare_move_to_destination_raw", destination);
1480
+      if (DEBUGGING(LEVELING)) DEBUG_POS("prepare_uninterpolated_move_to_destination", destination);
1481 1481
     #endif
1482 1482
     refresh_cmd_timeout();
1483 1483
     inverse_kinematics(destination);
@@ -1513,7 +1513,7 @@ void do_blocking_move_to(const float &x, const float &y, const float &z, const f
1513 1513
         destination[X_AXIS] = x;           // move directly (uninterpolated)
1514 1514
         destination[Y_AXIS] = y;
1515 1515
         destination[Z_AXIS] = z;
1516
-        prepare_move_to_destination_raw(); // set_current_to_destination
1516
+        prepare_uninterpolated_move_to_destination(); // set_current_to_destination
1517 1517
         #if ENABLED(DEBUG_LEVELING_FEATURE)
1518 1518
           if (DEBUGGING(LEVELING)) DEBUG_POS("danger zone move", current_position);
1519 1519
         #endif
@@ -1521,7 +1521,7 @@ void do_blocking_move_to(const float &x, const float &y, const float &z, const f
1521 1521
       }
1522 1522
       else {
1523 1523
         destination[Z_AXIS] = delta_clip_start_height;
1524
-        prepare_move_to_destination_raw(); // set_current_to_destination
1524
+        prepare_uninterpolated_move_to_destination(); // set_current_to_destination
1525 1525
         #if ENABLED(DEBUG_LEVELING_FEATURE)
1526 1526
           if (DEBUGGING(LEVELING)) DEBUG_POS("zone border move", current_position);
1527 1527
         #endif
@@ -1530,7 +1530,7 @@ void do_blocking_move_to(const float &x, const float &y, const float &z, const f
1530 1530
 
1531 1531
     if (z > current_position[Z_AXIS]) {    // raising?
1532 1532
       destination[Z_AXIS] = z;
1533
-      prepare_move_to_destination_raw();   // set_current_to_destination
1533
+      prepare_uninterpolated_move_to_destination();   // set_current_to_destination
1534 1534
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1535 1535
         if (DEBUGGING(LEVELING)) DEBUG_POS("z raise move", current_position);
1536 1536
       #endif
@@ -1545,7 +1545,7 @@ void do_blocking_move_to(const float &x, const float &y, const float &z, const f
1545 1545
 
1546 1546
     if (z < current_position[Z_AXIS]) {    // lowering?
1547 1547
       destination[Z_AXIS] = z;
1548
-      prepare_move_to_destination_raw();   // set_current_to_destination
1548
+      prepare_uninterpolated_move_to_destination();   // set_current_to_destination
1549 1549
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1550 1550
         if (DEBUGGING(LEVELING)) DEBUG_POS("z lower move", current_position);
1551 1551
       #endif

Loading…
Cancel
Save