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

stm32 ticker: corrections in order to pass tests

pull/7290/head
bcostm 2018-06-26 12:48:50 +02:00
parent 7097e07b62
commit fc50e28ae6
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
targets/TARGET_STM/hal_tick_overrides.c
View File

@ -25,7 +25,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
uint32_t HAL_GetTick() uint32_t HAL_GetTick()
{ {
return ticker_read_us(get_us_ticker_data()) / 1000; // 1 ms tick is required for ST HAL_Delay function return 0;
} }
void HAL_SuspendTick(void) void HAL_SuspendTick(void)

11
targets/TARGET_STM/us_ticker.c
View File

@ -20,6 +20,8 @@
TIM_HandleTypeDef TimMasterHandle; TIM_HandleTypeDef TimMasterHandle;
bool us_ticker_initialized = false;
const ticker_info_t *us_ticker_get_info() const ticker_info_t *us_ticker_get_info()
{ {
static const ticker_info_t info = { static const ticker_info_t info = {
@ -53,7 +55,7 @@ void timer_oc_irq_handler(void)
if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) { if (__HAL_TIM_GET_FLAG(&TimMasterHandle, TIM_FLAG_CC1) == SET) {
if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) { if (__HAL_TIM_GET_IT_SOURCE(&TimMasterHandle, TIM_IT_CC1) == SET) {
__HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1); __HAL_TIM_CLEAR_IT(&TimMasterHandle, TIM_IT_CC1);
us_ticker_irq_handler(); us_ticker_irq_handler();
} }
} }
} }
@ -76,6 +78,11 @@ void timer_irq_handler(void)
void us_ticker_init(void) void us_ticker_init(void)
{ {
if (us_ticker_initialized) {
__HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC1);
__HAL_TIM_CLEAR_FLAG(&TimMasterHandle, TIM_FLAG_CC1);
return;
}
// ************************************ 16-bit timer ************************************ // ************************************ 16-bit timer ************************************
#if TIM_MST_BIT_WIDTH == 16 #if TIM_MST_BIT_WIDTH == 16
@ -195,6 +202,8 @@ void us_ticker_init(void)
#endif // 16-bit/32-bit timer #endif // 16-bit/32-bit timer
us_ticker_initialized = true;
} }
uint32_t us_ticker_read() uint32_t us_ticker_read()