andy/tinyUSB
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

add board_buttons API and refractor device keyboard app

Browse Source
This commit is contained in:
hathach
2014-03-06 23:26:40 +07:00
parent f39444a065
commit 4b8c0d97c6
8 changed files with 1870 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
demos/bsp/boards/board.h
View File

@@ -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

6
demos/bsp/boards/lpcxpresso/board_lpcxpresso1769.c
View File

@@ -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

49
demos/bsp/boards/microbuilder/board_rf1ghznode.c
View File

@@ -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<BOARD_BUTTON_COUNT; i++) GPIOSetDir(buttons[i].port, buttons[i].pin, 0);
//------------- UART -------------//
UARTInit(CFG_UART_BAUDRATE);
#endif
}
//--------------------------------------------------------------------+
@@ -61,28 +82,34 @@ void board_leds(uint32_t on_mask, uint32_t off_mask)
{
if (on_mask & BIT_(0))
{
GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, CFG_LED_ON);
GPIOSetBitValue(LED_PORT, LED_PIN, LED_ON);
}else if (off_mask & BIT_(0))
{
GPIOSetBitValue(CFG_LED_PORT, CFG_LED_PIN, CFG_LED_OFF);
GPIOSetBitValue(LED_PORT, LED_PIN, LED_OFF);
}
}
//--------------------------------------------------------------------+
// Buttons
//--------------------------------------------------------------------+
uint32_t board_buttons(void)
{
// for(uint8_t i=0; i<BOARD_BUTTON_COUNT; i++) GPIOGetPinValue(buttons[i].port, buttons[i].pin);
return GPIOGetPinValue(buttons[0].port, buttons[0].pin) ? 0 : 1; // button is active low
}
//--------------------------------------------------------------------+
// UART
//--------------------------------------------------------------------+
#if CFG_UART_ENABLE
uint32_t board_uart_send(uint8_t *buffer, uint32_t length)
void board_uart_putchar(uint8_t c)
{
UARTSend(buffer, length);
return length;
UARTSend(&c, 1);
}
uint32_t board_uart_recv(uint8_t *buffer, uint32_t length)
uint8_t board_uart_getchar(void)
{
// *buffer = get_key(); TODO cannot find available code for uart getchar
return 0;
}
#endif
#endif

14
demos/bsp/boards/microbuilder/board_rf1ghznode.h
View File

@@ -36,12 +36,6 @@
*/
/**************************************************************************/
/** \file
* \brief TBD
*
* \note TBD
*/
/** \ingroup TBD
* \defgroup TBD
* \brief TBD
@@ -60,12 +54,8 @@
#include "lpc11uxx/LPC11Uxx_DriverLib/lpc11uxx_gpio.h"
#include "lpc11uxx/LPC11Uxx_DriverLib/lpc11uxx_uart.h"
#define CFG_PRINTF_TARGET PRINTF_TARGET_SEMIHOST
#define CFG_LED_PORT (1)
#define CFG_LED_PIN (31)
#define CFG_LED_ON (0)
#define CFG_LED_OFF (1)
//#define CFG_PRINTF_TARGET PRINTF_TARGET_SEMIHOST
#define CFG_PRINTF_TARGET PRINTF_TARGET_UART
#ifdef __cplusplus
}