Browse Source

Fix MBL lift

Scott Lahteine 9 years ago
parent
commit
234987ee2f
2 changed files with 12 additions and 8 deletions
  1. 6
    4
      Marlin/Marlin_main.cpp
  2. 6
    4
      Marlin/ultralcd.cpp

+ 6
- 4
Marlin/Marlin_main.cpp View File

@@ -2847,10 +2847,12 @@ inline void gcode_G28() {
2847 2847
     saved_feedrate = feedrate;
2848 2848
     feedrate = homing_feedrate[X_AXIS];
2849 2849
 
2850
-    #if MIN_Z_HEIGHT_FOR_HOMING > 0
2851
-      current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + MIN_Z_HEIGHT_FOR_HOMING;
2852
-      line_to_current_position();
2853
-    #endif
2850
+    current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
2851
+      #if MIN_Z_HEIGHT_FOR_HOMING > 0
2852
+        + MIN_Z_HEIGHT_FOR_HOMING
2853
+      #endif
2854
+    ;
2855
+    line_to_current_position();
2854 2856
 
2855 2857
     current_position[X_AXIS] = x + home_offset[X_AXIS];
2856 2858
     current_position[Y_AXIS] = y + home_offset[Y_AXIS];

+ 6
- 4
Marlin/ultralcd.cpp View File

@@ -893,10 +893,12 @@ void lcd_cooldown() {
893 893
   // Z position will be restored with the final action, a G28
894 894
   inline void _mbl_goto_xy(float x, float y) {
895 895
     mbl_wait_for_move = true;
896
-    #if MIN_Z_HEIGHT_FOR_HOMING > 0
897
-      current_position[Z_AXIS] += MIN_Z_HEIGHT_FOR_HOMING;
898
-      line_to_current(Z_AXIS);
899
-    #endif
896
+    current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
897
+      #if MIN_Z_HEIGHT_FOR_HOMING > 0
898
+        + MIN_Z_HEIGHT_FOR_HOMING
899
+      #endif
900
+    ;
901
+    line_to_current(Z_AXIS);
900 902
     current_position[X_AXIS] = x + home_offset[X_AXIS];
901 903
     current_position[Y_AXIS] = y + home_offset[Y_AXIS];
902 904
     line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);

Loading…
Cancel
Save