lm3s1968: add a simple serial prompt to the example.

[bertos.git] / examples / lm3s1968 / lm3s1968.c

diff --git a/examples/lm3s1968/lm3s1968.c b/examples/lm3s1968/lm3s1968.c
index aec08cecef22dbe9a6e1fa4d35826ae080131f69..a9e995e357834283450b41bb16b23dd83f63fc0e 100644 (file)
--- a/examples/lm3s1968/lm3s1968.c
+++ b/examples/lm3s1968/lm3s1968.c
@@ -35,33 +35,39 @@
  * \author Andrea Righi <arighi@develer.com>
  */
 
-#include <cfg/compiler.h>
-#include <cfg/cfg_gfx.h>
 #include <cpu/irq.h>
 #include <drv/timer.h>
-#include <drv/lcd_lm3s.h>
-#include <io/lm3s.h>
+#include <drv/ser.h>
 #include <gfx/gfx.h>
 #include <gfx/font.h>
 #include <gfx/text.h>
 #include <icons/logo.h>
 #include <stdio.h>
 
-#define PROC_STACK_SIZE        KERN_MINSTACKSIZE * 2
+#include "cfg/compiler.h"
+#include "cfg/cfg_gfx.h"
+
+#include "hw/hw_lcd.h"
+
+#define PROC_STACK_SIZE        KERN_MINSTACKSIZE
 
 #if CONFIG_KERN_HEAP
 #define hp_stack NULL
 #define lp_stack NULL
+#define ser_stack NULL
+#define led_stack NULL
 #else
 static PROC_DEFINE_STACK(hp_stack, PROC_STACK_SIZE);
 static PROC_DEFINE_STACK(lp_stack, PROC_STACK_SIZE);
+static PROC_DEFINE_STACK(ser_stack, PROC_STACK_SIZE);
+static PROC_DEFINE_STACK(led_stack, PROC_STACK_SIZE);
 #endif
 
 static Process *hp_proc, *lp_proc, *res_proc;
 
 static hptime_t start, end;
 
-static uint8_t raster[RAST_SIZE(128, 96)];
+static uint8_t raster[RAST_SIZE(LCD_WIDTH, LCD_HEIGHT)];
 static Bitmap bm;
 
 extern Font font_helvB10;
@@ -90,6 +96,20 @@ INLINE void led_off(void)
        GPIO_PORTG_DATA_R &= ~0x04;
 }
 
+static void NORETURN led_process(void)
+{
+       int i;
+
+       for (i = 0; ; i++)
+       {
+               if (i & 1)
+                       led_on();
+               else
+                       led_off();
+               timer_delay(50);
+       }
+}
+
 INLINE hptime_t get_hp_ticks(void)
 {
        return (TIMER_HW_CNT - timer_hw_hpread()) +
@@ -99,14 +119,13 @@ INLINE hptime_t get_hp_ticks(void)
 static void NORETURN res_process(void)
 {
        const char spinner[] = {'/', '-', '\\', '|'};
-       char buffer[256], c;
+       char buffer[32], c;
        int i;
 
        for (i = 0; ; i++)
        {
                ticks_t clock;
 
-               sig_wait(SIG_USER0);
                clock = timer_clock_unlocked();
 
                /* Display uptime (in ticks) */
@@ -133,13 +152,7 @@ static void NORETURN res_process(void)
                                ((end - start) * 1000000) / CPU_FREQ,
                                ((end - start) * (100000000 / CPU_FREQ)) % 100);
                text_xprintf(&bm, 7, 0, TEXT_FILL, buffer);
-               lm3s_lcd_blitBitmap(&bm);
-
-               /* Blink the status LED and restart the test */
-               led_off();
-               timer_delay(100);
-               led_on();
-               sig_send(lp_proc, SIG_USER0);
+               rit128x96_lcd_blitBitmap(&bm);
        }
 }
 
@@ -149,7 +162,8 @@ static void NORETURN hp_process(void)
        {
                sig_wait(SIG_USER0);
                end = get_hp_ticks();
-               sig_send(res_proc, SIG_USER0);
+               timer_delay(100);
+               sig_send(lp_proc, SIG_USER0);
        }
 }
 
@@ -190,15 +204,34 @@ static void bouncing_logo(Bitmap *bm)
 
                }
                /* 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);
-               lm3s_lcd_blitBitmap(bm);
+               rit128x96_lcd_blitBitmap(bm);
                timer_delay(5);
        }
 }
 
+static void NORETURN ser_process(void)
+{
+       char buf[32];
+       Serial ser_port;
+       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);
+       }
+}
+
 int main(void)
 {
        char buffer[32];
@@ -216,28 +249,30 @@ int main(void)
        proc_init();
        kputs("Done.\n");
        kputs("Init OLED display..");
-       lm3s_lcd_init(CPU_FREQ / 2);
+       rit128x96_lcd_init();
        gfx_bitmapInit(&bm, raster, LCD_WIDTH, LCD_HEIGHT);
        gfx_setFont(&bm, &font_helvB10);
+       rit128x96_lcd_blitBitmap(&bm);
        kputs("Done.\n");
 
        bouncing_logo(&bm);
-
        gfx_bitmapClear(&bm);
 #ifdef _DEBUG
        text_xprintf(&bm, 4, 0, TEXT_CENTER | TEXT_FILL, "BeRTOS up & running!");
-       lm3s_lcd_blitBitmap(&bm);
+       rit128x96_lcd_blitBitmap(&bm);
        proc_testRun();
 #endif
        snprintf(buffer, sizeof(buffer),
                        "CPU: Cortex-M3 %luMHz", CPU_FREQ / 1000000);
        text_xprintf(&bm, 0, 0, TEXT_FILL, buffer);
-       lm3s_lcd_blitBitmap(&bm);
+       rit128x96_lcd_blitBitmap(&bm);
        text_xprintf(&bm, 1, 0, TEXT_FILL, "Board: LM3S1968 EVB");
-       lm3s_lcd_blitBitmap(&bm);
+       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);
+       proc_new(ser_process, NULL, PROC_STACK_SIZE, ser_stack);
 
        res_proc = proc_current();