MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #8322 from thinkyhead/bf1_sprintf_p_fix

Browse Source 
[1.1] Followup to G33/LCD patch #8318
This commit is contained in:
Scott Lahteine 2017-11-08 01:00:18 -06:00 committed by GitHub
commit 77cef3bef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Marlin/ultralcd.cpp
View File

@ -4746,11 +4746,8 @@ void lcd_update() {
#endif #endif
if ((lcdDrawUpdate || IS_DRAWING) && (!bbr2 || bbr2 > max_display_update_time)) { if ((lcdDrawUpdate || IS_DRAWING) && (!bbr2 || bbr2 > max_display_update_time)) {
#if ENABLED(DOGLCD)
if (!drawing_screen) if (!IS_DRAWING) switch (lcdDrawUpdate) {
#endif
{
switch (lcdDrawUpdate) {
case LCDVIEW_CALL_NO_REDRAW: case LCDVIEW_CALL_NO_REDRAW:
lcdDrawUpdate = LCDVIEW_NONE; lcdDrawUpdate = LCDVIEW_NONE;
break; break;
@ -4761,7 +4758,6 @@ void lcd_update() {
case LCDVIEW_NONE: case LCDVIEW_NONE:
break; break;
} // switch } // switch
}
#if ENABLED(ADC_KEYPAD) #if ENABLED(ADC_KEYPAD)
buttons_reprapworld_keypad = 0; buttons_reprapworld_keypad = 0;
@ -4773,14 +4769,18 @@ void lcd_update() {
#define CURRENTSCREEN() lcd_status_screen() #define CURRENTSCREEN() lcd_status_screen()
#endif #endif
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display #if ENABLED(DOGLCD)
if (!drawing_screen) { if (!drawing_screen) { // If not already drawing pages
u8g.firstPage(); u8g.firstPage(); // Start the first page
drawing_screen = 1; drawing_screen = 1; // Flag as drawing pages
} }
lcd_setFont(FONT_MENU); lcd_setFont(FONT_MENU); // Setup font for every page draw
u8g.setColorIndex(1); u8g.setColorIndex(1); // And reset the color
CURRENTSCREEN(); CURRENTSCREEN(); // Draw and process the current screen
// The screen handler can clear drawing_screen for an action that changes the screen.
// If still drawing and there's another page, update max-time and return now.
// The nextPage will already be set up on the next call.
if (drawing_screen && (drawing_screen = u8g.nextPage())) { if (drawing_screen && (drawing_screen = u8g.nextPage())) {
NOLESS(max_display_update_time, millis() - ms); NOLESS(max_display_update_time, millis() - ms);
return; return;
@ -4788,6 +4788,9 @@ void lcd_update() {
#else #else
CURRENTSCREEN(); CURRENTSCREEN();
#endif #endif
// Keeping track of the longest time for an individual LCD update.
// Used to do screen throttling when the planner starts to fill up.
NOLESS(max_display_update_time, millis() - ms); NOLESS(max_display_update_time, millis() - ms);
} }
@ -4801,11 +4804,7 @@ void lcd_update() {
#endif // ULTIPANEL #endif // ULTIPANEL
#if ENABLED(DOGLCD) if (!IS_DRAWING) switch (lcdDrawUpdate) {
if (!drawing_screen)
#endif
{
switch (lcdDrawUpdate) {
case LCDVIEW_CLEAR_CALL_REDRAW: case LCDVIEW_CLEAR_CALL_REDRAW:
lcd_implementation_clear(); lcd_implementation_clear();
case LCDVIEW_CALL_REDRAW_NEXT: case LCDVIEW_CALL_REDRAW_NEXT:
@ -4817,7 +4816,7 @@ void lcd_update() {
case LCDVIEW_NONE: case LCDVIEW_NONE:
break; break;
} // switch } // switch
}
} // ELAPSED(ms, next_lcd_update_ms) } // ELAPSED(ms, next_lcd_update_ms)
} }