Skip to content

HardwareTimer: Clear IT flag only if callback not previously configured #852

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 13, 2020
Merged

HardwareTimer: Clear IT flag only if callback not previously configured #852

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 22 additions & 12 deletions cores/arduino/HardwareTimer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -852,12 +852,17 @@ void HardwareTimer::setInterruptPriority(uint32_t preemptPriority, uint32_t subP
*/
void HardwareTimer::attachInterrupt(void (*callback)(HardwareTimer *))
{
callbacks[0] = callback;
if (callback != NULL) {
// Clear flag before enabling IT
__HAL_TIM_CLEAR_FLAG(&(_timerObj.handle), TIM_FLAG_UPDATE);
// Enable update interrupt only if callback is valid
__HAL_TIM_ENABLE_IT(&(_timerObj.handle), TIM_IT_UPDATE);
if (callbacks[0] != NULL) {
// Callback previously configured : do not clear neither enable IT, it is just a change of callback
callbacks[0] = callback;
} else {
callbacks[0] = callback;
if (callback != NULL) {
// Clear flag before enabling IT
__HAL_TIM_CLEAR_FLAG(&(_timerObj.handle), TIM_FLAG_UPDATE);
// Enable update interrupt only if callback is valid
__HAL_TIM_ENABLE_IT(&(_timerObj.handle), TIM_IT_UPDATE);
}
}
}

Expand Down Expand Up @@ -889,12 +894,17 @@ void HardwareTimer::attachInterrupt(uint32_t channel, void (*callback)(HardwareT
Error_Handler(); // only channel 1..4 have an interrupt
}

callbacks[channel] = callback;
if (callback != NULL) {
// Clear flag before enabling IT
__HAL_TIM_CLEAR_FLAG(&(_timerObj.handle), interrupt);
// Enable interrupt corresponding to channel, only if callback is valid
__HAL_TIM_ENABLE_IT(&(_timerObj.handle), interrupt);
if (callbacks[channel] != NULL) {
// Callback previously configured : do not clear neither enable IT, it is just a change of callback
callbacks[channel] = callback;
} else {
callbacks[channel] = callback;
if (callback != NULL) {
// Clear flag before enabling IT
__HAL_TIM_CLEAR_FLAG(&(_timerObj.handle), interrupt);
// Enable interrupt corresponding to channel, only if callback is valid
__HAL_TIM_ENABLE_IT(&(_timerObj.handle), interrupt);
}
}
}

Expand Down