Browse Source

Fix ABL broken by recent change

Scott Lahteine 7 years ago
parent
commit
8c2907d10f
1 changed files with 7 additions and 11 deletions
  1. 7
    11
      Marlin/Marlin_main.cpp

+ 7
- 11
Marlin/Marlin_main.cpp View File

@@ -4617,11 +4617,11 @@ void home_all_axes() { gcode_G28(true); }
4617 4617
 
4618 4618
         #if ENABLED(AUTO_BED_LEVELING_LINEAR)
4619 4619
 
4620
-//        mean += measured_z;                                  // I believe this is unused code?
4621
-//        eqnBVector[abl_probe_index] = measured_z;            // I believe this is unused code?
4622
-//        eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe;     // I believe this is unused code?
4623
-//        eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe;     // I believe this is unused code?
4624
-//        eqnAMatrix[abl_probe_index + 2 * abl2] = 1;          // I believe this is unused code?
4620
+          mean += measured_z;
4621
+          eqnBVector[abl_probe_index] = measured_z;
4622
+          eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe;
4623
+          eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe;
4624
+          eqnAMatrix[abl_probe_index + 2 * abl2] = 1;
4625 4625
 
4626 4626
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
4627 4627
 
@@ -4797,9 +4797,6 @@ void home_all_axes() { gcode_G28(true); }
4797 4797
 
4798 4798
               incremental_LSF(&lsf_results, xProbe, yProbe, measured_z);
4799 4799
 
4800
-          #if ENABLED(AUTO_BED_LEVELING_LINEAR)
4801
-            indexIntoAB[xCount][yCount] = abl_probe_index;
4802
-          #endif
4803 4800
             #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
4804 4801
 
4805 4802
               z_values[xCount][yCount] = measured_z + zoffset;
@@ -4924,11 +4921,10 @@ void home_all_axes() { gcode_G28(true); }
4924 4921
       }
4925 4922
 
4926 4923
       // Create the matrix but don't correct the position yet
4927
-      if (!dryrun) {
4924
+      if (!dryrun)
4928 4925
         planner.bed_level_matrix = matrix_3x3::create_look_at(
4929
-          vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1)    // We can eleminate the '-' here and up above
4926
+          vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1)    // We can eliminate the '-' here and up above
4930 4927
         );
4931
-      }
4932 4928
 
4933 4929
       // Show the Topography map if enabled
4934 4930
       if (do_topography_map) {

Loading…
Cancel
Save