Browse Source

Make movement functions more available

Scott Lahteine 8 years ago
parent
commit
b211df818e
1 changed files with 16 additions and 19 deletions
  1. 16
    19
      Marlin/Marlin_main.cpp

+ 16
- 19
Marlin/Marlin_main.cpp View File

1453
   return homing_feedrate_mm_s[axis] / hbd;
1453
   return homing_feedrate_mm_s[axis] / hbd;
1454
 }
1454
 }
1455
 
1455
 
1456
-#if !IS_KINEMATIC
1457
-  //
1458
-  // line_to_current_position
1459
-  // Move the planner to the current position from wherever it last moved
1460
-  // (or from wherever it has been told it is located).
1461
-  //
1462
-  inline void line_to_current_position() {
1463
-    planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate_mm_s, active_extruder);
1464
-  }
1465
-
1466
-  //
1467
-  // line_to_destination
1468
-  // Move the planner, not necessarily synced with current_position
1469
-  //
1470
-  inline void line_to_destination(float fr_mm_s) {
1471
-    planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
1472
-  }
1473
-  inline void line_to_destination() { line_to_destination(feedrate_mm_s); }
1456
+//
1457
+// line_to_current_position
1458
+// Move the planner to the current position from wherever it last moved
1459
+// (or from wherever it has been told it is located).
1460
+//
1461
+inline void line_to_current_position() {
1462
+  planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate_mm_s, active_extruder);
1463
+}
1474
 
1464
 
1475
-#endif // !IS_KINEMATIC
1465
+//
1466
+// line_to_destination
1467
+// Move the planner, not necessarily synced with current_position
1468
+//
1469
+inline void line_to_destination(float fr_mm_s) {
1470
+  planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
1471
+}
1472
+inline void line_to_destination() { line_to_destination(feedrate_mm_s); }
1476
 
1473
 
1477
 inline void set_current_to_destination() { memcpy(current_position, destination, sizeof(current_position)); }
1474
 inline void set_current_to_destination() { memcpy(current_position, destination, sizeof(current_position)); }
1478
 inline void set_destination_to_current() { memcpy(destination, current_position, sizeof(destination)); }
1475
 inline void set_destination_to_current() { memcpy(destination, current_position, sizeof(destination)); }

Loading…
Cancel
Save