CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ABL broken by recent change

Browse Source
This commit is contained in:
Scott Lahteine 2017-07-12 22:47:23 -05:00
parent 9af67e2446
commit 8c2907d10f
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Marlin/Marlin_main.cpp
View File

@ -4617,11 +4617,11 @@ void home_all_axes() { gcode_G28(true); }
#if ENABLED(AUTO_BED_LEVELING_LINEAR) #if ENABLED(AUTO_BED_LEVELING_LINEAR)
// mean += measured_z; // I believe this is unused code? mean += measured_z;
// eqnBVector[abl_probe_index] = measured_z; // I believe this is unused code? eqnBVector[abl_probe_index] = measured_z;
// eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe; // I believe this is unused code? eqnAMatrix[abl_probe_index + 0 * abl2] = xProbe;
// eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe; // I believe this is unused code? eqnAMatrix[abl_probe_index + 1 * abl2] = yProbe;
// eqnAMatrix[abl_probe_index + 2 * abl2] = 1; // I believe this is unused code? eqnAMatrix[abl_probe_index + 2 * abl2] = 1;
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
@ -4797,9 +4797,6 @@ void home_all_axes() { gcode_G28(true); }
incremental_LSF(&lsf_results, xProbe, yProbe, measured_z); incremental_LSF(&lsf_results, xProbe, yProbe, measured_z);
#if ENABLED(AUTO_BED_LEVELING_LINEAR)
indexIntoAB[xCount][yCount] = abl_probe_index;
#endif
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
z_values[xCount][yCount] = measured_z + zoffset; z_values[xCount][yCount] = measured_z + zoffset;
@ -4924,11 +4921,10 @@ void home_all_axes() { gcode_G28(true); }
} }
// Create the matrix but don't correct the position yet // Create the matrix but don't correct the position yet
if (!dryrun) { if (!dryrun)
planner.bed_level_matrix = matrix_3x3::create_look_at( planner.bed_level_matrix = matrix_3x3::create_look_at(
vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1) // We can eleminate the '-' here and up above vector_3(-plane_equation_coefficients[0], -plane_equation_coefficients[1], 1) // We can eliminate the '-' here and up above
); );
}
// Show the Topography map if enabled // Show the Topography map if enabled
if (do_topography_map) { if (do_topography_map) {