diff options
| -rw-r--r-- | apps/main.c | 2 | ||||
| -rw-r--r-- | firmware/drivers/lcd.c | 19 |
2 files changed, 11 insertions, 10 deletions
diff --git a/apps/main.c b/apps/main.c index 5f05bb5..203d8ca 100644 --- a/apps/main.c +++ b/apps/main.c @@ -72,9 +72,7 @@ int init(void) dmalloc_initialize(); bmalloc_add_pool(poolstart, poolend-poolstart); -#ifdef HAVE_LCD_BITMAP lcd_init(); -#endif show_logo(); #ifdef DEBUG diff --git a/firmware/drivers/lcd.c b/firmware/drivers/lcd.c index 55a3160..67d6f5e 100644 --- a/firmware/drivers/lcd.c +++ b/firmware/drivers/lcd.c @@ -374,9 +374,18 @@ void lcd_double_height(bool on) lcd_write(true,on?9:8); } -#endif +#endif /* !SIMULATOR */ + +#endif /* HAVE_LCD_CHARCELLS */ +#if defined(HAVE_LCD_CHARCELLS) || defined(SIMULATOR) /* not BITMAP */ +void lcd_init (void) +{ + create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); +} #endif + + #if defined(HAVE_LCD_BITMAP) || defined(SIMULATOR) /* not CHARCELLS */ /* @@ -417,13 +426,7 @@ static unsigned char ones[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, static char fonts[] = { 6,8,12 }; static char fontheight[] = { 8,12,16 }; -#ifdef SIMULATOR - -void lcd_init (void) -{ - create_thread(scroll_thread, scroll_stack, sizeof(scroll_stack)); -} -#else +#ifndef SIMULATOR /* * Initialize LCD |