Merge pull request #6258 from benlye/benlye-bilinearfix2

Better fix for bilinear Z offset and G29 Z (update to #6251)
8 years ago · a0de5d94e2
parent b23aef5b8d f1d50ac1dc
commit a0de5d94e2
1 changed files with 2 additions and 5 deletions
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@ -4173,9 +4173,6 @@ inline void gcode_G28() {
      #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)

        zoffset = code_seen('Z') ? code_value_axis_units(Z_AXIS) : 0;
-        #if HAS_BED_PROBE
-          zoffset += zprobe_zoffset;
-        #endif

      #endif

@ -4350,7 +4347,7 @@ inline void gcode_G28() {

        #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)

-          bed_level_grid[xCount][yCount] = measured_z;
+          bed_level_grid[xCount][yCount] = measured_z + zoffset;

        #elif ENABLED(AUTO_BED_LEVELING_3POINT)

@ -4522,7 +4519,7 @@ inline void gcode_G28() {

            #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)

-              bed_level_grid[xCount][yCount] = measured_z;
+              bed_level_grid[xCount][yCount] = measured_z + zoffset;

            #endif