CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made centering of bootlogo work and removed contraproductiv setScale2x2() in dogm_lcd_implementation.h

Browse Source
This commit is contained in:
AnHardt 2015-01-26 17:26:22 +01:00
parent 0d219b3e14
commit aa48056c03
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/dogm_lcd_implementation.h
View File

@ -117,18 +117,13 @@ static void lcd_implementation_init()
} while(u8g.nextPage()); } while(u8g.nextPage());
// Show splashscreen // Show splashscreen
int off = (u8g.getWidth() - START_BMPWIDTH) / 2; int offx = (u8g.getWidth() - START_BMPWIDTH) / 2;
int offy = (u8g.getHeight() - 18 - START_BMPHEIGHT) / 2;
int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*5) / 2; // 5 is fontwidth in pixel int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*5) / 2; // 5 is fontwidth in pixel
int txtY = u8g.getHeight() - 10; int txtY = u8g.getHeight() - 10;
u8g.firstPage(); u8g.firstPage();
do { do {
#ifdef START_BMPHIGH u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
#else
u8g.setScale2x2();
u8g.drawBitmapP(off, off, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
u8g.undoScale();
#endif
u8g.setFont(u8g_font_5x8); u8g.setFont(u8g_font_5x8);
u8g.drawStr(txtX, txtY, STRING_SPLASH); u8g.drawStr(txtX, txtY, STRING_SPLASH);