From f1d50ac1dcb9d73cf629a5295d9b4b64a6e3d86a Mon Sep 17 00:00:00 2001
From: benlye <ben@lye.co.nz>
Date: Thu, 6 Apr 2017 07:41:46 +0100
Subject: [PATCH] Fixing bilinear Z offset and G29 Z
The fix in #6251 for bilinear Z offset was flawed and broke the Z parameter of G29 for bilinear levelling. This is reverted and a different fix is used for the double-addition of the Z-probe offset to the bilinear correction grid.
---
Marlin/Marlin_main.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 817c4f9341..eb47588510 100755
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -4159,9 +4159,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
@@ -4336,7 +4333,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)
@@ -4508,7 +4505,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