thebears/marlin_skr
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix large Z corrections when nozzle moves off of UBL mesh (#7415)

Browse Source
This commit is contained in:
Roxy-3D
2017-08-02 16:51:04 -05:00
committed by GitHub
parent ce65c13a97
commit 2cbdc0ebb6
2 changed files with 30 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Marlin/ubl_motion.cpp
View File

@@ -173,12 +173,18 @@
* to create a 1-over number for us. That will allow us to do a floating point multiply instead of a floating point divide.
*/
const float xratio = (RAW_X_POSITION(end[X_AXIS]) - mesh_index_to_xpos(cell_dest_xi)) * (1.0 / (MESH_X_DIST)),
z1 = z_values[cell_dest_xi ][cell_dest_yi ] + xratio *
const float xratio = (RAW_X_POSITION(end[X_AXIS]) - mesh_index_to_xpos(cell_dest_xi)) * (1.0 / (MESH_X_DIST));
float z1 = z_values[cell_dest_xi ][cell_dest_yi ] + xratio *
(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]);
if ( cell_dest_xi >= GRID_MAX_POINTS_X-1) {
z1 = 0.0;
z2 = 0.0;
}
// we are done with the fractional X distance into the cell. Now with the two Z-Heights we have calculated, we
// are going to apply the Y-Distance into the cell to interpolate the final Z correction.
@@ -186,6 +192,9 @@
float z0 = z1 + (z2 - z1) * yratio;
if ( cell_dest_yi >= GRID_MAX_POINTS_Y-1)
z0 = 0.0;
z0 *= fade_scaling_factor_for_z(end[Z_AXIS]);
/**