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

Fix #4614: currentScreen only defined with ULTIPANEL

Browse Source
This commit is contained in:
Scott Lahteine 2016-08-14 00:29:46 -07:00 committed by GitHub
parent dcd26b0403
commit 132322e4d9
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/ultralcd.cpp
View File

@ -2686,6 +2686,12 @@ void lcd_update() {
break;
}
#if ENABLED(ULTIPANEL)
#define CURRENTSCREEN() (*currentScreen)()
#else
#define CURRENTSCREEN() lcd_status_screen()
#endif
#if ENABLED(DOGLCD) // Changes due to different driver architecture of the DOGM display
static int8_t dot_color = 0;
dot_color = 1 - dot_color;
@ -2696,12 +2702,10 @@ void lcd_update() {
u8g.setColorIndex(dot_color); // Set color for the alive dot
u8g.drawPixel(127, 63); // draw alive dot
u8g.setColorIndex(1); // black on white
(*currentScreen)();
CURRENTSCREEN();
} while (u8g.nextPage());
#elif ENABLED(ULTIPANEL)
(*currentScreen)();
#else
lcd_status_screen();
CURRENTSCREEN();
#endif
}