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

[STM32F4XX] Fix timer interrupt handler

pull/2093/head
svastm 2016-06-21 13:43:32 +02:00
parent 307a13c095
commit db49b362e9
16 changed files with 285 additions and 213 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_B96B_F446VE/hal_tick.c
View File

@ -44,23 +44,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

32
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F401VC/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -78,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

30
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F429ZI/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

34
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_DISCO_F469NI/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -76,9 +80,9 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
if ( SystemCoreClock == 16000000 ) { if ( SystemCoreClock == 16000000 ) {
TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
} else { } else {
TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 2 / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 2 / 1000000) - 1; // 1 <EFBFBD>s tick
} }
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;

31
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_ELMO_F411RE/hal_tick.c
View File

@ -41,23 +41,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -77,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

31
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_MTS_DRAGONFLY_F411RE/hal_tick.c
View File

@ -41,23 +41,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -77,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

32
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_MTS_MDOT_F405RG/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -75,7 +79,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

31
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_MTS_MDOT_F411RE/hal_tick.c
View File

@ -41,23 +41,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -77,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

32
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F401RE/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -78,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

31
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F410RB/hal_tick.c
View File

@ -41,23 +41,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -77,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

31
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F411RE/hal_tick.c
View File

@ -41,23 +41,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -77,7 +82,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)(SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;

30
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F429ZI/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

29
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446RE/hal_tick.c
View File

@ -44,23 +44,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

29
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_NUCLEO_F446ZE/hal_tick.c
View File

@ -44,23 +44,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) {
us_ticker_irq_handler(); if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__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(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }

34
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_STM32F407VG/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -76,9 +80,9 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
if ( SystemCoreClock == 16000000 ) { if ( SystemCoreClock == 16000000 ) {
TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
} else { } else {
TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 2 / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 2 / 1000000) - 1; // 1 <EFBFBD>s tick
} }
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;

32
hal/targets/cmsis/TARGET_STM/TARGET_STM32F4/TARGET_UBLOX_C029/hal_tick.c
View File

@ -41,24 +41,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 0 // For DEBUG only #if 0 // For DEBUG only
HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6); HAL_GPIO_TogglePin(GPIOB, GPIO_PIN_6);
#endif #endif
}
} }
} }
} }
@ -75,7 +79,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base // Configure time base
TimMasterHandle.Instance = TIM_MST; TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF; TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 µs tick TimMasterHandle.Init.Prescaler = (uint32_t)( SystemCoreClock / 1000000) - 1; // 1 <EFBFBD>s tick
TimMasterHandle.Init.ClockDivision = 0; TimMasterHandle.Init.ClockDivision = 0;
TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP; TimMasterHandle.Init.CounterMode = TIM_COUNTERMODE_UP;
TimMasterHandle.Init.RepetitionCounter = 0; TimMasterHandle.Init.RepetitionCounter = 0;