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

check for instantaneous callback before checking for repeat callback.

pull/932/head
Rohit Grover 2015-02-25 12:15:06 +00:00 committed by Rohit Grover
parent b7cd6b6ae8
commit 90354c0a23
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/mbed/targets/hal/TARGET_NORDIC/TARGET_MCU_NRF51822/us_ticker.c
View File

@ -188,15 +188,15 @@ void us_ticker_set_interrupt(timestamp_t timestamp)
} }
uint32_t callbackTime = MICROSECONDS_TO_RTC_UNITS(timestamp); uint32_t callbackTime = MICROSECONDS_TO_RTC_UNITS(timestamp);
if (us_ticker_callbackPending && (callbackTime == us_ticker_callbackTimestamp)) {
return;
}
if (callbackTime == rtc1_getCounter()) { if (callbackTime == rtc1_getCounter()) {
us_ticker_callbackPending = false; us_ticker_callbackPending = false;
rtc1_disableCompareInterrupt(); rtc1_disableCompareInterrupt();
us_ticker_irq_handler(); us_ticker_irq_handler();
return; return;
} }
if (us_ticker_callbackPending && (callbackTime == us_ticker_callbackTimestamp)) {
return;
}
NRF_RTC1->CC[0] = callbackTime & MAX_RTC_COUNTER_VAL; NRF_RTC1->CC[0] = callbackTime & MAX_RTC_COUNTER_VAL;
us_ticker_callbackTimestamp = callbackTime; us_ticker_callbackTimestamp = callbackTime;