Przeglądaj źródła

Fix for broken MBL

LCD call was waiting forever, causing the system to hang.
Tannoo 7 lat temu
rodzic
commit
c40fe2113c
2 zmienionych plików z 3 dodań i 9 usunięć
  1. 2
    9
      Marlin/ultralcd.cpp
  2. 1
    0
      README.md

+ 2
- 9
Marlin/ultralcd.cpp Wyświetl plik

441
     lcd_goto_screen(old_screen);
441
     lcd_goto_screen(old_screen);
442
   }
442
   }
443
 
443
 
444
-  inline void lcd_wait_for_homing() {
445
-    no_reentrance = true;
446
-    while (!axis_homed[X_AXIS] || !axis_homed[Y_AXIS] || !axis_homed[Z_AXIS]) idle();
447
-    no_reentrance = false;
448
-  }
449
-
450
   void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
444
   void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
451
 
445
 
452
   void lcd_save_previous_screen() {
446
   void lcd_save_previous_screen() {
1297
           LCDVIEW_CALL_NO_REDRAW
1291
           LCDVIEW_CALL_NO_REDRAW
1298
         #endif
1292
         #endif
1299
       ;
1293
       ;
1300
-      if (no_reentrance) return;
1301
-      lcd_wait_for_homing();
1302
-      lcd_goto_screen(_lcd_level_bed_homing_done);
1294
+      if (axis_homed[X_AXIS] && axis_homed[Y_AXIS] && axis_homed[Z_AXIS])
1295
+        lcd_goto_screen(_lcd_level_bed_homing_done);
1303
     }
1296
     }
1304
 
1297
 
1305
     /**
1298
     /**

+ 1
- 0
README.md Wyświetl plik

18
 
18
 
19
 ## Recent Changes
19
 ## Recent Changes
20
 - RCBugFix
20
 - RCBugFix
21
+  - Fixed broken MBL
21
 
22
 
22
 - RC8 - 06 Dec 2016
23
 - RC8 - 06 Dec 2016
23
   - Major performance improvement for Graphical LCDs
24
   - Major performance improvement for Graphical LCDs

Ładowanie…
Anuluj
Zapisz