Browse Source

Use Z_RAISE_BETWEEN_PROBINGS with MBL

Scott Lahteine 8 years ago
parent
commit
829c92f1ba
1 changed files with 7 additions and 3 deletions
  1. 7
    3
      Marlin/Marlin_main.cpp

+ 7
- 3
Marlin/Marlin_main.cpp View File

3137
     feedrate = homing_feedrate[X_AXIS];
3137
     feedrate = homing_feedrate[X_AXIS];
3138
 
3138
 
3139
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3139
     current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3140
-      #if MIN_Z_HEIGHT_FOR_HOMING > 0
3140
+      #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
3141
+        + Z_RAISE_BETWEEN_PROBINGS
3142
+      #elif MIN_Z_HEIGHT_FOR_HOMING > 0
3141
         + MIN_Z_HEIGHT_FOR_HOMING
3143
         + MIN_Z_HEIGHT_FOR_HOMING
3142
       #endif
3144
       #endif
3143
     ;
3145
     ;
3147
     current_position[Y_AXIS] = y + home_offset[Y_AXIS];
3149
     current_position[Y_AXIS] = y + home_offset[Y_AXIS];
3148
     line_to_current_position();
3150
     line_to_current_position();
3149
 
3151
 
3150
-    #if MIN_Z_HEIGHT_FOR_HOMING > 0
3152
+    #if Z_RAISE_BETWEEN_PROBINGS > 0 || MIN_Z_HEIGHT_FOR_HOMING > 0
3151
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
3153
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
3152
       line_to_current_position();
3154
       line_to_current_position();
3153
     #endif
3155
     #endif
3252
         else {
3254
         else {
3253
           // One last "return to the bed" (as originally coded) at completion
3255
           // One last "return to the bed" (as originally coded) at completion
3254
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3256
           current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
3255
-            #if MIN_Z_HEIGHT_FOR_HOMING > 0
3257
+            #if Z_RAISE_BETWEEN_PROBINGS > MIN_Z_HEIGHT_FOR_HOMING
3258
+              + Z_RAISE_BETWEEN_PROBINGS
3259
+            #elif MIN_Z_HEIGHT_FOR_HOMING > 0
3256
               + MIN_Z_HEIGHT_FOR_HOMING
3260
               + MIN_Z_HEIGHT_FOR_HOMING
3257
             #endif
3261
             #endif
3258
           ;
3262
           ;

Loading…
Cancel
Save