kingkevin
/
espressif_tinyusb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clean up bsp, adde board_millis()

This commit is contained in:
hathach 2019-03-23 22:31:07 +07:00
parent d866999bf0
commit 29e075b8b9
No known key found for this signature in database
GPG Key ID: 2FA891220FBFD581
14 changed files with 40 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/device/cdc_msc_hid/src/main.c
View File

@ -124,7 +124,7 @@ void usb_hid_task(void)
const uint32_t interval_ms = 10;
static uint32_t start_ms = 0;
if ( board_noos_millis() < start_ms + interval_ms) return; // not enough time
if ( board_millis() < start_ms + interval_ms) return; // not enough time
start_ms += interval_ms;
uint32_t const btn = board_buttons();
@ -200,7 +200,7 @@ void led_blinking_task(void)
static bool led_state = false;
// Blink every 1000 ms
if ( board_noos_millis() < start_ms + interval_ms) return; // not enough time
if ( board_millis() < start_ms + interval_ms) return; // not enough time
start_ms += interval_ms;
board_led_control(led_state);

7
examples/device/cdc_msc_hid_freertos/src/main.c
View File

@ -150,10 +150,11 @@ void usb_hid_task(void* params)
(void) params;
// Poll every 10ms
static tu_timeout_t tm = { .start = 0, .interval = 10 };
const uint32_t interval_ms = 10;
static uint32_t start_ms = 0;
if ( !tu_timeout_expired(&tm) ) return; // not enough time
tu_timeout_reset(&tm);
if ( board_millis() < start_ms + interval_ms) return; // not enough time
start_ms += interval_ms;
uint32_t const btn = board_buttons();

25
hw/bsp/board.h
View File

@ -40,7 +40,10 @@
#include "ansi_escape.h"
#include "tusb.h"
#define CFG_UART_BAUDRATE 115200
#define BOARD_TICKS_HZ 1000
#define board_tick2ms(tck) ( ( ((uint64_t)(tck)) * 1000) / BOARD_TICKS_HZ )
@ -64,8 +67,26 @@ int board_uart_read(uint8_t* buf, int len);
// Send characters to UART
int board_uart_write(void const * buf, int len);
// Get current milliseconds with no rtos configure (TUSB_CFG_OS = OPT_OS_NONE)
uint32_t board_noos_millis(void);
#if CFG_TUSB_OS == OPT_OS_NONE
// Get current milliseconds, must be implemented in board.c when no OS is used
uint32_t board_millis(void);
#elif CFG_TUSB_OS == OPT_OS_FREERTOS
static inline uint32_t board_millis(void)
{
return ( ( ((uint64_t) xTaskGetTickCount()) * 1000) / configTICK_RATE_HZ );
}
#elif CFG_TUSB_OS == OPT_OS_MYNEWT
static inline uint32_t board_millis(void)
{
return os_time_ticks_to_ms32( os_time_get() );
}
#endif
//--------------------------------------------------------------------+
// Helper functions

8
hw/bsp/ea4088qs/board_ea4088qs.c
View File

@ -24,13 +24,9 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_EA4088QS
#include "chip.h"
#include "../board.h"
#include "tusb_option.h"
#define LED_PORT 2
#define LED_PIN 19
@ -175,11 +171,9 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
#endif
#endif

8
hw/bsp/ea4357/board_ea4357.c
View File

@ -24,14 +24,10 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_EA4357
#include "chip.h"
#include "../board.h"
#include "pca9532.h"
#include "tusb_option.h"
#define BOARD_UART_PORT LPC_USART0
#define BOARD_UART_PIN_PORT 0x0f
#define BOARD_UART_PIN_TX 10 // PF.10 : UART0_TXD
@ -74,7 +70,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
@ -305,5 +301,3 @@ int board_uart_write(void const * buf, int len)
(void) len;
return 0;
}
#endif

6
hw/bsp/lpcxpresso11u68/board_lpcxpresso11u68.c
View File

@ -24,8 +24,6 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_LPCXPRESSO11U68
#include "chip.h"
#include "../board.h"
@ -110,7 +108,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
@ -153,5 +151,3 @@ int board_uart_write(void const * buf, int len)
(void) len;
return 0;
}
#endif

10
hw/bsp/lpcxpresso1347/board_lpcxpresso1347.c
View File

@ -24,8 +24,6 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_LPCXPRESSO1347
#include "chip.h"
#include "../board.h"
@ -83,10 +81,6 @@ void board_init(void)
{
SystemCoreClockUpdate();
#if CFG_TUSB_OS == OPT_OS_NONE
SysTick_Config(SystemCoreClock / BOARD_TICKS_HZ); // 1 msec tick timer
#endif
#if CFG_TUSB_OS == OPT_OS_NONE
// 1ms tick timer
SysTick_Config(SystemCoreClock / 1000);
@ -127,7 +121,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
@ -181,5 +175,3 @@ int board_uart_write(void const * buf, int len)
(void) len;
return 0;
}
#endif

8
hw/bsp/lpcxpresso1769/board_lpcxpresso1769.c
View File

@ -24,13 +24,9 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_LPCXPRESSO1769
#include "chip.h"
#include "../board.h"
#include "tusb_option.h"
#define LED_PORT 0
#define LED_PIN 22
@ -163,7 +159,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
@ -217,5 +213,3 @@ int board_uart_write(void const * buf, int len)
(void) len;
return 0;
}
#endif

9
hw/bsp/mcb1800/board_mcb1800.c
View File

@ -24,13 +24,9 @@
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_MCB1800
#include "chip.h"
#include "../board.h"
#include "tusb_option.h"
#define LED_PORT 6
#define LED_PIN 24
@ -241,12 +237,9 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
#endif
#endif

4
hw/bsp/metro_m0_express/board_metro_m0_express.c
View File

@ -35,8 +35,6 @@
#include "hpl_pm_config.h"
#include "hpl/pm/hpl_pm_base.h"
#include "tusb_option.h"
//--------------------------------------------------------------------+
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
//--------------------------------------------------------------------+
@ -120,7 +118,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}

4
hw/bsp/metro_m4_express/board_metro_m4_express.c
View File

@ -32,8 +32,6 @@
#include "hpl/gclk/hpl_gclk_base.h"
#include "hpl_mclk_config.h"
#include "tusb_option.h"
//--------------------------------------------------------------------+
// MACRO TYPEDEF CONSTANT ENUM DECLARATION
//--------------------------------------------------------------------+
@ -109,7 +107,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}

5
hw/bsp/pca10056/board_pca10056.c
View File

@ -23,7 +23,6 @@
*
* This file is part of the TinyUSB stack.
*/
#ifdef BOARD_PCA10056
#include "bsp/board.h"
@ -66,7 +65,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}
@ -209,5 +208,3 @@ void nrf_error_cb(uint32_t id, uint32_t pc, uint32_t info)
(void) info;
}
#endif
#endif

3
hw/bsp/stm32f303disc/board_stm32f303disc.c
View File

@ -25,7 +25,6 @@
*/
#include "../board.h"
#include "tusb_option.h"
#include "stm32f3xx.h"
#include "stm32f3xx_hal_conf.h"
@ -114,7 +113,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}

4
hw/bsp/stm32f407g_disc1/board_stm32f407g_disc1.c
View File

@ -28,8 +28,6 @@
#include "stm32f4xx.h"
#include "tusb_option.h"
void board_init(void)
{
// Init the LED on PD14
@ -110,7 +108,7 @@ uint32_t tusb_hal_millis(void)
return board_tick2ms(system_ticks);
}
uint32_t board_noos_millis(void)
uint32_t board_millis(void)
{
return system_ticks;
}