|
@@ -134,7 +134,7 @@
|
134
|
134
|
// Note: There is no Z Correction in this case. We are off the grid and don't know what
|
135
|
135
|
// a reasonable correction would be.
|
136
|
136
|
|
137
|
|
- planner._buffer_line(end[X_AXIS], end[Y_AXIS], end[Z_AXIS], end[E_AXIS], feed_rate, extruder);
|
|
137
|
+ planner.buffer_segment(end[X_AXIS], end[Y_AXIS], end[Z_AXIS], end[E_AXIS], feed_rate, extruder);
|
138
|
138
|
set_current_from_destination();
|
139
|
139
|
|
140
|
140
|
if (g26_debug_flag)
|
|
@@ -178,7 +178,7 @@
|
178
|
178
|
*/
|
179
|
179
|
if (isnan(z0)) z0 = 0.0;
|
180
|
180
|
|
181
|
|
- planner._buffer_line(end[X_AXIS], end[Y_AXIS], end[Z_AXIS] + z0, end[E_AXIS], feed_rate, extruder);
|
|
181
|
+ planner.buffer_segment(end[X_AXIS], end[Y_AXIS], end[Z_AXIS] + z0, end[E_AXIS], feed_rate, extruder);
|
182
|
182
|
|
183
|
183
|
if (g26_debug_flag)
|
184
|
184
|
debug_current_and_destination(PSTR("FINAL_MOVE in ubl.line_to_destination()"));
|
|
@@ -269,7 +269,7 @@
|
269
|
269
|
* Without this check, it is possible for the algorithm to generate a zero length move in the case
|
270
|
270
|
* where the line is heading down and it is starting right on a Mesh Line boundary. For how often that
|
271
|
271
|
* happens, it might be best to remove the check and always 'schedule' the move because
|
272
|
|
- * the planner._buffer_line() routine will filter it if that happens.
|
|
272
|
+ * the planner.buffer_segment() routine will filter it if that happens.
|
273
|
273
|
*/
|
274
|
274
|
if (ry != start[Y_AXIS]) {
|
275
|
275
|
if (!inf_normalized_flag) {
|
|
@@ -282,7 +282,7 @@
|
282
|
282
|
z_position = end[Z_AXIS];
|
283
|
283
|
}
|
284
|
284
|
|
285
|
|
- planner._buffer_line(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
|
285
|
+ planner.buffer_segment(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
286
|
286
|
} //else printf("FIRST MOVE PRUNED ");
|
287
|
287
|
}
|
288
|
288
|
|
|
@@ -333,7 +333,7 @@
|
333
|
333
|
* Without this check, it is possible for the algorithm to generate a zero length move in the case
|
334
|
334
|
* where the line is heading left and it is starting right on a Mesh Line boundary. For how often
|
335
|
335
|
* that happens, it might be best to remove the check and always 'schedule' the move because
|
336
|
|
- * the planner._buffer_line() routine will filter it if that happens.
|
|
336
|
+ * the planner.buffer_segment() routine will filter it if that happens.
|
337
|
337
|
*/
|
338
|
338
|
if (rx != start[X_AXIS]) {
|
339
|
339
|
if (!inf_normalized_flag) {
|
|
@@ -346,7 +346,7 @@
|
346
|
346
|
z_position = end[Z_AXIS];
|
347
|
347
|
}
|
348
|
348
|
|
349
|
|
- planner._buffer_line(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
|
349
|
+ planner.buffer_segment(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
350
|
350
|
} //else printf("FIRST MOVE PRUNED ");
|
351
|
351
|
}
|
352
|
352
|
|
|
@@ -408,7 +408,7 @@
|
408
|
408
|
e_position = end[E_AXIS];
|
409
|
409
|
z_position = end[Z_AXIS];
|
410
|
410
|
}
|
411
|
|
- planner._buffer_line(rx, next_mesh_line_y, z_position + z0, e_position, feed_rate, extruder);
|
|
411
|
+ planner.buffer_segment(rx, next_mesh_line_y, z_position + z0, e_position, feed_rate, extruder);
|
412
|
412
|
current_yi += dyi;
|
413
|
413
|
yi_cnt--;
|
414
|
414
|
}
|
|
@@ -436,7 +436,7 @@
|
436
|
436
|
z_position = end[Z_AXIS];
|
437
|
437
|
}
|
438
|
438
|
|
439
|
|
- planner._buffer_line(next_mesh_line_x, ry, z_position + z0, e_position, feed_rate, extruder);
|
|
439
|
+ planner.buffer_segment(next_mesh_line_x, ry, z_position + z0, e_position, feed_rate, extruder);
|
440
|
440
|
current_xi += dxi;
|
441
|
441
|
xi_cnt--;
|
442
|
442
|
}
|
|
@@ -468,14 +468,14 @@
|
468
|
468
|
#endif
|
469
|
469
|
|
470
|
470
|
// We don't want additional apply_leveling() performed by regular buffer_line or buffer_line_kinematic,
|
471
|
|
- // so we call _buffer_line directly here. Per-segmented leveling and kinematics performed first.
|
|
471
|
+ // so we call buffer_segment directly here. Per-segmented leveling and kinematics performed first.
|
472
|
472
|
|
473
|
473
|
inline void _O2 ubl_buffer_segment_raw(const float raw[XYZE], const float &fr) {
|
474
|
474
|
|
475
|
475
|
#if ENABLED(DELTA) // apply delta inverse_kinematics
|
476
|
476
|
|
477
|
477
|
DELTA_RAW_IK();
|
478
|
|
- planner._buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], fr, active_extruder);
|
|
478
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], fr, active_extruder);
|
479
|
479
|
|
480
|
480
|
#elif IS_SCARA // apply scara inverse_kinematics (should be changed to save raw->logical->raw)
|
481
|
481
|
|
|
@@ -488,11 +488,11 @@
|
488
|
488
|
scara_oldB = delta[B_AXIS];
|
489
|
489
|
float s_feedrate = max(adiff, bdiff) * scara_feed_factor;
|
490
|
490
|
|
491
|
|
- planner._buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], s_feedrate, active_extruder);
|
|
491
|
+ planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], s_feedrate, active_extruder);
|
492
|
492
|
|
493
|
493
|
#else // CARTESIAN
|
494
|
494
|
|
495
|
|
- planner._buffer_line(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], raw[E_AXIS], fr, active_extruder);
|
|
495
|
+ planner.buffer_segment(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], raw[E_AXIS], fr, active_extruder);
|
496
|
496
|
|
497
|
497
|
#endif
|
498
|
498
|
}
|
|
@@ -511,7 +511,7 @@
|
511
|
511
|
|
512
|
512
|
/**
|
513
|
513
|
* Prepare a segmented linear move for DELTA/SCARA/CARTESIAN with UBL and FADE semantics.
|
514
|
|
- * This calls planner._buffer_line multiple times for small incremental moves.
|
|
514
|
+ * This calls planner.buffer_segment multiple times for small incremental moves.
|
515
|
515
|
* Returns true if did NOT move, false if moved (requires current_position update).
|
516
|
516
|
*/
|
517
|
517
|
|