X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Flm3s1968%2Flm3s1968.c;h=8ae3b4a1eb21f6c7ae555eb06d23fefff808afe0;hb=c851049cc46e33cbcff7c43ce69400798eb8e209;hp=f77f43e41a6da2e5983436c6de7f25d1a8d87b8d;hpb=d76509a30e7b0ff2440538e2a06210dc64da9214;p=bertos.git

diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c
index f77f43e4..8ae3b4a1 100644
--- a/examples/lm3s1968/lm3s1968.c
+++ b/examples/lm3s1968/lm3s1968.c
@@ -35,22 +35,29 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
+#include "hw/hw_rit128x96.h"
+
+#include "cfg/compiler.h"
+#include "cfg/cfg_gfx.h"
+
 #include <cpu/irq.h>
+
 #include <drv/timer.h>
 #include <drv/ser.h>
 #include <drv/kbd.h>
 #include <drv/lcd_rit128x96.h>
+
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
+
 #include <gui/menu.h>
+
 #include <icons/logo.h>
+
 #include <stdio.h>
 
-#include "cfg/compiler.h"
-#include "cfg/cfg_gfx.h"
 
-#include "hw/hw_rit128x96.h"
 
 #define PROC_STACK_SIZE	KERN_MINSTACKSIZE * 2
 
@@ -66,7 +73,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 +257,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 +283,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);
@@ -316,15 +323,16 @@ static void NORETURN ser_process(void)
 
 static struct MenuItem main_items[] =
 {
-	{ (const_iptr_t)"LED blinking", 0, (MenuHook)led_test, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)"Bouncing logo", 0, (MenuHook)bouncing_logo, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)"Screen saver demo", 0, (MenuHook)screen_saver, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)"Scheduling test", 0, (MenuHook)context_switch_test, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)"Show uptime", 0, (MenuHook)uptime, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)"Reboot", 0, (MenuHook)soft_reset, (iptr_t)&lcd_bitmap },
-	{ (const_iptr_t)0, 0, NULL, (iptr_t)0 }
+	{ (const_iptr_t)"LED blinking",      0, (MenuHook)led_test,            (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)"Bouncing logo",     0, (MenuHook)bouncing_logo,       (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)"Screen saver demo", 0, (MenuHook)screen_saver,        (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)"Scheduling test",   0, (MenuHook)context_switch_test, (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)"Show uptime",       0, (MenuHook)uptime,              (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)"Reboot",            0, (MenuHook)soft_reset,          (iptr_t)&lcd_bitmap },
+	{ (const_iptr_t)0,                   0, NULL,                          (iptr_t)0,          }
 };
-static struct Menu main_menu = { main_items, "BeRTOS", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 };
+
+static struct Menu main_menu = { main_items, "BeRTOS", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, rit128x96_blitBitmap };
 
 int main(void)
 {
@@ -343,7 +351,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..");