From 0c4f89370d05056faa789aa9cabcccc4e509fb9f Mon Sep 17 00:00:00 2001 From: Solomon Peachy Date: Sun, 19 Jul 2020 19:38:45 -0400 Subject: [2/4] get rid of HAVE_LCD_CHARCELLS HAVE_LCD_BITMAP is now redundant. lcd_bitmap is always-on in features.txt so manual and lang strings don't have to change Change-Id: I08eeb20de48099ffc2dc23782711af368c2ec794 --- apps/gui/splash.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'apps/gui/splash.c') diff --git a/apps/gui/splash.c b/apps/gui/splash.c index 2608a2e02e..56df77d57a 100644 --- a/apps/gui/splash.c +++ b/apps/gui/splash.c @@ -38,12 +38,6 @@ #define RECT_SPACING 2 #define SPLASH_MEMORY_INTERVAL (HZ) -#else /* HAVE_LCD_CHARCELLS */ - -#define MAXLINES 2 -#define MAXBUFFER 64 -#define RECT_SPACING 0 - #endif @@ -68,12 +62,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) screen->set_viewport(&vp); screen->getstringsize(" ", &space_w, &h); -#else /* HAVE_LCD_CHARCELLS */ - vp.width = screen->lcdwidth; - vp.height = screen->lcdheight; - - space_w = h = 1; - screen->double_height (false); #endif y = h; @@ -178,9 +166,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) /* prepare putting the text */ y = RECT_SPACING; -#else /* HAVE_LCD_CHARCELLS */ - y = 0; /* vertical centering on 2 lines would be silly */ - screen->clear_display(); #endif /* print the message to screen */ @@ -188,8 +173,6 @@ static void splash_internal(struct screen * screen, const char *fmt, va_list ap) { #ifdef HAVE_LCD_BITMAP screen->putsxy(0, y, lines[i]); -#else - screen->puts(0, y, lines[i]); #endif } screen->update_viewport(); -- cgit v1.2.3