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

Merge pull request #4154 from thinkyhead/rc_probe_raise_options

Browse Source 
Use Z_RAISE_BETWEEN_PROBINGS with MBL
This commit is contained in:
Scott Lahteine 2016-06-26 16:03:42 -07:00 committed by GitHub
commit 71a693b3ec
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -3137,7 +3137,9 @@ inline void gcode_G28() {
feedrate = homing_feedrate[X_AXIS]; feedrate = homing_feedrate[X_AXIS];
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if MIN_Z_HEIGHT_FOR_HOMING > 0 #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ Z_RAISE_BETWEEN_PROBINGS
#elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING + MIN_Z_HEIGHT_FOR_HOMING
#endif #endif
; ;
@ -3147,7 +3149,7 @@ inline void gcode_G28() {
current_position[Y_AXIS] = y + home_offset[Y_AXIS]; current_position[Y_AXIS] = y + home_offset[Y_AXIS];
line_to_current_position(); line_to_current_position();
#if MIN_Z_HEIGHT_FOR_HOMING > 0 #if Z_RAISE_BETWEEN_PROBINGS > 0 || MIN_Z_HEIGHT_FOR_HOMING > 0
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z; current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
line_to_current_position(); line_to_current_position();
#endif #endif
@ -3252,7 +3254,9 @@ inline void gcode_G28() {
else { else {
// One last "return to the bed" (as originally coded) at completion // One last "return to the bed" (as originally coded) at completion
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
#if MIN_Z_HEIGHT_FOR_HOMING > 0 #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
+ Z_RAISE_BETWEEN_PROBINGS
#elif MIN_Z_HEIGHT_FOR_HOMING > 0
+ MIN_Z_HEIGHT_FOR_HOMING + MIN_Z_HEIGHT_FOR_HOMING
#endif #endif
; ;