Browse Source

Merge pull request #5837 from thinkyhead/rc_fix_mbl_homing

Fix broken homing in MBL
pull/1/head
Scott Lahteine 8 years ago
committed by GitHub
parent
commit
58b8e0cae7
  1. 11
      Marlin/ultralcd.cpp
  2. 1
      README.md

11
Marlin/ultralcd.cpp

@ -441,12 +441,6 @@ uint16_t max_display_update_time = 0;
lcd_goto_screen(old_screen);
}
inline void lcd_wait_for_homing() {
no_reentrance = true;
while (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) idle();
no_reentrance = false;
}
void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
void lcd_save_previous_screen() {
@ -1297,9 +1291,8 @@ KeepDrawing:
LCDVIEW_CALL_NO_REDRAW
#endif
;
if (no_reentrance) return;
lcd_wait_for_homing();
lcd_goto_screen(_lcd_level_bed_homing_done);
if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
lcd_goto_screen(_lcd_level_bed_homing_done);
}
/**

1
README.md

@ -18,6 +18,7 @@ The latest Release Candidate lives in the ["RC" branch](https://github.com/Marli
## Recent Changes
- RCBugFix
- Fixed broken MBL
- RC8 - 06 Dec 2016
- Major performance improvement for Graphical LCDs

Loading…
Cancel
Save