diff --git a/demos/bsp/boards/board.h b/demos/bsp/boards/board.h index 8becd677e..8ea13ade0 100644 --- a/demos/bsp/boards/board.h +++ b/demos/bsp/boards/board.h @@ -124,6 +124,8 @@ void board_leds(uint32_t on_mask, uint32_t off_mask); uint8_t board_uart_getchar(void); void board_uart_putchar(uint8_t c); +uint32_t board_buttons(void); + extern volatile uint32_t system_ticks; #ifdef __cplusplus diff --git a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c b/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c index 74d1451bf..675b393de 100644 --- a/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c +++ b/demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c @@ -68,7 +68,6 @@ void board_init(void) //P0_21 instead of P2_9 as USB connect #endif -#if CFG_UART_ENABLE //------------- UART init -------------// PINSEL_CFG_Type PinCfg = @@ -91,7 +90,6 @@ void board_init(void) UART_Init(BOARD_UART_PORT, &UARTConfigStruct); UART_TxCmd(BOARD_UART_PORT, ENABLE); // Enable UART Transmit -#endif } //--------------------------------------------------------------------+ @@ -111,8 +109,6 @@ void board_leds(uint32_t on_mask, uint32_t off_mask) //--------------------------------------------------------------------+ // UART //--------------------------------------------------------------------+ -#if CFG_UART_ENABLE - void board_uart_putchar(uint8_t c) { UART_Send(BOARD_UART_PORT, &c, 1, BLOCKING); @@ -124,5 +120,3 @@ uint8_t board_uart_getchar(void) } #endif - -#endif diff --git a/demos/bsp/boards/microbuilder/board_rf1ghznode.c b/demos/bsp/boards/microbuilder/board_rf1ghznode.c index d84ec962d..28e8e3cfd 100644 --- a/demos/bsp/boards/microbuilder/board_rf1ghznode.c +++ b/demos/bsp/boards/microbuilder/board_rf1ghznode.c @@ -40,18 +40,39 @@ #if BOARD == BOARD_RF1GHZNODE +#define LED_PORT (1) +#define LED_PIN (31) +#define LED_ON (0) +#define LED_OFF (1) + +enum { + BOARD_BUTTON_COUNT = 1 +}; + +const static struct { + uint8_t port; + uint8_t pin; +} buttons[BOARD_BUTTON_COUNT] = { 0, 1 }; + void board_init(void) { SystemInit(); + +#if TUSB_CFG_OS == TUSB_OS_NONE // TODO may move to main.c SysTick_Config(SystemCoreClock / CFG_TICKS_PER_SECOND); // 1 msec tick timer +#endif + GPIOInit(); - GPIOSetDir(CFG_LED_PORT, CFG_LED_PIN, 1); + //------------- LED -------------// + GPIOSetDir(LED_PORT, LED_PIN, 1); board_leds(0x01, 0); // turn off the led first -#if CFG_UART_ENABLE + //------------- BUTTON -------------// + for(uint8_t i=0; i - - -