Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Added calculation of difference between auto-corrected bed level plane and measure topology. #2017

Closed
wants to merge 3 commits into from
Closed

Added calculation of difference between auto-corrected bed level plane and measure topology. #2017

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f1d143a
Merge pull request #1 from MarlinFirmware/Development
CptanPanic May 1, 2015
bb6da92
Add calculation of difference between auto-correct bed level plane, a…
CptanPanic May 4, 2015
9bde77c
Merge pull request #2 from MarlinFirmware/Development
CptanPanic Jul 6, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 37 additions & 3 deletions Marlin/Marlin_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2771,6 +2771,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 @@ -2781,10 +2784,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 @@ -2795,11 +2810,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