From c40fe2113cfaec7f41221896217a9d3b1e39643b Mon Sep 17 00:00:00 2001
From: Tannoo <tannoo@msn.com>
Date: Fri, 30 Dec 2016 11:09:24 -0700
Subject: [PATCH] Fix for broken MBL
LCD call was waiting forever, causing the system to hang.
---
Marlin/ultralcd.cpp | 11 ++---------
README.md | 1 +
2 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 80d6d127e1..6b81fac83a 100755
--- a/Marlin/ultralcd.cpp
+++ b/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);
}
/**
diff --git a/README.md b/README.md
index 0df4f6ed75..42e5cfa960 100644
--- a/README.md
+++ b/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