From ed6598adf5a1fbe3e5d74479446124b551342270 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 14 Jul 2015 19:44:28 +0200 Subject: [PATCH] Corrected Bed Height vs. Bed Topology for verbosity > 3 and cleaned out some tabs. Everything else is a rebased PR#2017 as proposed by @CptanPanic --- Marlin/Marlin_main.cpp | 55 +++++++++++++++++++++--------------------- 1 file changed, 27 insertions(+), 28 deletions(-) diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp index fbefc36848..537fe9b030 100644 --- a/Marlin/Marlin_main.cpp +++ b/Marlin/Marlin_main.cpp @@ -2786,20 +2786,20 @@ inline void gcode_G28() { SERIAL_PROTOCOLPGM("|...Front...|\n"); SERIAL_PROTOCOLPGM("+-----------+\n"); - float min_diff = 999; + 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], + 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); + apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp); - if (eqnBVector[ind] - z_tmp < min_diff) + if (eqnBVector[ind] - z_tmp < min_diff) min_diff = eqnBVector[ind] - z_tmp; if (diff >= 0.0) @@ -2811,32 +2811,31 @@ inline void gcode_G28() { SERIAL_EOL; } // yy SERIAL_EOL; - - 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; - - 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 + if (verbose_level > 3) { + 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; + + 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; - } // yy - SERIAL_EOL; - + } } //do_topography_map - #endif //!DELTA #else // !AUTO_BED_LEVELING_GRID