bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Fix MBL lift

Browse Source
This commit is contained in:
Scott Lahteine
2016-04-16 14:17:06 -07:00
parent a5452902a6
commit 234987ee2f
2 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@@ -2847,10 +2847,12 @@ inline void gcode_G28() {
saved_feedrate = feedrate; saved_feedrate = feedrate;
feedrate = homing_feedrate[X_AXIS]; feedrate = homing_feedrate[X_AXIS];
#if MIN_Z_HEIGHT_FOR_HOMING > 0 current_position[Z_AXIS] = MESH_HOME_SEARCH_Z
current_position[Z_AXIS] = MESH_HOME_SEARCH_Z + MIN_Z_HEIGHT_FOR_HOMING; #if MIN_Z_HEIGHT_FOR_HOMING > 0
line_to_current_position(); + MIN_Z_HEIGHT_FOR_HOMING
#endif #endif
;
line_to_current_position();
current_position[X_AXIS] = x + home_offset[X_AXIS]; current_position[X_AXIS] = x + home_offset[X_AXIS];
current_position[Y_AXIS] = y + home_offset[Y_AXIS]; current_position[Y_AXIS] = y + home_offset[Y_AXIS];

10
Marlin/ultralcd.cpp
View File

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