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

[STM32F7XX] Fix timer interrupt handler

pull/2093/head
svastm 2016-06-21 13:45:16 +02:00
parent db49b362e9
commit 67ef32c51a
3 changed files with 51 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hal/targets/cmsis/TARGET_STM/TARGET_STM32F7/TARGET_DISCO_F746NG/hal_tick.c
View File

@ -45,24 +45,28 @@ void us_ticker_irq_handler(void);
void timer_irq_handler(void) { void timer_irq_handler(void) {
// Channel 1 for mbed timeout // Channel 1 for mbed timeout
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC1) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
us_ticker_irq_handler(); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
us_ticker_irq_handler();
}
} }
// Channel 2 for HAL tick // Channel 2 for HAL tick
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC2) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_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;
#if DEBUG_TICK > 0 #if DEBUG_TICK > 0
HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

30
hal/targets/cmsis/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F746ZG/hal_tick.c
View File

@ -45,24 +45,28 @@ void us_ticker_irq_handler(void);
void timer_irq_handler(void) { void timer_irq_handler(void) {
// Channel 1 for mbed timeout // Channel 1 for mbed timeout
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC1) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
us_ticker_irq_handler(); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
us_ticker_irq_handler();
}
} }
// Channel 2 for HAL tick // Channel 2 for HAL tick
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC2) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_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;
#if DEBUG_TICK > 0 #if DEBUG_TICK > 0
HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

30
hal/targets/cmsis/TARGET_STM/TARGET_STM32F7/TARGET_NUCLEO_F767ZI/hal_tick.c
View File

@ -45,24 +45,28 @@ void us_ticker_irq_handler(void);
void timer_irq_handler(void) { void timer_irq_handler(void) {
// Channel 1 for mbed timeout // Channel 1 for mbed timeout
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC1) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
us_ticker_irq_handler(); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
us_ticker_irq_handler();
}
} }
// Channel 2 for HAL tick // Channel 2 for HAL tick
if (__HAL_TIM_GET_ITSTATUS(&TimMasterHandle, TIM_IT_CC2) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC2) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_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;
#if DEBUG_TICK > 0 #if DEBUG_TICK > 0
HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOG, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }