mirror/tinyusb
1
0
Fork 0
mirror of https://github.com/hathach/tinyusb.git synced 2025-03-14 04:18:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

update nrf52 hal millis

Browse Source
This commit is contained in:
hathach 2018-03-29 18:10:01 +07:00
parent e2f9744369
commit 97db3c7c3d
4 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/device/nrf52840/segger/nrf52840.emProject
View File

@ -66,6 +66,8 @@
<file file_name="../../../../hw/bsp/pca10056/board_pca10056.c" />
<file file_name="../../../../hw/bsp/pca10056/board_pca10056.h" />
</folder>
<file file_name="../../../../hw/bsp/ansi_escape.h" />
<file file_name="../../../../hw/bsp/board.h" />
</folder>
<folder Name="mcu">
<folder Name="nordic">

2
examples/device/nrf52840/src/main.c
View File

@ -118,7 +118,7 @@ void led_blinking_task(void)
static uint32_t last_blink = 0;
// not enough time
if ( last_blink + BLINK_INTEVAL > tusb_hal_tick_get() ) return;
if ( last_blink + BLINK_INTEVAL > tusb_hal_millis() ) return;
last_blink += BLINK_INTEVAL;

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

@ -34,6 +34,7 @@
*/
/**************************************************************************/
#include "bsp/board.h"
#include "board_pca10056.h"
#include "nrf_gpio.h"
@ -48,11 +49,25 @@
/*------------------------------------------------------------------*/
/* VARIABLE DECLARATION
/* TUSB HAL MILLISECOND
*------------------------------------------------------------------*/
volatile uint32_t system_ticks = 0;
void SysTick_Handler (void)
{
system_ticks++;
}
uint32_t tusb_hal_millis(void)
{
//#define tick2ms(tck) ( ( ((uint64_t)(tck)) * 1000) / configTICK_RATE_HZ )
//return tick2ms( app_timer_cnt_get() );
return (system_ticks*1000) / BOARD_TICKS_HZ;
}
/*------------------------------------------------------------------*/
/* FUNCTION DECLARATION
/* BOARD API
*------------------------------------------------------------------*/
void board_init(void)
{

15
tinyusb/portable/nordic/nrf5x/hal_nrf5x.c
View File

@ -56,13 +56,6 @@
/* FUNCTION DECLARATION
*------------------------------------------------------------------*/
volatile uint32_t system_ticks = 0;
void SysTick_Handler (void)
{
system_ticks++;
}
bool tusb_hal_init(void)
{
@ -81,12 +74,4 @@ void tusb_hal_int_disable(uint8_t rhport)
NVIC_DisableIRQ(USBD_IRQn);
}
uint32_t tusb_hal_millis(void)
{
//#define tick2ms(tck) ( ( ((uint64_t)(tck)) * 1000) / configTICK_RATE_HZ )
//return tick2ms( app_timer_cnt_get() );
return system_ticks;
}
#endif