melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4014 from thinkyhead/rc_one_less_ultipanel_cond

Browse Source 
No need to check ULTIPANEL with DOGLCD
This commit is contained in:
Scott Lahteine 2016-06-11 17:39:42 -07:00 committed by GitHub
commit e51f8df097
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
Marlin/ultralcd.cpp
View File

@ -2311,18 +2311,12 @@ 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
#if ENABLED(ULTIPANEL)
(*currentScreen)();
#else
lcd_status_screen();
#endif
} while (u8g.nextPage());
#else
#if ENABLED(ULTIPANEL)
(*currentScreen)();
#else
lcd_status_screen();
#endif
} while (u8g.nextPage());
#elif ENABLED(ULTIPANEL)
(*currentScreen)();
#else
lcd_status_screen();
#endif
}