Merge https://github.com/ErikZalm/Marlin into Marlin_v1

2014-05-09 15:02:50 +01:00
parent 6adbdf42e0 2acd3792fc
commit e541323741
14 changed files with 1465 additions and 9 deletions
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@ -194,6 +194,7 @@ static void lcd_status_screen()
        currentMenu = lcd_main_menu;
        encoderPosition = 0;
        lcd_quick_feedback();
+        lcd_implementation_init(); // to maybe revive the LCD if static electricity killed it.
    }

 #ifdef ULTIPANEL_FEEDMULTIPLY