ARMmbed
/
mbed-os
mirror of https://github.com/ARMmbed/mbed-os.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #5012 from LMESTM/issue5004_ticker_16b 

STM32_us_ticker_16b: keep code to cope with past event
pull/5069/head
Jimmy Brisson 2017-09-09 12:09:25 -05:00 committed by GitHub
parent e0bc631a0a f2eb77a81a
commit 3f2e986256
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
targets/TARGET_STM/us_ticker_16b.c
View File

@ -152,6 +152,7 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
*/ */
uint32_t current_time = us_ticker_read(); uint32_t current_time = us_ticker_read();
uint32_t delta = timestamp - current_time; uint32_t delta = timestamp - current_time;
/* Note: The case of delta <= 0 is handled in MBED upper layer */
oc_int_part = (delta - 1) >> 16; oc_int_part = (delta - 1) >> 16;
if ( ((delta - 1) & 0xFFFF) >= 0x8000 && if ( ((delta - 1) & 0xFFFF) >= 0x8000 &&
__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET ) { __HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET ) {
@ -169,6 +170,9 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
void us_ticker_fire_interrupt(void) void us_ticker_fire_interrupt(void)
{ {
/* When firing the event, the number of 16 bits counter wrap-ups (oc_int)
* must be re-initialized */
oc_int_part = 0;
HAL_TIM_GenerateEvent(&TimMasterHandle, TIM_EVENTSOURCE_CC1); HAL_TIM_GenerateEvent(&TimMasterHandle, TIM_EVENTSOURCE_CC1);
} }