update
This commit is contained in:
parent
c2e15e003c
commit
63cd26b0d1
|
@ -58,7 +58,7 @@ void SysTick_Handler(void)
|
|||
|
||||
uint32_t HAL_GetTick(void)
|
||||
{
|
||||
return rt_hw_1ms_tick_get();
|
||||
return rt_tick_get_millisecond();
|
||||
}
|
||||
|
||||
void HAL_SuspendTick(void)
|
||||
|
|
|
@ -618,7 +618,7 @@ u32_t sys_jiffies(void)
|
|||
|
||||
u32_t sys_now(void)
|
||||
{
|
||||
return rt_hw_1ms_tick_get();
|
||||
return rt_tick_get_millisecond();
|
||||
}
|
||||
|
||||
#ifdef RT_LWIP_PPP
|
||||
|
|
|
@ -628,7 +628,7 @@ u32_t sys_jiffies(void)
|
|||
|
||||
u32_t sys_now(void)
|
||||
{
|
||||
return rt_hw_1ms_tick_get();
|
||||
return rt_tick_get_millisecond();
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -642,7 +642,7 @@ u32_t sys_jiffies(void)
|
|||
|
||||
u32_t sys_now(void)
|
||||
{
|
||||
return rt_hw_1ms_tick_get();
|
||||
return rt_tick_get_millisecond();
|
||||
}
|
||||
|
||||
#if MEM_OVERFLOW_CHECK || MEMP_OVERFLOW_CHECK
|
||||
|
|
|
@ -134,11 +134,6 @@ void rt_hw_exception_install(rt_err_t (*exception_handle)(void *context));
|
|||
*/
|
||||
void rt_hw_us_delay(rt_uint32_t us);
|
||||
|
||||
/*
|
||||
* provides a tick value ALWAYS in millisecond
|
||||
*/
|
||||
rt_tick_t rt_hw_1ms_tick_get(void);
|
||||
|
||||
#ifdef RT_USING_SMP
|
||||
typedef union {
|
||||
unsigned long slock;
|
||||
|
|
|
@ -77,6 +77,7 @@ rt_tick_t rt_tick_get(void);
|
|||
void rt_tick_set(rt_tick_t tick);
|
||||
void rt_tick_increase(void);
|
||||
rt_tick_t rt_tick_from_millisecond(rt_int32_t ms);
|
||||
rt_tick_t rt_tick_get_millisecond(void);
|
||||
|
||||
void rt_system_timer_init(void);
|
||||
void rt_system_timer_thread_init(void);
|
||||
|
|
10
src/clock.c
10
src/clock.c
|
@ -118,14 +118,14 @@ rt_tick_t rt_tick_from_millisecond(rt_int32_t ms)
|
|||
RTM_EXPORT(rt_tick_from_millisecond);
|
||||
|
||||
/**
|
||||
* This function provides a tick value ALWAYS in millisecond
|
||||
* This function will provide the passed millisecond from boot.
|
||||
*
|
||||
* @return 1ms-based tick
|
||||
* @return passed millisecond from boot
|
||||
*/
|
||||
RT_WEAK rt_tick_t rt_hw_1ms_tick_get(void)
|
||||
RT_WEAK rt_tick_t rt_tick_get_millisecond(void)
|
||||
{
|
||||
#if 1000 % RT_TICK_PER_SECOND == 0
|
||||
return rt_tick_get() * (1000U / RT_TICK_PER_SECOND);
|
||||
#if 1000 % RT_TICK_PER_SECOND == 0u
|
||||
return rt_tick_get() * (1000u / RT_TICK_PER_SECOND);
|
||||
#else
|
||||
#warning "rt-thread cannot provide a correct 1ms-based tick any longer,\
|
||||
please redefine this function in another file by using a high-precision hard-timer."
|
||||
|
|
Loading…
Reference in New Issue