From: arighi <arighi@38d2e660-2303-0410-9eaa-f027e97ec537>
Date: Fri, 23 Apr 2010 14:58:46 +0000 (+0000)
Subject: lm3s1968: use the fixed-width Gohufont in the example.
X-Git-Tag: 2.5.0~397
X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=db501c41b9f1059f788df736ded544367125fec3;p=bertos.git

lm3s1968: use the fixed-width Gohufont in the example.

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3511 38d2e660-2303-0410-9eaa-f027e97ec537
---

diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c
index f77f43e4..d6bdb4cc 100644
--- a/examples/lm3s1968/lm3s1968.c
+++ b/examples/lm3s1968/lm3s1968.c
@@ -66,7 +66,7 @@ static PROC_DEFINE_STACK(ser_stack, PROC_STACK_SIZE);
 static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
 #endif
 
-extern Font font_helvB10;
+extern Font font_gohu;
 static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 static Bitmap lcd_bitmap;
 
@@ -250,14 +250,14 @@ static void context_switch_test(Bitmap *bm)
 
 static void uptime(Bitmap *bm)
 {
-	extern const Font font_ncenB18;
+	extern const Font font_luBS14;
 	const Font *old_font;
 
 	old_font = bm->font;
 
 	/* Set big font */
 	gfx_bitmapClear(bm);
-	gfx_setFont(bm, &font_ncenB18);
+	gfx_setFont(bm, &font_luBS14);
 	text_xprintf(bm, 0, 0, TEXT_FILL | TEXT_CENTER, "Uptime");
 	while (1)
 	{
@@ -276,12 +276,12 @@ static void uptime(Bitmap *bm)
 
 static void NORETURN soft_reset(Bitmap * bm)
 {
-	extern const Font font_ncenB18;
+	extern const Font font_luBS14;
 	int i;
 
 	/* Set big font */
 	gfx_bitmapClear(bm);
-	gfx_setFont(bm, &font_ncenB18);
+	gfx_setFont(bm, &font_luBS14);
 	for (i = 5; i; --i)
 	{
 		text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "%d", i);
@@ -343,7 +343,7 @@ int main(void)
 	kputs("Init OLED display..");
 	rit128x96_init();
 	gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
-	gfx_setFont(&lcd_bitmap, &font_helvB10);
+	gfx_setFont(&lcd_bitmap, &font_gohu);
 	rit128x96_blitBitmap(&lcd_bitmap);
 	kputs("Done.\n");
 	kputs("Init Keypad..");
diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk
index 9bbfe705..0dca92fd 100644
--- a/examples/lm3s1968/lm3s1968.mk
+++ b/examples/lm3s1968/lm3s1968.mk
@@ -25,9 +25,8 @@ lm3s1968_CSRC = \
 	bertos/gfx/text.c \
 	bertos/gfx/text_format.c \
 	bertos/gui/menu.c \
-	bertos/fonts/helvB10.c \
+	bertos/fonts/gohu.c \
 	bertos/fonts/luBS14.c \
-	bertos/fonts/ncenB18.c \
 	bertos/icons/logo.c \
 	bertos/mware/formatwr.c \
 	bertos/mware/hex.c \