X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=examples%2Fdemo%2Fdemo.c;h=efdf37ec334aa26b5e161433b424e659f4accd06;hb=12a865a058c2c3da0e4da685158f3a506ffad876;hp=f4928c10fd0c75c79c03967ff04565a614f67673;hpb=b026f319cf43d9a82f682eb8c7f314a6e638a54e;p=bertos.git diff --git a/examples/demo/demo.c b/examples/demo/demo.c index f4928c10..efdf37ec 100644 --- a/examples/demo/demo.c +++ b/examples/demo/demo.c @@ -31,23 +31,23 @@ * * \brief Multifunction system test for BeRTOS modules. * - * \version $Id: demo.c 18242 2007-10-08 17:35:23Z marco $ * \author Bernie Innocenti */ - #include #include +#include #include #include +#include #include #include #include #include -#include #include +#include #include #include @@ -57,15 +57,15 @@ #include #include +/** Default LCD bitmap */ +static Bitmap lcd_bitmap; + /** - * Draw a pentacle in the provided bitmap. - * - * This is invoked by the keyboard polling routine, as a poor man's surrogate - * of true task switching. + * Refresh the GUI. */ void schedule(void) { - lcd_blitBitmap(&lcd_bitmap); + lcd_gfx_qt_blitBitmap(&lcd_bitmap); emul_idle(); } @@ -85,21 +85,24 @@ static void magic(struct Bitmap *bitmap, coord_t x, coord_t y) static void hello_world(Bitmap *bm) { extern const Font font_ncenB18; - const Font *old_font = bm->font; + const Font *old_font; + + old_font = bm->font; gfx_bitmapClear(bm); /* Set big font */ gfx_setFont(bm, &font_ncenB18); - text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER, + text_xprintf(bm, 0, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER, "Hello, world!"); - - lcd_blitBitmap(bm); - timer_delay(1000); + schedule(); + while (1) + if (kbd_peek()) + break; /* Restore old font */ - gfx_setFont(bm, old_font); + gfx_setFont(bm, old_font); } /** @@ -135,8 +138,7 @@ static void bouncing_logo(Bitmap *bm) (bm->width - bertos_logo.width) / 2, h / SPEED_SCALE, &bertos_logo); - lcd_blitBitmap(bm); - + schedule(); timer_delay(10); } } @@ -176,9 +178,9 @@ void win_demo(Bitmap *bm) /* Background animation */ bm = root_win.bitmap; gfx_bitmapClear(bm); -// gfx_setClipRect(bm, 0, 0, bm->width, bm->height); -// gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10); -// gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11); + // gfx_setClipRect(bm, 0, 0, bm->width, bm->height); + // gfx_rectDraw(bm, 10, 10, bm->width-10, bm->height-10); + // gfx_setClipRect(bm, 11, 11, bm->width-11, bm->height-11); magic(bm, x, y); x += xdir; y += ydir; @@ -187,13 +189,11 @@ void win_demo(Bitmap *bm) if (y >= bm->height) ydir = -1; if (y <= -50) ydir = +1; - /* Large window animation */ bm = large_win.bitmap; gfx_bitmapClear(bm); for (i = 0; i < bm->height / 2; i += 2) gfx_rectDraw(bm, 0 + i, 0 + i, bm->width - i, bm->height - i); - /* Small window animation */ bm = small_win.bitmap; gfx_bitmapClear(bm); @@ -217,7 +217,6 @@ void win_demo(Bitmap *bm) win_raise(&large_win); win_compose(&root_win); - /* Also does LCD refresh, etc. */ if (kbd_peek()) break; @@ -229,6 +228,12 @@ void proc_demo(void) proc_testRun(); } +void sem_demo(void) +{ + sem_testRun(); + sem_testTearDown(); +} + void timer_demo(void) { timer_testRun(); @@ -247,7 +252,7 @@ static struct MenuItem settings_items[] = { (const_iptr_t)"Power Saving", MIF_TOGGLE, (MenuHook)0, (iptr_t)0 }, { (const_iptr_t)0, 0, NULL, (iptr_t)0 } }; -static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 }; +static struct Menu settings_menu = { settings_items, "Settings Menu", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap }; /* MX SUBMENU */ @@ -261,7 +266,7 @@ static struct MenuItem mx_items[] = { (const_iptr_t)0, 0, NULL, (iptr_t)0 } }; -static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 }; +static struct Menu mx_menu = { mx_items, (const_iptr_t)0, MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap }; /* DISPLAY SUBMENU */ @@ -274,7 +279,7 @@ static struct MenuItem display_items[] = { (const_iptr_t)"Icon Theme", 0, (MenuHook)0, (iptr_t)0 }, { (const_iptr_t)0, 0, NULL, (iptr_t)0 } }; -static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0 }; +static struct Menu display_menu = { display_items, "Display Menu", MF_SAVESEL, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap }; /* MAIN MENU */ @@ -285,30 +290,31 @@ static struct MenuItem main_items[] = { (const_iptr_t)"Bounce!", 0, (MenuHook)bouncing_logo,(iptr_t)&lcd_bitmap }, { (const_iptr_t)"Hello World", 0, (MenuHook)hello_world, (iptr_t)&lcd_bitmap }, { (const_iptr_t)"Scheduling", 0, (MenuHook)proc_demo, (iptr_t)&lcd_bitmap }, + { (const_iptr_t)"Semaphores", 0, (MenuHook)sem_demo, (iptr_t)&lcd_bitmap }, { (const_iptr_t)"Timer Test", 0, (MenuHook)timer_demo, (iptr_t)&lcd_bitmap }, { (const_iptr_t)"Menu MX", 0, (MenuHook)menu_handle, (iptr_t)&mx_menu }, { (const_iptr_t)"Display", 0, (MenuHook)menu_handle, (iptr_t)&display_menu }, { (const_iptr_t)"Settings", 0, (MenuHook)menu_handle, (iptr_t)&settings_menu }, { (const_iptr_t)0, 0, NULL, (iptr_t)0 } }; -static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0 }; - +static struct Menu main_menu = { main_items, "Main Menu", MF_STICKY, &lcd_bitmap, 0, lcd_gfx_qt_blitBitmap }; -static cpu_stack_t monitor_stack[CONFIG_KERN_MINSTACKSIZE / sizeof(cpu_stack_t)]; +#if CONFIG_KERN_HEAP +#define monitor_stack NULL +#else +static PROC_DEFINE_STACK(monitor_stack, KERN_MINSTACKSIZE); +#endif int main(int argc, char *argv[]) { emul_init(&argc, argv); - #if CONFIG_KERN_PREEMPT - irq_init(); - #endif timer_init(); + proc_init(); buz_init(); kbd_init(); - lcd_init(); - proc_init(); - monitor_start(sizeof(monitor_stack), monitor_stack); + lcd_gfx_qt_init(&lcd_bitmap); + monitor_start(KERN_MINSTACKSIZE, monitor_stack); menu_handle(&main_menu);