From 06f6a1afc7157d25c3dae42af3478e4f0b31a2af Mon Sep 17 00:00:00 2001 From: arighi Date: Wed, 21 Apr 2010 13:55:24 +0000 Subject: [PATCH] lm3s1968: improve the example with GUI enhancements, keypad driver and menu. git-svn-id: https://src.develer.com/svnoss/bertos/trunk@3493 38d2e660-2303-0410-9eaa-f027e97ec537 --- examples/lm3s1968/hw/hw_rit128x96.h | 9 +- examples/lm3s1968/hw/kbd_map.h | 1 + examples/lm3s1968/lm3s1968.c | 261 +++++++++++++++++++--------- examples/lm3s1968/lm3s1968.mk | 5 +- 4 files changed, 192 insertions(+), 84 deletions(-) diff --git a/examples/lm3s1968/hw/hw_rit128x96.h b/examples/lm3s1968/hw/hw_rit128x96.h index 6e1c933c..32edf8ee 100644 --- a/examples/lm3s1968/hw/hw_rit128x96.h +++ b/examples/lm3s1968/hw/hw_rit128x96.h @@ -76,10 +76,9 @@ #define LCD_WRITE(x) \ { \ uint32_t _x; \ - lm3s_ssiWriteFrame(SSI0_BASE, x); \ + while (!lm3s_ssiWriteFrameNonBlocking(SSI0_BASE, x)); \ /* Dummy read to drain the FIFO */ \ while (!lm3s_ssiReadFrameNonBlocking(SSI0_BASE, &_x)); \ - cpu_relax(); \ } /*@}*/ @@ -120,4 +119,10 @@ INLINE void lcd_bus_init(void) while (lm3s_ssiReadFrameNonBlocking(SSI0_BASE, &dummy)); } +/* + * XXX: menu stuff requires lcd_blitBimap() function to be defined. + * Find a better way to do this. + */ +#define rit128x96_lcd_blitBitmap lcd_blitBitmap + #endif /* HW_RIT128x96_H */ diff --git a/examples/lm3s1968/hw/kbd_map.h b/examples/lm3s1968/hw/kbd_map.h index a8efc919..20b95ea0 100644 --- a/examples/lm3s1968/hw/kbd_map.h +++ b/examples/lm3s1968/hw/kbd_map.h @@ -58,6 +58,7 @@ typedef uint16_t keymask_t; #define K_LEFT BV(5) #define K_RIGHT BV(6) #define K_OK BV(7) +#define K_CANCEL BV(8) #define K_REPEAT BV(13) /**< This is a repeated keyevent. */ #define K_TIMEOUT BV(14) /**< Fake key event for timeouts. */ diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c index e287e84d..263712be 100644 --- a/examples/lm3s1968/lm3s1968.c +++ b/examples/lm3s1968/lm3s1968.c @@ -38,10 +38,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -66,9 +68,11 @@ static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE); extern Font font_helvB10; static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)]; -static Bitmap bm; +static Bitmap lcd_bitmap; -static Process *hp_proc, *lp_proc, *res_proc; +#define KEY_MASK (K_UP | K_DOWN | K_LEFT | K_RIGHT | K_OK) + +static Process *hp_proc, *lp_proc, *led_proc; static hptime_t start, end; static Serial ser_port; @@ -97,12 +101,19 @@ INLINE void led_off(void) GPIO_PORTG_DATA_R &= ~0x04; } +static bool led_blinking; + static void NORETURN led_process(void) { int i; for (i = 0; ; i++) { + if (!led_blinking) + { + led_off(); + sig_wait(SIG_USER0); + } if (i & 1) led_on(); else @@ -111,57 +122,75 @@ static void NORETURN led_process(void) } } -static void NORETURN ser_process(void) +static void led_test(UNUSED_ARG(Bitmap *, bm)) { - char buf[32]; - int i; + led_blinking = !led_blinking; + sig_send(led_proc, SIG_USER0); +} - ser_init(&ser_port, SER_UART0); - ser_setbaudrate(&ser_port, 115200); +static void bouncing_logo(Bitmap *bm) +{ + const long SPEED_SCALE = 1000; + const long GRAVITY_ACCEL = 100; + const long BOUNCE_ELASTICITY = 1; + long h = (long)(-bertos_logo.height) * SPEED_SCALE; + long speed = 0, i; - /* BeRTOS terminal */ for (i = 0; ; i++) { - kfile_printf(&ser_port.fd, "\n\r[%03d] BeRTOS:~$ ", i); - kfile_gets_echo(&ser_port.fd, buf, sizeof(buf), true); - kfile_printf(&ser_port.fd, "%s", buf); - } -} + /* Move */ + h += speed; -INLINE hptime_t get_hp_ticks(void) -{ - return (TIMER_HW_CNT - timer_hw_hpread()) + - timer_clock_unlocked() * TIMER_HW_CNT; + /* Gravity acceleration */ + speed += GRAVITY_ACCEL; + + if (h > 0 && speed > 0) + { + /* Bounce */ + speed = -(speed / BOUNCE_ELASTICITY); + + } + /* Update graphics */ + gfx_bitmapClear(bm); + gfx_blitImage(bm, + (LCD_WIDTH - bertos_logo.width) / 2, + (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); + timer_delay(5); + if (kbd_peek() & KEY_MASK) + break; + } } -static void NORETURN res_process(void) +static void screen_saver(Bitmap *bm) { - const char spinner[] = {'/', '-', '\\', '|'}; + int x1, y1, x2, y2; int i; - char c; for (i = 0; ; i++) { - ticks_t clock; + x1 = i % LCD_WIDTH; + y1 = i % LCD_HEIGHT; - clock = timer_clock_unlocked(); + x2 = LCD_WIDTH - i % LCD_WIDTH; + y2 = LCD_HEIGHT - i % LCD_HEIGHT; - /* Display uptime (in ticks) */ - text_xprintf(&bm, 2, 0, TEXT_FILL, "uptime: %lu sec", clock / 1000); - - /* Show context switch (in clock cycles) */ - c = spinner[i % countof(spinner)]; - text_xprintf(&bm, 4, 0, TEXT_CENTER | TEXT_FILL, "%c Context switch %c", c, c); - text_xprintf(&bm, 6, 0, TEXT_FILL, " %lu clock cycles", end - start); - /* Show context switch (in usec) */ - text_xprintf(&bm, 7, 0, TEXT_FILL, - " %lu.%lu usec", - ((end - start) * 1000000) / CPU_FREQ, - ((end - start) * (100000000 / CPU_FREQ)) % 100); - rit128x96_lcd_blitBitmap(&bm); + gfx_bitmapClear(bm); + gfx_rectDraw(bm, x1, y1, x2, y2); + rit128x96_lcd_blitBitmap(bm); + if (kbd_peek() & KEY_MASK) + break; } } +INLINE hptime_t get_hp_ticks(void) +{ + return (TIMER_HW_CNT - timer_hw_hpread()) + + timer_clock_unlocked() * TIMER_HW_CNT; +} + static void NORETURN hp_process(void) { while (1) @@ -183,43 +212,120 @@ static void NORETURN lp_process(void) } } -/** - * Show the splash screen - */ -static void bouncing_logo(Bitmap *bm) +static void res_process(void) { - const long SPEED_SCALE = 1000; - const long GRAVITY_ACCEL = 100; - const long BOUNCE_ELASTICITY = 2; - const long TOT_FRAMES = 100; - long h = (long)(-bertos_logo.height) * SPEED_SCALE; - long speed = 0, i; + const char spinner[] = {'/', '-', '\\', '|'}; + int i; + char c; - for (i = 0; i < TOT_FRAMES; i++) + for (i = 0; ; i++) { - /* Move */ - h += speed; + /* Show context switch (in clock cycles) */ + c = spinner[i % countof(spinner)]; + text_xprintf(&lcd_bitmap, 3, 0, TEXT_CENTER | TEXT_FILL, "%c Context switch %c", c, c); + text_xprintf(&lcd_bitmap, 5, 0, TEXT_FILL, " %lu clock cycles", end - start); + /* Show context switch (in usec) */ + text_xprintf(&lcd_bitmap, 6, 0, TEXT_FILL, + " %lu.%lu usec", + ((end - start) * 1000000) / CPU_FREQ, + ((end - start) * (100000000 / CPU_FREQ)) % 100); + rit128x96_lcd_blitBitmap(&lcd_bitmap); + timer_delay(5); + if (kbd_peek() & KEY_MASK) + break; + } +} - /* Gravity acceleration */ - speed += GRAVITY_ACCEL; +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); + text_xprintf(bm, 1, 0, TEXT_FILL, "Board: LM3S1968 EVB"); + rit128x96_lcd_blitBitmap(bm); - if (h > 0 && speed > 0) - { - /* Bounce */ - speed = -(speed / BOUNCE_ELASTICITY); + res_process(); +} - } - /* Update graphics */ - gfx_bitmapClear(bm); - gfx_blitImage(bm, - (LCD_WIDTH - bertos_logo.width) / 2, - (LCD_HEIGHT - bertos_logo.height) / 2 + h / SPEED_SCALE, - &bertos_logo); +static void uptime(Bitmap *bm) +{ + extern const Font font_ncenB18; + const Font *old_font; + + old_font = bm->font; + + /* Set big font */ + gfx_bitmapClear(bm); + gfx_setFont(bm, &font_ncenB18); + text_xprintf(bm, 0, 0, TEXT_FILL | TEXT_CENTER, "Uptime"); + while (1) + { + ticks_t clock = ticks_to_ms(timer_clock_unlocked()); + + /* Display uptime (in ticks) */ + text_xprintf(&lcd_bitmap, 2, 0, TEXT_FILL | TEXT_CENTER, + "%lu", clock / 1000); rit128x96_lcd_blitBitmap(bm); timer_delay(5); + if (kbd_peek() & KEY_MASK) + break; } + gfx_setFont(bm, old_font); } +static void NORETURN soft_reset(Bitmap * bm) +{ + extern const Font font_ncenB18; + int i; + + /* Set big font */ + gfx_bitmapClear(bm); + gfx_setFont(bm, &font_ncenB18); + for (i = 5; i; --i) + { + text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "%d", i); + rit128x96_lcd_blitBitmap(bm); + timer_delay(1000); + } + text_xprintf(bm, 2, 0, TEXT_FILL | TEXT_CENTER, "REBOOT"); + rit128x96_lcd_blitBitmap(bm); + timer_delay(1000); + + /* Perform a software reset request */ + HWREG(NVIC_APINT) = NVIC_APINT_VECTKEY | NVIC_APINT_SYSRESETREQ; + UNREACHABLE(); +} + +static void NORETURN ser_process(void) +{ + char buf[32]; + int i; + + ser_init(&ser_port, SER_UART0); + ser_setbaudrate(&ser_port, 115200); + + /* BeRTOS terminal */ + for (i = 0; ; i++) + { + kfile_printf(&ser_port.fd, "\n\r[%03d] BeRTOS:~$ ", i); + kfile_gets_echo(&ser_port.fd, buf, sizeof(buf), true); + kfile_printf(&ser_port.fd, "%s", buf); + } +} + +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 } +}; +static struct Menu main_menu = { main_items, "BeRTOS", MF_STICKY | MF_SAVESEL, &lcd_bitmap, 0 }; + int main(void) { IRQ_ENABLE; @@ -236,33 +342,26 @@ int main(void) kputs("Done.\n"); kputs("Init OLED display.."); rit128x96_lcd_init(); - gfx_bitmapInit(&bm, raster, LCD_WIDTH, LCD_HEIGHT); - gfx_setFont(&bm, &font_helvB10); - rit128x96_lcd_blitBitmap(&bm); + gfx_bitmapInit(&lcd_bitmap, raster, LCD_WIDTH, LCD_HEIGHT); + gfx_setFont(&lcd_bitmap, &font_helvB10); + rit128x96_lcd_blitBitmap(&lcd_bitmap); + kputs("Done.\n"); + kputs("Init Keypad.."); + kbd_init(); kputs("Done.\n"); - - bouncing_logo(&bm); - gfx_bitmapClear(&bm); -#ifdef _DEBUG - text_xprintf(&bm, 4, 0, TEXT_CENTER | TEXT_FILL, "BeRTOS up & running!"); - rit128x96_lcd_blitBitmap(&bm); - proc_testRun(); -#endif - text_xprintf(&bm, 0, 0, TEXT_FILL, - "CPU: Cortex-M3 %luMHz", CPU_FREQ / 1000000); - rit128x96_lcd_blitBitmap(&bm); - text_xprintf(&bm, 1, 0, TEXT_FILL, "Board: LM3S1968 EVB"); - rit128x96_lcd_blitBitmap(&bm); hp_proc = proc_new(hp_process, NULL, PROC_STACK_SIZE, hp_stack); lp_proc = proc_new(lp_process, NULL, PROC_STACK_SIZE, lp_stack); - proc_new(led_process, NULL, PROC_STACK_SIZE, led_stack); + led_proc = proc_new(led_process, NULL, PROC_STACK_SIZE, led_stack); + /* Open a dummy echo terminal on UART0 */ proc_new(ser_process, NULL, PROC_STACK_SIZE, ser_stack); - res_proc = proc_current(); - proc_setPri(hp_proc, 2); proc_setPri(lp_proc, 1); - res_process(); + while (1) + { + menu_handle(&main_menu); + cpu_relax(); + } } diff --git a/examples/lm3s1968/lm3s1968.mk b/examples/lm3s1968/lm3s1968.mk index 63be128c..9bbfe705 100644 --- a/examples/lm3s1968/lm3s1968.mk +++ b/examples/lm3s1968/lm3s1968.mk @@ -24,8 +24,10 @@ lm3s1968_CSRC = \ bertos/gfx/win.c \ bertos/gfx/text.c \ bertos/gfx/text_format.c \ - bertos/fonts/luBS14.c \ + bertos/gui/menu.c \ bertos/fonts/helvB10.c \ + bertos/fonts/luBS14.c \ + bertos/fonts/ncenB18.c \ bertos/icons/logo.c \ bertos/mware/formatwr.c \ bertos/mware/hex.c \ @@ -34,6 +36,7 @@ lm3s1968_CSRC = \ bertos/struct/heap.c \ bertos/drv/timer.c \ bertos/drv/ser.c \ + bertos/drv/kbd.c \ bertos/drv/lcd_rit128x96.c \ bertos/kern/kfile.c \ bertos/kern/monitor.c \ -- 2.25.1