2017-03-18 15:14:31 +00:00
|
|
|
/**
|
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
|
|
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
2017-09-08 20:35:25 +00:00
|
|
|
#include "../../../inc/MarlinConfig.h"
|
2017-03-18 15:14:31 +00:00
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#include "../bedlevel.h"
|
|
|
|
#include "../../../module/planner.h"
|
|
|
|
#include "../../../module/stepper.h"
|
|
|
|
#include "../../../module/motion.h"
|
2017-09-08 20:35:25 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if ENABLED(DELTA)
|
|
|
|
#include "../../../module/delta.h"
|
|
|
|
#endif
|
2017-09-06 11:28:32 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#include "../../../Marlin.h"
|
|
|
|
#include <math.h>
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if AVR_AT90USB1286_FAMILY // Teensyduino & Printrboard IDE extensions have compile errors without this
|
|
|
|
inline void set_current_from_destination() { COPY(current_position, destination); }
|
|
|
|
#else
|
|
|
|
extern void set_current_from_destination();
|
|
|
|
#endif
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-09 13:55:55 +00:00
|
|
|
#if !UBL_SEGMENTED
|
|
|
|
|
2017-12-09 08:10:54 +00:00
|
|
|
void unified_bed_leveling::line_to_destination_cartesian(const float &feed_rate, const uint8_t extruder) {
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
|
|
|
* Much of the nozzle movement will be within the same cell. So we will do as little computation
|
|
|
|
* as possible to determine if this is the case. If this move is within the same cell, we will
|
|
|
|
* just do the required Z-Height correction, call the Planner's buffer_line() routine, and leave
|
|
|
|
*/
|
2017-12-09 13:50:55 +00:00
|
|
|
#if ENABLED(SKEW_CORRECTION)
|
|
|
|
// For skew correction just adjust the destination point and we're done
|
|
|
|
float start[XYZE] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS] },
|
|
|
|
end[XYZE] = { destination[X_AXIS], destination[Y_AXIS], destination[Z_AXIS], destination[E_AXIS] };
|
|
|
|
planner.skew(start[X_AXIS], start[Y_AXIS], start[Z_AXIS]);
|
|
|
|
planner.skew(end[X_AXIS], end[Y_AXIS], end[Z_AXIS]);
|
|
|
|
#else
|
|
|
|
const float (&start)[XYZE] = current_position,
|
|
|
|
(&end)[XYZE] = destination;
|
|
|
|
#endif
|
2017-03-31 12:57:41 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
const int cell_start_xi = get_cell_index_x(start[X_AXIS]),
|
|
|
|
cell_start_yi = get_cell_index_y(start[Y_AXIS]),
|
|
|
|
cell_dest_xi = get_cell_index_x(end[X_AXIS]),
|
|
|
|
cell_dest_yi = get_cell_index_y(end[Y_AXIS]);
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag) {
|
2017-12-09 13:50:55 +00:00
|
|
|
SERIAL_ECHOPAIR(" ubl.line_to_destination_cartesian(xe=", destination[X_AXIS]);
|
|
|
|
SERIAL_ECHOPAIR(", ye=", destination[Y_AXIS]);
|
|
|
|
SERIAL_ECHOPAIR(", ze=", destination[Z_AXIS]);
|
|
|
|
SERIAL_ECHOPAIR(", ee=", destination[E_AXIS]);
|
2017-03-31 12:57:41 +00:00
|
|
|
SERIAL_CHAR(')');
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("Start of ubl.line_to_destination_cartesian()"));
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// A move within the same cell needs no splitting
|
|
|
|
if (cell_start_xi == cell_dest_xi && cell_start_yi == cell_dest_yi) {
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// For a move off the bed, use a constant Z raise
|
2017-04-06 03:29:44 +00:00
|
|
|
if (!WITHIN(cell_dest_xi, 0, GRID_MAX_POINTS_X - 1) || !WITHIN(cell_dest_yi, 0, GRID_MAX_POINTS_Y - 1)) {
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
// Note: There is no Z Correction in this case. We are off the grid and don't know what
|
2018-02-16 04:22:06 +00:00
|
|
|
// a reasonable correction would be. If the user has specified a UBL_Z_RAISE_WHEN_OFF_MESH
|
2018-02-15 21:07:42 +00:00
|
|
|
// value, that will be used instead of a calculated (Bi-Linear interpolation) correction.
|
2018-04-12 23:06:48 +00:00
|
|
|
|
2018-02-16 04:22:06 +00:00
|
|
|
const float z_raise = 0.0
|
|
|
|
#ifdef UBL_Z_RAISE_WHEN_OFF_MESH
|
|
|
|
+ UBL_Z_RAISE_WHEN_OFF_MESH
|
|
|
|
#endif
|
|
|
|
;
|
2018-02-15 21:07:42 +00:00
|
|
|
planner.buffer_segment(end[X_AXIS], end[Y_AXIS], end[Z_AXIS] + z_raise, end[E_AXIS], feed_rate, extruder);
|
2017-10-21 16:42:26 +00:00
|
|
|
set_current_from_destination();
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag)
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("out of bounds in ubl.line_to_destination_cartesian()"));
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-03-18 15:14:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
FINAL_MOVE:
|
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// The distance is always MESH_X_DIST so multiply by the constant reciprocal.
|
2017-11-03 04:59:42 +00:00
|
|
|
const float xratio = (end[X_AXIS] - mesh_index_to_xpos(cell_dest_xi)) * (1.0 / (MESH_X_DIST));
|
2017-08-02 21:51:04 +00:00
|
|
|
|
|
|
|
float z1 = z_values[cell_dest_xi ][cell_dest_yi ] + xratio *
|
2017-08-03 16:20:03 +00:00
|
|
|
(z_values[cell_dest_xi + 1][cell_dest_yi ] - z_values[cell_dest_xi][cell_dest_yi ]),
|
|
|
|
z2 = z_values[cell_dest_xi ][cell_dest_yi + 1] + xratio *
|
|
|
|
(z_values[cell_dest_xi + 1][cell_dest_yi + 1] - z_values[cell_dest_xi][cell_dest_yi + 1]);
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-08-03 16:20:03 +00:00
|
|
|
if (cell_dest_xi >= GRID_MAX_POINTS_X - 1) z1 = z2 = 0.0;
|
2017-08-02 21:51:04 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// X cell-fraction done. Interpolate the two Z offsets with the Y fraction for the final Z offset.
|
|
|
|
const float yratio = (end[Y_AXIS] - mesh_index_to_ypos(cell_dest_yi)) * (1.0 / (MESH_Y_DIST)),
|
|
|
|
z0 = cell_dest_yi < GRID_MAX_POINTS_Y - 1 ? (z1 + (z2 - z1) * yratio) * planner.fade_scaling_factor_for_z(end[Z_AXIS]) : 0.0;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// Undefined parts of the Mesh in z_values[][] are NAN.
|
|
|
|
// Replace NAN corrections with 0.0 to prevent NAN propagation.
|
|
|
|
planner.buffer_segment(end[X_AXIS], end[Y_AXIS], end[Z_AXIS] + (isnan(z0) ? 0.0 : z0), end[E_AXIS], feed_rate, extruder);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag)
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("FINAL_MOVE in ubl.line_to_destination_cartesian()"));
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-10-21 16:42:26 +00:00
|
|
|
set_current_from_destination();
|
2017-03-18 15:14:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Past this point the move is known to cross one or more mesh lines. Check for the most common
|
|
|
|
* case - crossing only one X or Y line - after details are worked out to reduce computation.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-31 12:57:41 +00:00
|
|
|
const float dx = end[X_AXIS] - start[X_AXIS],
|
|
|
|
dy = end[Y_AXIS] - start[Y_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-05-02 22:41:55 +00:00
|
|
|
const int left_flag = dx < 0.0 ? 1 : 0,
|
|
|
|
down_flag = dy < 0.0 ? 1 : 0;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
const float adx = left_flag ? -dx : dx,
|
|
|
|
ady = down_flag ? -dy : dy;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
const int dxi = cell_start_xi == cell_dest_xi ? 0 : left_flag ? -1 : 1,
|
|
|
|
dyi = cell_start_yi == cell_dest_yi ? 0 : down_flag ? -1 : 1;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Compute the extruder scaling factor for each partial move, checking for
|
|
|
|
* zero-length moves that would result in an infinite scaling factor.
|
|
|
|
* A float divide is required for this, but then it just multiplies.
|
|
|
|
* Also select a scaling factor based on the larger of the X and Y
|
|
|
|
* components. The larger of the two is used to preserve precision.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
|
|
|
|
|
|
|
const bool use_x_dist = adx > ady;
|
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
float on_axis_distance = use_x_dist ? dx : dy,
|
2017-03-31 12:57:41 +00:00
|
|
|
e_position = end[E_AXIS] - start[E_AXIS],
|
|
|
|
z_position = end[Z_AXIS] - start[Z_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
const float e_normalized_dist = e_position / on_axis_distance,
|
|
|
|
z_normalized_dist = z_position / on_axis_distance;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-05-08 19:09:37 +00:00
|
|
|
int current_xi = cell_start_xi,
|
2017-05-08 00:02:24 +00:00
|
|
|
current_yi = cell_start_yi;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
const float m = dy / dx,
|
2017-03-31 12:57:41 +00:00
|
|
|
c = start[Y_AXIS] - m * start[X_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-05-10 17:37:35 +00:00
|
|
|
const bool inf_normalized_flag = (isinf(e_normalized_dist) != 0),
|
|
|
|
inf_m_flag = (isinf(m) != 0);
|
2018-04-12 23:06:48 +00:00
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Handle vertical lines that stay within one column.
|
|
|
|
* These need not be perfectly vertical.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2018-04-12 23:06:48 +00:00
|
|
|
if (dxi == 0) { // Vertical line?
|
|
|
|
current_yi += down_flag; // Line going down? Just go to the bottom.
|
2017-03-18 15:14:31 +00:00
|
|
|
while (current_yi != cell_dest_yi + down_flag) {
|
|
|
|
current_yi += dyi;
|
2017-11-03 04:59:42 +00:00
|
|
|
const float next_mesh_line_y = mesh_index_to_ypos(current_yi);
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Skip the calculations for an infinite slope.
|
|
|
|
* For others the next X is the same so this can continue.
|
|
|
|
* Calculate X at the next Y mesh line.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2017-11-03 04:59:42 +00:00
|
|
|
const float rx = inf_m_flag ? start[X_AXIS] : (next_mesh_line_y - c) / m;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
float z0 = z_correction_for_x_on_horizontal_mesh_line(rx, current_xi, current_yi)
|
2017-10-13 22:21:25 +00:00
|
|
|
* planner.fade_scaling_factor_for_z(end[Z_AXIS]);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// Undefined parts of the Mesh in z_values[][] are NAN.
|
|
|
|
// Replace NAN corrections with 0.0 to prevent NAN propagation.
|
2017-03-21 06:30:26 +00:00
|
|
|
if (isnan(z0)) z0 = 0.0;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
const float ry = mesh_index_to_ypos(current_yi);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Without this check, it's possible to generate a zero length move, as in the case where
|
|
|
|
* the line is heading down, starting exactly on a mesh line boundary. Since this is rare
|
|
|
|
* it might be fine to remove this check and let planner.buffer_segment() filter it out.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2017-11-03 04:59:42 +00:00
|
|
|
if (ry != start[Y_AXIS]) {
|
2017-03-20 06:42:41 +00:00
|
|
|
if (!inf_normalized_flag) {
|
2017-11-03 04:59:42 +00:00
|
|
|
on_axis_distance = use_x_dist ? rx - start[X_AXIS] : ry - start[Y_AXIS];
|
2017-05-02 22:53:01 +00:00
|
|
|
e_position = start[E_AXIS] + on_axis_distance * e_normalized_dist;
|
2017-03-31 12:57:41 +00:00
|
|
|
z_position = start[Z_AXIS] + on_axis_distance * z_normalized_dist;
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-05-02 04:52:33 +00:00
|
|
|
e_position = end[E_AXIS];
|
|
|
|
z_position = end[Z_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2017-12-09 13:41:19 +00:00
|
|
|
planner.buffer_segment(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
2017-03-18 15:14:31 +00:00
|
|
|
} //else printf("FIRST MOVE PRUNED ");
|
|
|
|
}
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag)
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("vertical move done in ubl.line_to_destination_cartesian()"));
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// At the final destination? Usually not, but when on a Y Mesh Line it's completed.
|
2017-03-31 12:57:41 +00:00
|
|
|
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
|
2017-03-18 15:14:31 +00:00
|
|
|
goto FINAL_MOVE;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-10-21 16:42:26 +00:00
|
|
|
set_current_from_destination();
|
2017-03-18 15:14:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Handle horizontal lines that stay within one row.
|
|
|
|
* These need not be perfectly horizontal.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2018-04-12 23:06:48 +00:00
|
|
|
if (dyi == 0) { // Horizontal line?
|
|
|
|
current_xi += left_flag; // Heading left? Just go to the left edge of the cell for the first move.
|
2017-03-18 15:14:31 +00:00
|
|
|
while (current_xi != cell_dest_xi + left_flag) {
|
|
|
|
current_xi += dxi;
|
2017-11-03 04:59:42 +00:00
|
|
|
const float next_mesh_line_x = mesh_index_to_xpos(current_xi),
|
|
|
|
ry = m * next_mesh_line_x + c; // Calculate Y at the next X mesh line
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
float z0 = z_correction_for_y_on_vertical_mesh_line(ry, current_xi, current_yi)
|
2017-10-13 22:21:25 +00:00
|
|
|
* planner.fade_scaling_factor_for_z(end[Z_AXIS]);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// Undefined parts of the Mesh in z_values[][] are NAN.
|
|
|
|
// Replace NAN corrections with 0.0 to prevent NAN propagation.
|
2017-03-20 06:42:41 +00:00
|
|
|
if (isnan(z0)) z0 = 0.0;
|
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
const float rx = mesh_index_to_xpos(current_xi);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
|
|
|
/**
|
2018-04-12 23:06:48 +00:00
|
|
|
* Without this check, it's possible to generate a zero length move, as in the case where
|
|
|
|
* the line is heading left, starting exactly on a mesh line boundary. Since this is rare
|
|
|
|
* it might be fine to remove this check and let planner.buffer_segment() filter it out.
|
2017-03-20 06:42:41 +00:00
|
|
|
*/
|
2017-11-03 04:59:42 +00:00
|
|
|
if (rx != start[X_AXIS]) {
|
2017-03-20 06:42:41 +00:00
|
|
|
if (!inf_normalized_flag) {
|
2017-11-03 04:59:42 +00:00
|
|
|
on_axis_distance = use_x_dist ? rx - start[X_AXIS] : ry - start[Y_AXIS];
|
2017-03-31 12:57:41 +00:00
|
|
|
e_position = start[E_AXIS] + on_axis_distance * e_normalized_dist; // is based on X or Y because this is a horizontal move
|
|
|
|
z_position = start[Z_AXIS] + on_axis_distance * z_normalized_dist;
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-05-02 04:52:33 +00:00
|
|
|
e_position = end[E_AXIS];
|
|
|
|
z_position = end[Z_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2017-12-09 13:41:19 +00:00
|
|
|
planner.buffer_segment(rx, ry, z_position + z0, e_position, feed_rate, extruder);
|
2017-03-18 15:14:31 +00:00
|
|
|
} //else printf("FIRST MOVE PRUNED ");
|
|
|
|
}
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag)
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("horizontal move done in ubl.line_to_destination_cartesian()"));
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-03-31 12:57:41 +00:00
|
|
|
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
|
2017-03-18 15:14:31 +00:00
|
|
|
goto FINAL_MOVE;
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2017-10-21 16:42:26 +00:00
|
|
|
set_current_from_destination();
|
2017-03-18 15:14:31 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2017-03-20 06:42:41 +00:00
|
|
|
/**
|
|
|
|
*
|
2018-04-12 23:06:48 +00:00
|
|
|
* Handle the generic case of a line crossing both X and Y Mesh lines.
|
2017-03-20 06:42:41 +00:00
|
|
|
*
|
|
|
|
*/
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
int xi_cnt = cell_start_xi - cell_dest_xi,
|
|
|
|
yi_cnt = cell_start_yi - cell_dest_yi;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-24 05:53:37 +00:00
|
|
|
if (xi_cnt < 0) xi_cnt = -xi_cnt;
|
2017-03-20 06:42:41 +00:00
|
|
|
if (yi_cnt < 0) yi_cnt = -yi_cnt;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
|
|
|
current_xi += left_flag;
|
|
|
|
current_yi += down_flag;
|
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
while (xi_cnt || yi_cnt) {
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
const float next_mesh_line_x = mesh_index_to_xpos(current_xi + dxi),
|
|
|
|
next_mesh_line_y = mesh_index_to_ypos(current_yi + dyi),
|
|
|
|
ry = m * next_mesh_line_x + c, // Calculate Y at the next X mesh line
|
|
|
|
rx = (next_mesh_line_y - c) / m; // Calculate X at the next Y mesh line
|
|
|
|
// (No need to worry about m being zero.
|
|
|
|
// If that was the case, it was already detected
|
|
|
|
// as a vertical line move above.)
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-11-03 04:59:42 +00:00
|
|
|
if (left_flag == (rx > next_mesh_line_x)) { // Check if we hit the Y line first
|
2017-03-18 15:14:31 +00:00
|
|
|
// Yes! Crossing a Y Mesh Line next
|
2017-11-03 04:59:42 +00:00
|
|
|
float z0 = z_correction_for_x_on_horizontal_mesh_line(rx, current_xi - left_flag, current_yi + dyi)
|
2017-10-13 22:21:25 +00:00
|
|
|
* planner.fade_scaling_factor_for_z(end[Z_AXIS]);
|
2017-03-20 06:42:41 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// Undefined parts of the Mesh in z_values[][] are NAN.
|
|
|
|
// Replace NAN corrections with 0.0 to prevent NAN propagation.
|
2017-03-20 06:42:41 +00:00
|
|
|
if (isnan(z0)) z0 = 0.0;
|
|
|
|
|
|
|
|
if (!inf_normalized_flag) {
|
2017-11-03 04:59:42 +00:00
|
|
|
on_axis_distance = use_x_dist ? rx - start[X_AXIS] : next_mesh_line_y - start[Y_AXIS];
|
2017-03-31 12:57:41 +00:00
|
|
|
e_position = start[E_AXIS] + on_axis_distance * e_normalized_dist;
|
|
|
|
z_position = start[Z_AXIS] + on_axis_distance * z_normalized_dist;
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-05-02 04:52:33 +00:00
|
|
|
e_position = end[E_AXIS];
|
|
|
|
z_position = end[Z_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
2017-12-09 13:41:19 +00:00
|
|
|
planner.buffer_segment(rx, next_mesh_line_y, z_position + z0, e_position, feed_rate, extruder);
|
2017-03-18 15:14:31 +00:00
|
|
|
current_yi += dyi;
|
|
|
|
yi_cnt--;
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// Yes! Crossing a X Mesh Line next
|
2017-11-03 04:59:42 +00:00
|
|
|
float z0 = z_correction_for_y_on_vertical_mesh_line(ry, current_xi + dxi, current_yi - down_flag)
|
2017-10-13 22:21:25 +00:00
|
|
|
* planner.fade_scaling_factor_for_z(end[Z_AXIS]);
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2018-04-12 23:06:48 +00:00
|
|
|
// Undefined parts of the Mesh in z_values[][] are NAN.
|
|
|
|
// Replace NAN corrections with 0.0 to prevent NAN propagation.
|
2017-03-20 06:42:41 +00:00
|
|
|
if (isnan(z0)) z0 = 0.0;
|
|
|
|
|
|
|
|
if (!inf_normalized_flag) {
|
2017-11-03 04:59:42 +00:00
|
|
|
on_axis_distance = use_x_dist ? next_mesh_line_x - start[X_AXIS] : ry - start[Y_AXIS];
|
2017-03-31 12:57:41 +00:00
|
|
|
e_position = start[E_AXIS] + on_axis_distance * e_normalized_dist;
|
|
|
|
z_position = start[Z_AXIS] + on_axis_distance * z_normalized_dist;
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-05-02 04:52:33 +00:00
|
|
|
e_position = end[E_AXIS];
|
|
|
|
z_position = end[Z_AXIS];
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2017-12-09 13:41:19 +00:00
|
|
|
planner.buffer_segment(next_mesh_line_x, ry, z_position + z0, e_position, feed_rate, extruder);
|
2017-03-18 15:14:31 +00:00
|
|
|
current_xi += dxi;
|
|
|
|
xi_cnt--;
|
|
|
|
}
|
2017-05-10 17:37:35 +00:00
|
|
|
|
2018-04-19 17:04:35 +00:00
|
|
|
if (xi_cnt < 0 || yi_cnt < 0) break; // Too far! Exit the loop and go to FINAL_MOVE
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2017-05-22 19:41:09 +00:00
|
|
|
if (g26_debug_flag)
|
2017-12-09 13:14:06 +00:00
|
|
|
debug_current_and_destination(PSTR("generic move done in ubl.line_to_destination_cartesian()"));
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-03-31 12:57:41 +00:00
|
|
|
if (current_position[X_AXIS] != end[X_AXIS] || current_position[Y_AXIS] != end[Y_AXIS])
|
2017-03-20 06:42:41 +00:00
|
|
|
goto FINAL_MOVE;
|
2017-03-18 15:14:31 +00:00
|
|
|
|
2017-10-21 16:42:26 +00:00
|
|
|
set_current_from_destination();
|
2017-03-18 15:14:31 +00:00
|
|
|
}
|
|
|
|
|
2017-12-09 13:55:55 +00:00
|
|
|
#else // UBL_SEGMENTED
|
2017-05-16 16:47:51 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if IS_SCARA // scale the feed rate from mm/s to degrees/s
|
|
|
|
static float scara_feed_factor, scara_oldA, scara_oldB;
|
|
|
|
#endif
|
|
|
|
|
|
|
|
// We don't want additional apply_leveling() performed by regular buffer_line or buffer_line_kinematic,
|
|
|
|
// so we call buffer_segment directly here. Per-segmented leveling and kinematics performed first.
|
|
|
|
|
|
|
|
inline void _O2 ubl_buffer_segment_raw(const float (&in_raw)[XYZE], const float &fr) {
|
|
|
|
|
|
|
|
#if ENABLED(SKEW_CORRECTION)
|
|
|
|
float raw[XYZE] = { in_raw[X_AXIS], in_raw[Y_AXIS], in_raw[Z_AXIS] };
|
|
|
|
planner.skew(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS]);
|
|
|
|
#else
|
|
|
|
const float (&raw)[XYZE] = in_raw;
|
2017-05-12 03:33:47 +00:00
|
|
|
#endif
|
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if ENABLED(DELTA) // apply delta inverse_kinematics
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-22 04:41:57 +00:00
|
|
|
DELTA_IK(raw);
|
2017-12-11 08:30:27 +00:00
|
|
|
planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], in_raw[E_AXIS], fr, active_extruder);
|
2017-12-09 13:50:55 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#elif IS_SCARA // apply scara inverse_kinematics (should be changed to save raw->logical->raw)
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
inverse_kinematics(raw); // this writes delta[ABC] from raw[XYZE]
|
|
|
|
// should move the feedrate scaling to scara inverse_kinematics
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float adiff = FABS(delta[A_AXIS] - scara_oldA),
|
|
|
|
bdiff = FABS(delta[B_AXIS] - scara_oldB);
|
|
|
|
scara_oldA = delta[A_AXIS];
|
|
|
|
scara_oldB = delta[B_AXIS];
|
|
|
|
float s_feedrate = max(adiff, bdiff) * scara_feed_factor;
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], in_raw[E_AXIS], s_feedrate, active_extruder);
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#else // CARTESIAN
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
planner.buffer_segment(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], in_raw[E_AXIS], fr, active_extruder);
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#endif
|
|
|
|
}
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if IS_SCARA
|
|
|
|
#define DELTA_SEGMENT_MIN_LENGTH 0.25 // SCARA minimum segment size is 0.25mm
|
|
|
|
#elif ENABLED(DELTA)
|
|
|
|
#define DELTA_SEGMENT_MIN_LENGTH 0.10 // mm (still subject to DELTA_SEGMENTS_PER_SECOND)
|
|
|
|
#else // CARTESIAN
|
|
|
|
#ifdef LEVELED_SEGMENT_LENGTH
|
|
|
|
#define DELTA_SEGMENT_MIN_LENGTH LEVELED_SEGMENT_LENGTH
|
|
|
|
#else
|
|
|
|
#define DELTA_SEGMENT_MIN_LENGTH 1.00 // mm (similar to G2/G3 arc segmentation)
|
|
|
|
#endif
|
|
|
|
#endif
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
/**
|
|
|
|
* Prepare a segmented linear move for DELTA/SCARA/CARTESIAN with UBL and FADE semantics.
|
|
|
|
* This calls planner.buffer_segment multiple times for small incremental moves.
|
|
|
|
* Returns true if did NOT move, false if moved (requires current_position update).
|
|
|
|
*/
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
bool _O2 unified_bed_leveling::prepare_segmented_line_to(const float (&rtarget)[XYZE], const float &feedrate) {
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
if (!position_is_reachable(rtarget[X_AXIS], rtarget[Y_AXIS])) // fail if moving outside reachable boundary
|
|
|
|
return true; // did not move, so current_position still accurate
|
|
|
|
|
|
|
|
const float total[XYZE] = {
|
|
|
|
rtarget[X_AXIS] - current_position[X_AXIS],
|
|
|
|
rtarget[Y_AXIS] - current_position[Y_AXIS],
|
|
|
|
rtarget[Z_AXIS] - current_position[Z_AXIS],
|
|
|
|
rtarget[E_AXIS] - current_position[E_AXIS]
|
|
|
|
};
|
|
|
|
|
|
|
|
const float cartesian_xy_mm = HYPOT(total[X_AXIS], total[Y_AXIS]); // total horizontal xy distance
|
|
|
|
|
|
|
|
#if IS_KINEMATIC
|
|
|
|
const float seconds = cartesian_xy_mm / feedrate; // seconds to move xy distance at requested rate
|
|
|
|
uint16_t segments = lroundf(delta_segments_per_second * seconds), // preferred number of segments for distance @ feedrate
|
|
|
|
seglimit = lroundf(cartesian_xy_mm * (1.0 / (DELTA_SEGMENT_MIN_LENGTH))); // number of segments at minimum segment length
|
|
|
|
NOMORE(segments, seglimit); // limit to minimum segment length (fewer segments)
|
|
|
|
#else
|
|
|
|
uint16_t segments = lroundf(cartesian_xy_mm * (1.0 / (DELTA_SEGMENT_MIN_LENGTH))); // cartesian fixed segment length
|
2017-12-03 06:10:54 +00:00
|
|
|
#endif
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
NOLESS(segments, 1); // must have at least one segment
|
|
|
|
const float inv_segments = 1.0 / segments; // divide once, multiply thereafter
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if IS_SCARA // scale the feed rate from mm/s to degrees/s
|
|
|
|
scara_feed_factor = cartesian_xy_mm * inv_segments * feedrate;
|
|
|
|
scara_oldA = stepper.get_axis_position_degrees(A_AXIS);
|
|
|
|
scara_oldB = stepper.get_axis_position_degrees(B_AXIS);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
const float diff[XYZE] = {
|
|
|
|
total[X_AXIS] * inv_segments,
|
|
|
|
total[Y_AXIS] * inv_segments,
|
|
|
|
total[Z_AXIS] * inv_segments,
|
|
|
|
total[E_AXIS] * inv_segments
|
|
|
|
};
|
|
|
|
|
|
|
|
// Note that E segment distance could vary slightly as z mesh height
|
|
|
|
// changes for each segment, but small enough to ignore.
|
|
|
|
|
|
|
|
float raw[XYZE] = {
|
|
|
|
current_position[X_AXIS],
|
|
|
|
current_position[Y_AXIS],
|
|
|
|
current_position[Z_AXIS],
|
|
|
|
current_position[E_AXIS]
|
|
|
|
};
|
|
|
|
|
|
|
|
// Only compute leveling per segment if ubl active and target below z_fade_height.
|
|
|
|
if (!planner.leveling_active || !planner.leveling_active_at_z(rtarget[Z_AXIS])) { // no mesh leveling
|
|
|
|
while (--segments) {
|
|
|
|
LOOP_XYZE(i) raw[i] += diff[i];
|
|
|
|
ubl_buffer_segment_raw(raw, feedrate);
|
2017-05-12 03:33:47 +00:00
|
|
|
}
|
2017-12-11 08:30:27 +00:00
|
|
|
ubl_buffer_segment_raw(rtarget, feedrate);
|
|
|
|
return false; // moved but did not set_current_from_destination();
|
|
|
|
}
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// Otherwise perform per-segment leveling
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
const float fade_scaling_factor = planner.fade_scaling_factor_for_z(rtarget[Z_AXIS]);
|
|
|
|
#endif
|
2017-05-16 05:30:29 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// increment to first segment destination
|
|
|
|
LOOP_XYZE(i) raw[i] += diff[i];
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2018-02-25 06:13:46 +00:00
|
|
|
for (;;) { // for each mesh cell encountered during the move
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// Compute mesh cell invariants that remain constant for all segments within cell.
|
|
|
|
// Note for cell index, if point is outside the mesh grid (in MESH_INSET perimeter)
|
|
|
|
// the bilinear interpolation from the adjacent cell within the mesh will still work.
|
|
|
|
// Inner loop will exit each time (because out of cell bounds) but will come back
|
|
|
|
// in top of loop and again re-find same adjacent cell and use it, just less efficient
|
|
|
|
// for mesh inset area.
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
int8_t cell_xi = (raw[X_AXIS] - (MESH_MIN_X)) * (1.0 / (MESH_X_DIST)),
|
2018-03-11 15:12:45 +00:00
|
|
|
cell_yi = (raw[Y_AXIS] - (MESH_MIN_Y)) * (1.0 / (MESH_Y_DIST));
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
cell_xi = constrain(cell_xi, 0, (GRID_MAX_POINTS_X) - 1);
|
|
|
|
cell_yi = constrain(cell_yi, 0, (GRID_MAX_POINTS_Y) - 1);
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float x0 = mesh_index_to_xpos(cell_xi), // 64 byte table lookup avoids mul+add
|
|
|
|
y0 = mesh_index_to_ypos(cell_yi);
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
float z_x0y0 = z_values[cell_xi ][cell_yi ], // z at lower left corner
|
|
|
|
z_x1y0 = z_values[cell_xi+1][cell_yi ], // z at upper left corner
|
|
|
|
z_x0y1 = z_values[cell_xi ][cell_yi+1], // z at lower right corner
|
|
|
|
z_x1y1 = z_values[cell_xi+1][cell_yi+1]; // z at upper right corner
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
if (isnan(z_x0y0)) z_x0y0 = 0; // ideally activating planner.leveling_active (G29 A)
|
|
|
|
if (isnan(z_x1y0)) z_x1y0 = 0; // should refuse if any invalid mesh points
|
|
|
|
if (isnan(z_x0y1)) z_x0y1 = 0; // in order to avoid isnan tests per cell,
|
|
|
|
if (isnan(z_x1y1)) z_x1y1 = 0; // thus guessing zero for undefined points
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
float cx = raw[X_AXIS] - x0, // cell-relative x and y
|
|
|
|
cy = raw[Y_AXIS] - y0;
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float z_xmy0 = (z_x1y0 - z_x0y0) * (1.0 / (MESH_X_DIST)), // z slope per x along y0 (lower left to lower right)
|
|
|
|
z_xmy1 = (z_x1y1 - z_x0y1) * (1.0 / (MESH_X_DIST)); // z slope per x along y1 (upper left to upper right)
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
float z_cxy0 = z_x0y0 + z_xmy0 * cx; // z height along y0 at cx (changes for each cx in cell)
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float z_cxy1 = z_x0y1 + z_xmy1 * cx, // z height along y1 at cx
|
|
|
|
z_cxyd = z_cxy1 - z_cxy0; // z height difference along cx from y0 to y1
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
float z_cxym = z_cxyd * (1.0 / (MESH_Y_DIST)); // z slope per y along cx from y0 to y1 (changes for each cx in cell)
|
2017-05-16 20:25:30 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// float z_cxcy = z_cxy0 + z_cxym * cy; // interpolated mesh z height along cx at cy (do inside the segment loop)
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// As subsequent segments step through this cell, the z_cxy0 intercept will change
|
|
|
|
// and the z_cxym slope will change, both as a function of cx within the cell, and
|
|
|
|
// each change by a constant for fixed segment lengths.
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float z_sxy0 = z_xmy0 * diff[X_AXIS], // per-segment adjustment to z_cxy0
|
|
|
|
z_sxym = (z_xmy1 - z_xmy0) * (1.0 / (MESH_Y_DIST)) * diff[X_AXIS]; // per-segment adjustment to z_cxym
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2018-02-25 06:13:46 +00:00
|
|
|
for (;;) { // for all segments within this mesh cell
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
if (--segments == 0) // if this is last segment, use rtarget for exact
|
|
|
|
COPY(raw, rtarget);
|
2017-05-16 05:30:29 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float z_cxcy = (z_cxy0 + z_cxym * cy) // interpolated mesh z height along cx at cy
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
* fade_scaling_factor // apply fade factor to interpolated mesh height
|
|
|
|
#endif
|
|
|
|
;
|
2017-05-16 20:25:30 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
const float z = raw[Z_AXIS];
|
|
|
|
raw[Z_AXIS] += z_cxcy;
|
|
|
|
ubl_buffer_segment_raw(raw, feedrate);
|
|
|
|
raw[Z_AXIS] = z;
|
2017-06-03 22:11:43 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
if (segments == 0) // done with last segment
|
|
|
|
return false; // did not set_current_from_destination()
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
LOOP_XYZE(i) raw[i] += diff[i];
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
cx += diff[X_AXIS];
|
|
|
|
cy += diff[Y_AXIS];
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
if (!WITHIN(cx, 0, MESH_X_DIST) || !WITHIN(cy, 0, MESH_Y_DIST)) // done within this cell, break to next
|
|
|
|
break;
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
// Next segment still within same mesh cell, adjust the per-segment
|
|
|
|
// slope and intercept to compute next z height.
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
z_cxy0 += z_sxy0; // adjust z_cxy0 by per-segment z_sxy0
|
|
|
|
z_cxym += z_sxym; // adjust z_cxym by per-segment z_sxym
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-11 08:30:27 +00:00
|
|
|
} // segment loop
|
|
|
|
} // cell loop
|
2017-12-25 04:56:23 +00:00
|
|
|
|
|
|
|
return false; // caller will update current_position
|
2017-12-11 08:30:27 +00:00
|
|
|
}
|
2017-05-12 03:33:47 +00:00
|
|
|
|
2017-12-09 13:55:55 +00:00
|
|
|
#endif // UBL_SEGMENTED
|
2017-05-12 03:33:47 +00:00
|
|
|
|
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|