Merge pull request #3541 from thinkyhead/rc_mbl_one_last_lift

Add a final lift, if configured, in Manual Bed Leveling

Marlin/Marlin_main.cpp

@@ -2951,7 +2951,11 @@ inline void gcode_G28() {
         }
         else {
           // 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
+              + MIN_Z_HEIGHT_FOR_HOMING
+            #endif
+          ;
           line_to_current_position();
           st_synchronize();
 

Marlin/ultralcd.cpp

@@ -960,7 +960,11 @@ void lcd_cooldown() {
             buzz(200, 659);
             buzz(200, 698);
           #endif
-          current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
+          current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
+            #if MIN_Z_HEIGHT_FOR_HOMING > 0
+              + MIN_Z_HEIGHT_FOR_HOMING
+            #endif
+          ;
           line_to_current(Z_AXIS);
           st_synchronize();
           mbl.active = true;