Changeset 1463

Timestamp:

02/25/12 21:26:00 (15 months ago)

Author:

thomas

Message:

• renaming all callback declaration as *_cbt
• enable GIE at end of board_init()
• UART bsp module with callback functionality
• UART module at 9600 baud
• UART bsp demo project which prints "Hello World!"

Location:

trunk/firmware/openos

Files:

• bsp/spi.h (modified) (2 diffs)
• bsp/telosb/board.c (modified) (1 diff)
• bsp/telosb/spi.c (modified) (2 diffs)
• bsp/telosb/uart.c (modified) (3 diffs)
• bsp/uart.h (modified) (2 diffs)
• projects/telosb/01-bsp/01bsp_radio.c (modified) (2 diffs)
• projects/telosb/01-bsp/01bsp_uart.c (modified) (2 diffs)

trunk/firmware/openos/bsp/spi.h

@@ -43 +43 @@
 } spi_last_t;
 
-typedef void (*spiCallback_t)(void);
+typedef void (*spi_cbt)(void);
 
 //=========================== variables =======================================
@@ -51 +51 @@
 void    spi_init();
 #ifdef SPI_IN_RTOS_MODE
-void    spi_setCallback(spiCallback_t cb);
+void    spi_setCallback(spi_cbt cb);
 #endif
 void    spi_txrx(uint8_t*     bufTx,

trunk/firmware/openos/bsp/telosb/board.c

@@ -31 +31 @@
    leds_init();
    uart_init();
-   spi_init();
-   radio_init();
-   radiotimer_init();
+   //spi_init();
+   //radio_init();
+   //radiotimer_init();
+   
+   __bis_SR_register(GIE);
 }
 

trunk/firmware/openos/bsp/telosb/spi.c

@@ -29 +29 @@
 #ifdef SPI_IN_RTOS_MODE
    // callback when module done
-   spiCallback_t   callback;
+   spi_cbt         callback;
 #endif
 } spi_vars_t;
@@ -102 +102 @@
 
 #ifdef SPI_IN_RTOS_MODE
-void spi_setCallback(spiCallback_t cb) {
+void spi_setCallback(spi_cbt cb) {
    spi_vars.callback = cb;
 }

trunk/firmware/openos/bsp/telosb/uart.c

@@ -7 +7 @@
 #include "msp430f1611.h"
 #include "stdint.h"
+#include "stdio.h"
 #include "uart.h"
 
 //=========================== defines =========================================
 
-#define BAUDRATE_115200
-
 //=========================== variables =======================================
 
 typedef struct {
-   uint8_t callBack;
+   // TX
+   uint8_t*   txBuf;
+   uint8_t    txBufLen;
+   uart_cbt   txDone_cb;
+   // RX
+   uint8_t*   rxBuffer;
+   uint8_t    rxBytesReceived;
+   uint8_t    rxBytesTreshold;
+   uart_cbt   rxThreshold_cb;
 } uart_vars_t;
 
@@ -28 +35 @@
    P3SEL      =  0xC0;                           // P3.6,7 = UART1TX/RX
    
-   ME2       |=  UTXE1 + URXE1;                  // enable UART1 TX/RX
+   UCTL1      =  SWRST;                          // hold UART1 module in reset
    UCTL1     |=  CHAR;                           // 8-bit character
    
-#ifdef BAUDRATE_115200
+#ifdef UART_BAUDRATE_115200
    //115200 baud, clocked from 4.8MHz SMCLK
    UTCTL1    |=  SSEL1;                          // clocking from SMCLK
@@ -45 +52 @@
 #endif
    
+   ME2       |=  UTXE1 + URXE1;                  // enable UART1 TX/RX
    UCTL1     &= ~SWRST;                          // clear UART1 reset bit
-   //IE2       |=  URXIE1;                         // enable UART1 RX interrupt
+   IE2       |=  UTXIE1 + URXIE1;                // enable UART1 TX/RX interrupt
 }
 
-void uart_tx(uint8_t c) {
-   U1TXBUF    = c;
+void uart_setTxDoneCb(uart_cbt cb) {
+   uart_vars.txDone_cb       = cb;
+}
+
+void uart_setRxThresholdCb(uart_cbt cb) {
+   uart_vars.rxThreshold_cb  = cb;
+}
+
+void uart_tx(uint8_t* txBuf, uint8_t txBufLen) {
+   
+   // register data to send
+   uart_vars.txBuf           = txBuf;
+   uart_vars.txBufLen        = txBufLen;
+   
+   // send first byte
+   U1TXBUF                   = *uart_vars.txBuf;
 }
 
 //=========================== private =========================================
+
+//=========================== interrupt handlers ==============================
+
+#pragma vector = USART1TX_VECTOR
+__interrupt void usart1tx_VECTOR (void) {
+   // one byte less to go
+   uart_vars.txBufLen--;
+   uart_vars.txBuf++;
+   
+   if (uart_vars.txBufLen>0) {
+      // send next byte
+      U1TXBUF                   = *uart_vars.txBuf;
+   } else {
+      if (uart_vars.txDone_cb!=NULL) {
+         uart_vars.txDone_cb();
+      }
+   }
+}
+
+#pragma vector = USART1RX_VECTOR
+__interrupt void usart1rx_VECTOR (void) {
+   P5OUT    ^=  0x10;                           // toggle LED
+}

trunk/firmware/openos/bsp/uart.h

@@ -12 +12 @@
 //=========================== define ==========================================
 
+//#define UART_BAUDRATE_115200
+
 //=========================== typedef =========================================
+
+typedef void (*uart_cbt)(void);
 
 //=========================== variables =======================================
@@ -19 +23 @@
 
 void uart_init();
-void uart_tx(uint8_t c);
+void uart_setTxDoneCb(uart_cbt cb);
+void uart_setRxThresholdCb(uart_cbt cb);
+void uart_tx(uint8_t* txBuf, uint8_t txBufLen);
 
 #endif

trunk/firmware/openos/projects/telosb/01-bsp/01bsp_radio.c

@@ -18 +18 @@
 //=========================== variables =======================================
 
-void cb_radioTimerOverflows();
-void cb_radioTimerCompare();
-void cb_startFrame(uint16_t timestamp);
-void cb_endFrame(uint16_t timestamp);
-
 typedef struct {
    uint8_t radio_busy;
@@ -32 +27 @@
 
 app_vars_t app_vars;
+
+//=========================== prototypes ======================================
+
+void cb_radioTimerOverflows();
+void cb_radioTimerCompare();
+void cb_startFrame(uint16_t timestamp);
+void cb_endFrame(uint16_t timestamp);
 
 //=========================== main ============================================

trunk/firmware/openos/projects/telosb/01-bsp/01bsp_uart.c

@@ -10 +10 @@
 #include "uart.h"
 
+//=========================== defines =========================================
+
+uint8_t stringToSend[] = "Hello World!";
+
+//=========================== variables =======================================
+
+typedef struct {
+   uint8_t uart_busy;
+} app_vars_t;
+
+app_vars_t app_vars;
+
+//=========================== prototypes ======================================
+
+void cb_uartDone();
+
+//=========================== main ============================================
+
 /**
 \brief The program starts executing here.
@@ -17 +35 @@
    board_init();
    
-   while (1) {
-      uart_tx('a');
+   uart_setTxDoneCb(cb_uartDone);
+   
+   uart_tx(&stringToSend[0],sizeof(stringToSend));
+   
+   app_vars.uart_busy = 1;
+   while (app_vars.uart_busy==1) {
    }
+   
+   // go back to sleep
+   board_sleep();
 }
+
+//=========================== callbacks =======================================
+
+void cb_uartDone() {
+   app_vars.uart_busy = 0;
+}