Update preset.
[bertos.git] / examples / demo / demo.c
index 8f568d0cd26f88f5f24acb7ff1017ef46914a1bd..efdf37ec334aa26b5e161433b424e659f4accd06 100644 (file)
  *
  * \brief Multifunction system test for BeRTOS modules.
  *
- * \version $Id$
  * \author Bernie Innocenti <bernie@codewiz.org>
  */
-
 #include <cfg/macros.h>
 
 #include <emul/emul.h>
 
 #include <kern/irq.h>
 #include <kern/proc.h>
+#include <kern/sem.h>
 #include <kern/monitor.h>
 #include <kern/msg.h>
 
 #include <drv/timer.h>
 #include <drv/buzzer.h>
-#include <drv/lcd_gfx.h>
 #include <drv/kbd.h>
+#include <drv/lcd_gfx_qt.h>
 
 #include <gfx/gfx.h>
 #include <gfx/win.h>
 #include <gui/menu.h>
 #include <icons/logo.h>
 
+/** Default LCD bitmap */
+static Bitmap lcd_bitmap;
+
 /**
  * Refresh the GUI.
  */
 void schedule(void)
 {
-       PROC_ATOMIC(
-               lcd_blitBitmap(&lcd_bitmap);
-               emul_idle();
-       );
+       lcd_gfx_qt_blitBitmap(&lcd_bitmap);
+       emul_idle();
 }
 
 /**
@@ -87,26 +87,22 @@ static void hello_world(Bitmap *bm)
        extern const Font font_ncenB18;
        const Font *old_font;
 
-       PROC_ATOMIC(
-               old_font = bm->font;
-
-               gfx_bitmapClear(bm);
-
-               /* Set big font */
-               gfx_setFont(bm, &font_ncenB18);
+       old_font = bm->font;
 
-               text_xprintf(bm, 1, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
-                               "Hello, world!");
+       gfx_bitmapClear(bm);
 
-               lcd_blitBitmap(bm);
-       );
+       /* Set big font */
+       gfx_setFont(bm, &font_ncenB18);
 
-       timer_delay(1000);
+       text_xprintf(bm, 0, 0, STYLEF_BOLD | TEXT_FILL | TEXT_CENTER,
+                       "Hello, world!");
+       schedule();
+       while (1)
+               if (kbd_peek())
+                       break;
 
-       PROC_ATOMIC(
-               /* Restore old font */
-               gfx_setFont(bm, old_font);
-       );
+       /* Restore old font */
+       gfx_setFont(bm, old_font);
 }
 
 /**
@@ -137,14 +133,12 @@ static void bouncing_logo(Bitmap *bm)
                }
 
                /* Update graphics */
-               PROC_ATOMIC(
-                       gfx_bitmapClear(bm);
-                       gfx_blitImage(bm,
-                               (bm->width - bertos_logo.width) / 2,
-                               h / SPEED_SCALE,
-                               &bertos_logo);
-                       lcd_blitBitmap(bm);
-               );
+               gfx_bitmapClear(bm);
+               gfx_blitImage(bm,
+                       (bm->width - bertos_logo.width) / 2,
+                       h / SPEED_SCALE,
+                       &bertos_logo);
+               schedule();
                timer_delay(10);
        }
 }
@@ -181,51 +175,48 @@ void win_demo(Bitmap *bm)
 
        for(;;)
        {
-               PROC_ATOMIC(
-                       /* 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);
-                       magic(bm, x, y);
-                       x += xdir;
-                       y += ydir;
-                       if (x >= bm->width)  xdir = -1;
-                       if (x <= -50)        xdir = +1;
-                       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);
-                       gfx_rectDraw(bm, 0, 0, bm->width, bm->height);
-                       gfx_line(bm, 0, 0, bm->width, bm->height);
-                       gfx_line(bm, bm->width, 0, 0, bm->height);
-
-                       /* Move windows around */
-                       win_move(&large_win, large_win.geom.xmin + xdir_large, large_top);
-                       if (large_win.geom.xmin < -20) xdir_large = +1;
-                       if (large_win.geom.xmin > RECT_WIDTH(&root_win.geom) - 5) xdir_large = -1;
-
-                       win_move(&small_win, small_left, small_win.geom.ymin + ydir_small);
-                       if (small_win.geom.ymin < -20) ydir_small = +1;
-                       if (small_win.geom.ymin > RECT_HEIGHT(&root_win.geom) - 5) ydir_small = -1;
-
-                       ++raise_counter;
-                       if (raise_counter % 997 == 0)
-                               win_raise(&small_win);
-                       else if (raise_counter % 731 == 0)
-                               win_raise(&large_win);
-
-                       win_compose(&root_win);
-               );
+               /* 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);
+               magic(bm, x, y);
+               x += xdir;
+               y += ydir;
+               if (x >= bm->width)  xdir = -1;
+               if (x <= -50)        xdir = +1;
+               if (y >= bm->height) ydir = -1;
+               if (y <= -50)        ydir = +1;
+
+               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);
+               gfx_rectDraw(bm, 0, 0, bm->width, bm->height);
+               gfx_line(bm, 0, 0, bm->width, bm->height);
+               gfx_line(bm, bm->width, 0, 0, bm->height);
+
+               /* Move windows around */
+               win_move(&large_win, large_win.geom.xmin + xdir_large, large_top);
+               if (large_win.geom.xmin < -20) xdir_large = +1;
+               if (large_win.geom.xmin > RECT_WIDTH(&root_win.geom) - 5) xdir_large = -1;
+
+               win_move(&small_win, small_left, small_win.geom.ymin + ydir_small);
+               if (small_win.geom.ymin < -20) ydir_small = +1;
+               if (small_win.geom.ymin > RECT_HEIGHT(&root_win.geom) - 5) ydir_small = -1;
+
+               ++raise_counter;
+               if (raise_counter % 997 == 0)
+                       win_raise(&small_win);
+               else if (raise_counter % 731 == 0)
+                       win_raise(&large_win);
+
+               win_compose(&root_win);
                /* Also does LCD refresh, etc. */
                if (kbd_peek())
                        break;
@@ -237,6 +228,12 @@ void proc_demo(void)
        proc_testRun();
 }
 
+void sem_demo(void)
+{
+       sem_testRun();
+       sem_testTearDown();
+}
+
 void timer_demo(void)
 {
        timer_testRun();
@@ -255,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 */
@@ -269,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 */
@@ -282,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 */
@@ -293,13 +290,14 @@ 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 };
 
 #if CONFIG_KERN_HEAP
 #define monitor_stack NULL
@@ -312,10 +310,10 @@ int main(int argc, char *argv[])
        emul_init(&argc, argv);
 
        timer_init();
+       proc_init();
        buz_init();
        kbd_init();
-       lcd_init();
-       proc_init();
+       lcd_gfx_qt_init(&lcd_bitmap);
        monitor_start(KERN_MINSTACKSIZE, monitor_stack);
 
        menu_handle(&main_menu);