Browse Source

Merge pull request #6258 from benlye/benlye-bilinearfix2

Better fix for bilinear Z offset and G29 Z (update to #6251)
Scott Lahteine 8 years ago
parent
commit
a0de5d94e2
1 changed files with 2 additions and 5 deletions
  1. 2
    5
      Marlin/Marlin_main.cpp

+ 2
- 5
Marlin/Marlin_main.cpp View File

@@ -4173,9 +4173,6 @@ inline void gcode_G28() {
4173 4173
       #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
4174 4174
 
4175 4175
         zoffset = code_seen('Z') ? code_value_axis_units(Z_AXIS) : 0;
4176
-        #if HAS_BED_PROBE
4177
-          zoffset += zprobe_zoffset;
4178
-        #endif
4179 4176
 
4180 4177
       #endif
4181 4178
 
@@ -4350,7 +4347,7 @@ inline void gcode_G28() {
4350 4347
 
4351 4348
         #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
4352 4349
 
4353
-          bed_level_grid[xCount][yCount] = measured_z;
4350
+          bed_level_grid[xCount][yCount] = measured_z + zoffset;
4354 4351
 
4355 4352
         #elif ENABLED(AUTO_BED_LEVELING_3POINT)
4356 4353
 
@@ -4522,7 +4519,7 @@ inline void gcode_G28() {
4522 4519
 
4523 4520
             #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
4524 4521
 
4525
-              bed_level_grid[xCount][yCount] = measured_z;
4522
+              bed_level_grid[xCount][yCount] = measured_z + zoffset;
4526 4523
 
4527 4524
             #endif
4528 4525
 

Loading…
Cancel
Save