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

Merge pull request #6258 from benlye/benlye-bilinearfix2

Browse Source 
Better fix for bilinear Z offset and G29 Z (update to #6251)
This commit is contained in:
Scott Lahteine 2017-04-06 20:51:57 -05:00 committed by GitHub
commit a0de5d94e2
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Marlin_main.cpp
View File

@ -4173,9 +4173,6 @@ inline void gcode_G28() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
zoffset = code_seen('Z') ? code_value_axis_units(Z_AXIS) : 0; zoffset = code_seen('Z') ? code_value_axis_units(Z_AXIS) : 0;
#if HAS_BED_PROBE
zoffset += zprobe_zoffset;
#endif
#endif #endif
@ -4350,7 +4347,7 @@ inline void gcode_G28() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #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) #elif ENABLED(AUTO_BED_LEVELING_3POINT)
@ -4522,7 +4519,7 @@ inline void gcode_G28() {
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR) #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
bed_level_grid[xCount][yCount] = measured_z; bed_level_grid[xCount][yCount] = measured_z + zoffset;
#endif #endif