X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Flm3s1968%2Flm3s1968.c;h=d6bdb4cce9649a52eb017c0b1d083a40927117f3;hb=caa730dbc7128c09b5a5b883aa2ad97fe23e799d;hp=263712be161306d517e72073bf51f4be89eb1b30;hpb=06f6a1afc7157d25c3dae42af3478e4f0b31a2af;p=bertos.git

diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c
index 263712be..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;
 
@@ -157,7 +157,7 @@ static void bouncing_logo(Bitmap *bm)
 			(LCD_HEIGHT - bertos_logo.height) / 2 + h / SPEED_SCALE,
 			&bertos_logo);
 		text_xprintf(bm, 7, 0, TEXT_FILL | TEXT_CENTER, "Press SELECT to quit");
-		rit128x96_lcd_blitBitmap(bm);
+		rit128x96_blitBitmap(bm);
 		timer_delay(5);
 		if (kbd_peek() & KEY_MASK)
 			break;
@@ -179,7 +179,7 @@ static void screen_saver(Bitmap *bm)
 
 		gfx_bitmapClear(bm);
 		gfx_rectDraw(bm, x1, y1, x2, y2);
-		rit128x96_lcd_blitBitmap(bm);
+		rit128x96_blitBitmap(bm);
 		if (kbd_peek() & KEY_MASK)
 			break;
 	}
@@ -229,7 +229,7 @@ static void res_process(void)
 			" %lu.%lu usec",
 				((end - start) * 1000000) / CPU_FREQ,
 				((end - start) * (100000000 / CPU_FREQ)) % 100);
-		rit128x96_lcd_blitBitmap(&lcd_bitmap);
+		rit128x96_blitBitmap(&lcd_bitmap);
 		timer_delay(5);
 		if (kbd_peek() & KEY_MASK)
 			break;
@@ -241,23 +241,23 @@ static void context_switch_test(Bitmap *bm)
 	gfx_bitmapClear(bm);
 	text_xprintf(bm, 0, 0, TEXT_FILL,
 			"CPU: Cortex-M3 %luMHz", CPU_FREQ / 1000000);
-	rit128x96_lcd_blitBitmap(bm);
+	rit128x96_blitBitmap(bm);
 	text_xprintf(bm, 1, 0, TEXT_FILL, "Board: LM3S1968 EVB");
-	rit128x96_lcd_blitBitmap(bm);
+	rit128x96_blitBitmap(bm);
 
 	res_process();
 }
 
 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)
 	{
@@ -266,7 +266,7 @@ static void uptime(Bitmap *bm)
 		/* Display uptime (in ticks) */
 		text_xprintf(&lcd_bitmap, 2, 0, TEXT_FILL | TEXT_CENTER,
 				"%lu", clock / 1000);
-		rit128x96_lcd_blitBitmap(bm);
+		rit128x96_blitBitmap(bm);
 		timer_delay(5);
 		if (kbd_peek() & KEY_MASK)
 			break;
@@ -276,20 +276,20 @@ 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);
-		rit128x96_lcd_blitBitmap(bm);
+		rit128x96_blitBitmap(bm);
 		timer_delay(1000);
 	}
 	text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "REBOOT");
-	rit128x96_lcd_blitBitmap(bm);
+	rit128x96_blitBitmap(bm);
 	timer_delay(1000);
 
 	/* Perform a software reset request */
@@ -341,10 +341,10 @@ int main(void)
 	proc_init();
 	kputs("Done.\n");
 	kputs("Init OLED display..");
-	rit128x96_lcd_init();
+	rit128x96_init();
 	gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT);
-	gfx_setFont(&lcd_bitmap, &font_helvB10);
-	rit128x96_lcd_blitBitmap(&lcd_bitmap);
+	gfx_setFont(&lcd_bitmap, &font_gohu);
+	rit128x96_blitBitmap(&lcd_bitmap);
 	kputs("Done.\n");
 	kputs("Init Keypad..");
 	kbd_init();