melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix up bilinear_z_offset

Browse Source
This commit is contained in:
Scott Lahteine 2016-09-28 12:56:35 -05:00 committed by Scott Lahteine
parent 3b3d282f8e
commit 0d9efb24f3
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/Marlin_main.cpp
View File

@ -7936,21 +7936,23 @@ void ok_to_send() {
// Get the Z adjustment for non-linear bed leveling // Get the Z adjustment for non-linear bed leveling
float bilinear_z_offset(float cartesian[XYZ]) { float bilinear_z_offset(float cartesian[XYZ]) {
int gridx = (cartesian[X_AXIS] - bilinear_start[X_AXIS]) / bilinear_grid_spacing[X_AXIS], // XY relative to the probed area
gridy = (cartesian[Y_AXIS] - bilinear_start[Y_AXIS]) / bilinear_grid_spacing[Y_AXIS]; const float x = RAW_X_POSITION(cartesian[X_AXIS]) - bilinear_start[X_AXIS],
y = RAW_Y_POSITION(cartesian[Y_AXIS]) - bilinear_start[Y_AXIS];
// What grid box is xy inside? // Convert to grid box units
if (gridx < 0) gridx = 0; float ratio_x = x / bilinear_grid_spacing[X_AXIS],
if (gridx > ABL_GRID_POINTS_X - 1) gridx = ABL_GRID_POINTS_X - 1; ratio_y = y / bilinear_grid_spacing[Y_AXIS];
if (gridy < 0) gridy = 0;
if (gridy > ABL_GRID_POINTS_Y - 1) gridy = ABL_GRID_POINTS_Y - 1;
// Ratio within the grid box // Whole unit is the grid box index
float ratio_x = cartesian[X_AXIS] / bilinear_grid_spacing[X_AXIS] - gridx, int gridx = constrain(int(ratio_x), 0, ABL_GRID_POINTS_X - 2),
ratio_y = cartesian[Y_AXIS] / bilinear_grid_spacing[Y_AXIS] - gridy, gridy = constrain(int(ratio_y), 0, ABL_GRID_POINTS_Y - 2);
// Subtract whole to get the ratio within the grid box
ratio_x -= gridx, ratio_y -= gridy;
// Z at the box corners // Z at the box corners
z1 = bed_level_grid[gridx][gridy], // left-front const float z1 = bed_level_grid[gridx][gridy], // left-front
z2 = bed_level_grid[gridx][gridy + 1], // left-back z2 = bed_level_grid[gridx][gridy + 1], // left-back
z3 = bed_level_grid[gridx + 1][gridy], // right-front z3 = bed_level_grid[gridx + 1][gridy], // right-front
z4 = bed_level_grid[gridx + 1][gridy + 1], // right-back z4 = bed_level_grid[gridx + 1][gridy + 1], // right-back
@ -7969,7 +7971,7 @@ void ok_to_send() {
SERIAL_ECHOPAIR(" z4=", z4); SERIAL_ECHOPAIR(" z4=", z4);
SERIAL_ECHOPAIR(" L=", L); SERIAL_ECHOPAIR(" L=", L);
SERIAL_ECHOPAIR(" R=", R); SERIAL_ECHOPAIR(" R=", R);
SERIAL_ECHOPAIR(" offset=", L + ratio_x * (R - L); SERIAL_ECHOPAIR(" offset=", L + ratio_x * (R - L));
//*/ //*/
return L + ratio_x * (R - L); return L + ratio_x * (R - L);