Quellcode durchsuchen

No line_to_* functions with IS_KINEMATIC

Scott Lahteine vor 8 Jahren
Ursprung
Commit
83fc5e1540
1 geänderte Dateien mit 20 neuen und 21 gelöschten Zeilen
  1. 20
    21
      Marlin/Marlin_main.cpp

+ 20
- 21
Marlin/Marlin_main.cpp Datei anzeigen

@@ -1446,27 +1446,27 @@ inline float get_homing_bump_feedrate(AxisEnum axis) {
1446 1446
   }
1447 1447
   return homing_feedrate_mm_s[axis] / hbd;
1448 1448
 }
1449
-//
1450
-// line_to_current_position
1451
-// Move the planner to the current position from wherever it last moved
1452
-// (or from wherever it has been told it is located).
1453
-//
1454
-inline void line_to_current_position() {
1455
-  planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate_mm_s, active_extruder);
1456
-}
1457 1449
 
1458
-inline void line_to_z(float zPosition) {
1459
-  planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], zPosition, current_position[E_AXIS], feedrate_mm_s, active_extruder);
1460
-}
1450
+#if !IS_KINEMATIC
1451
+  //
1452
+  // line_to_current_position
1453
+  // Move the planner to the current position from wherever it last moved
1454
+  // (or from wherever it has been told it is located).
1455
+  //
1456
+  inline void line_to_current_position() {
1457
+    planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], feedrate_mm_s, active_extruder);
1458
+  }
1461 1459
 
1462
-//
1463
-// line_to_destination
1464
-// Move the planner, not necessarily synced with current_position
1465
-//
1466
-inline void line_to_destination(float fr_mm_s) {
1467
-  planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
1468
-}
1469
-inline void line_to_destination() { line_to_destination(feedrate_mm_s); }
1460
+  //
1461
+  // line_to_destination
1462
+  // Move the planner, not necessarily synced with current_position
1463
+  //
1464
+  inline void line_to_destination(float fr_mm_s) {
1465
+    planner.buffer_line(destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS], fr_mm_s, active_extruder);
1466
+  }
1467
+  inline void line_to_destination() { line_to_destination(feedrate_mm_s); }
1468
+
1469
+#endif // !IS_KINEMATIC
1470 1470
 
1471 1471
 inline void set_current_to_destination() { memcpy(current_position, destination, sizeof(current_position)); }
1472 1472
 inline void set_destination_to_current() { memcpy(destination, current_position, sizeof(destination)); }
@@ -2785,8 +2785,7 @@ inline void gcode_G4() {
2785 2785
 
2786 2786
     // Move all carriages together linearly until an endstop is hit.
2787 2787
     current_position[X_AXIS] = current_position[Y_AXIS] = current_position[Z_AXIS] = (Z_MAX_LENGTH + 10);
2788
-    feedrate_mm_s = homing_feedrate_mm_s[X_AXIS];
2789
-    line_to_current_position();
2788
+    planner.buffer_line(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS], homing_feedrate_mm_s[X_AXIS], active_extruder);
2790 2789
     stepper.synchronize();
2791 2790
     endstops.hit_on_purpose(); // clear endstop hit flags
2792 2791
 

Laden…
Abbrechen
Speichern