Skip to content

Commit

Permalink
Add calculation of difference between auto-correct bed level plane, a…
Browse files Browse the repository at this point in the history
…nd measured topo map.
  • Loading branch information
CptanPanic committed May 4, 2015
1 parent f1d143a commit bb6da92
Showing 1 changed file with 37 additions and 3 deletions.
40 changes: 37 additions & 3 deletions Marlin/Marlin_main.cpp
Expand Up @@ -2488,6 +2488,9 @@ inline void gcode_G28() {
}
}

if (!dryrun) set_bed_level_equation_lsq(plane_equation_coefficients);
free(plane_equation_coefficients);

// Show the Topography map if enabled
if (do_topography_map) {

Expand All @@ -2498,10 +2501,22 @@ inline void gcode_G28() {
SERIAL_PROTOCOLPGM("|...Front...|\n");
SERIAL_PROTOCOLPGM("+-----------+\n");

float min_diff = 999;

for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
int ind = yy * auto_bed_leveling_grid_points + xx;
float diff = eqnBVector[ind] - mean;

float x_tmp = eqnAMatrix[ind + 0 * abl2],
y_tmp = eqnAMatrix[ind + 1 * abl2],
z_tmp = 0;

apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);

if (eqnBVector[ind] - z_tmp < min_diff)
min_diff = eqnBVector[ind] - z_tmp;

if (diff >= 0.0)
SERIAL_PROTOCOLPGM(" +"); // Include + for column alignment
else
Expand All @@ -2512,11 +2527,30 @@ inline void gcode_G28() {
} // yy
SERIAL_EOL;

} //do_topography_map
SERIAL_PROTOCOLPGM(" \nCorrected Bed Height vs. Bed Topology: \n");

for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
int ind = yy * auto_bed_leveling_grid_points + xx;
float x_tmp = eqnAMatrix[ind + 0 * abl2],
y_tmp = eqnAMatrix[ind + 1 * abl2],
z_tmp = 0;

if (!dryrun) set_bed_level_equation_lsq(plane_equation_coefficients);
free(plane_equation_coefficients);
apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);

float diff = eqnBVector[ind] - z_tmp - min_diff;
if (diff >= 0.0)
SERIAL_PROTOCOLPGM(" +");
// Include + for column alignment
else
SERIAL_PROTOCOLCHAR(' ');
SERIAL_PROTOCOL_F(diff, 5);
} // xx
SERIAL_EOL;
} // yy
SERIAL_EOL;

} //do_topography_map

#endif //!DELTA

Expand Down

0 comments on commit bb6da92

Please sign in to comment.