Browse Source

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
AnHardt 10 years ago
parent
commit
ed6598adf5
1 changed files with 27 additions and 28 deletions
  1. 27
    28
      Marlin/Marlin_main.cpp

+ 27
- 28
Marlin/Marlin_main.cpp View File

@@ -2786,20 +2786,20 @@ inline void gcode_G28() {
2786 2786
           SERIAL_PROTOCOLPGM("|...Front...|\n");
2787 2787
           SERIAL_PROTOCOLPGM("+-----------+\n");
2788 2788
 
2789
-	  float min_diff = 999;
2789
+          float min_diff = 999;
2790 2790
 
2791 2791
           for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
2792 2792
             for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
2793 2793
               int ind = yy * auto_bed_leveling_grid_points + xx;
2794 2794
               float diff = eqnBVector[ind] - mean;
2795 2795
 
2796
-	      float x_tmp = eqnAMatrix[ind + 0 * abl2],
2796
+              float x_tmp = eqnAMatrix[ind + 0 * abl2],
2797 2797
                 y_tmp = eqnAMatrix[ind + 1 * abl2],
2798 2798
                 z_tmp = 0;
2799 2799
 
2800
-	      apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);
2800
+              apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);
2801 2801
 
2802
-	      if (eqnBVector[ind] - z_tmp < min_diff)
2802
+              if (eqnBVector[ind] - z_tmp < min_diff)
2803 2803
                 min_diff = eqnBVector[ind] - z_tmp;
2804 2804
 
2805 2805
               if (diff >= 0.0)
@@ -2811,32 +2811,31 @@ inline void gcode_G28() {
2811 2811
             SERIAL_EOL;
2812 2812
           } // yy
2813 2813
           SERIAL_EOL;
2814
-
2815
-	  SERIAL_PROTOCOLPGM(" \nCorrected Bed Height vs. Bed Topology: \n");
2816
-
2817
-          for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
2818
-            for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
2819
-              int ind = yy * auto_bed_leveling_grid_points + xx;
2820
-              float x_tmp = eqnAMatrix[ind + 0 * abl2],
2821
-                y_tmp = eqnAMatrix[ind + 1 * abl2],
2822
-                z_tmp = 0;
2823
-
2824
-              apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);
2825
-
2826
-              float diff = eqnBVector[ind] - z_tmp - min_diff;
2827
-              if (diff >= 0.0)
2828
-                SERIAL_PROTOCOLPGM(" +");
2829
-              // Include + for column alignment
2830
-              else
2831
-                SERIAL_PROTOCOLCHAR(' ');
2832
-              SERIAL_PROTOCOL_F(diff, 5);
2833
-            } // xx
2814
+          if (verbose_level > 3) {
2815
+            SERIAL_PROTOCOLPGM(" \nCorrected Bed Height vs. Bed Topology: \n");
2816
+
2817
+            for (int yy = auto_bed_leveling_grid_points - 1; yy >= 0; yy--) {
2818
+              for (int xx = 0; xx < auto_bed_leveling_grid_points; xx++) {
2819
+                int ind = yy * auto_bed_leveling_grid_points + xx;
2820
+                float x_tmp = eqnAMatrix[ind + 0 * abl2],
2821
+                  y_tmp = eqnAMatrix[ind + 1 * abl2],
2822
+                  z_tmp = 0;
2823
+
2824
+                apply_rotation_xyz(plan_bed_level_matrix,x_tmp,y_tmp,z_tmp);
2825
+
2826
+                float diff = eqnBVector[ind] - z_tmp - min_diff;
2827
+                if (diff >= 0.0)
2828
+                  SERIAL_PROTOCOLPGM(" +");
2829
+                // Include + for column alignment
2830
+                else
2831
+                  SERIAL_PROTOCOLCHAR(' ');
2832
+                SERIAL_PROTOCOL_F(diff, 5);
2833
+              } // xx
2834
+              SERIAL_EOL;
2835
+            } // yy
2834 2836
             SERIAL_EOL;
2835
-          } // yy
2836
-          SERIAL_EOL;
2837
-
2837
+          }
2838 2838
         } //do_topography_map
2839
-
2840 2839
       #endif //!DELTA
2841 2840
 
2842 2841
     #else // !AUTO_BED_LEVELING_GRID

Loading…
Cancel
Save