From c20606b8d75b08cf3da7af2e10cbe1b15beb2893 Mon Sep 17 00:00:00 2001 From: AnHardt Date: Tue, 3 Feb 2015 09:52:29 +0100 Subject: [PATCH] Replaced some literal constants with defines Replaced calculation to centre bitmap with fixed values. Saved 20 bytes. --- Marlin/DOGMbitmaps.h | 4 +++- Marlin/dogm_lcd_implementation.h | 10 +++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Marlin/DOGMbitmaps.h b/Marlin/DOGMbitmaps.h index b735477e3f..8c8356785a 100644 --- a/Marlin/DOGMbitmaps.h +++ b/Marlin/DOGMbitmaps.h @@ -1,6 +1,8 @@ // BitMap for splashscreen // Generated with: http://www.digole.com/tools/PicturetoC_Hex_converter.php -// Please note that using the high-res version takes about 0.5KB of +// Please note that using the high-res version takes 402Bytes of PROGMEM. +//#define START_BMPHIGH + #ifdef START_BMPHIGH #define START_BMPWIDTH 112 #define START_BMPHEIGHT 38 diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index e901a7da22..7b7c319944 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -109,9 +109,13 @@ static void lcd_implementation_init() // Show splashscreen int offx = (u8g.getWidth() - START_BMPWIDTH) / 2; - int offy = (u8g.getHeight() - 18 - START_BMPHEIGHT) / 2; - int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*6) / 2; // 6 is fontwidth in pixel - int txtY = u8g.getHeight() - 10; + #ifdef START_BMPHIGH + int offy = 0; + #else + int offy = DOG_CHAR_HEIGHT; + #endif + int txtX = (u8g.getWidth() - (sizeof(STRING_SPLASH) - 1)*DOG_CHAR_WIDTH) / 2; + int txtY = u8g.getHeight() - DOG_CHAR_HEIGHT; u8g.firstPage(); do { u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);