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 #2194 from zgoda/BLUEPILL_fix_int_handler 

[BLUEPILL_F103C8] Fix interrupt handler
pull/2098/head
Martin Kojtal 2016-07-21 10:56:21 +01:00 committed by GitHub
parent 48c1d2eb7a c005781063
commit c9d8690fa9
1 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
hal/targets/cmsis/TARGET_STM/TARGET_STM32F1/TARGET_BLUEPILL_F103C8/hal_tick.c
View File

@ -52,37 +52,43 @@ void timer_irq_handler(void) {
// Clear Update interrupt flag // Clear Update interrupt flag
if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_UPDATE) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_UPDATE) == SET) {
__HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_UPDATE); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_UPDATE) == SET) {
SlaveCounter++; __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_UPDATE);
SlaveCounter++;
}
} }
// Channel 1 for mbed timeout // Channel 1 for mbed timeout
if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
__HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC1); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
if (oc_rem_part > 0) { __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
set_compare(oc_rem_part); // Finish the remaining time left if (oc_rem_part > 0) {
oc_rem_part = 0; set_compare(oc_rem_part); // Finish the remaining time left
} else { oc_rem_part = 0;
if (oc_int_part > 0) {
set_compare(0xFFFF);
oc_rem_part = cnt_val; // To finish the counter loop the next time
oc_int_part--;
} else { } else {
us_ticker_irq_handler(); if (oc_int_part > 0) {
set_compare(0xFFFF);
oc_rem_part = cnt_val; // To finish the counter loop the next time
oc_int_part--;
} else {
us_ticker_irq_handler();
}
} }
} }
} }
// Channel 2 for HAL tick // Channel 2 for HAL tick
if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
__HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC2); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC2) == SET) {
uint32_t val = __HAL_TIM_GetCounter(&TimMasterHandle); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC2);
if ((val - PreviousVal) >= HAL_TICK_DELAY) { uint32_t val = __HAL_TIM_GetCounter(&TimMasterHandle);
// Increment HAL variable if ((val - PreviousVal) >= HAL_TICK_DELAY) {
HAL_IncTick(); // Increment HAL variable
// Prepare next interrupt HAL_IncTick();
__HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY); // Prepare next interrupt
PreviousVal = val; __HAL_TIM_SetCompare(&TimMasterHandle, TIM_CHANNEL_2, val + HAL_TICK_DELAY);
PreviousVal = val;
}
} }
} }
} }