Skip to content

Commit 5121b8d

Browse files
authored
Update drv_hwtimer.c
好的,已修正。
1 parent dbd389a commit 5121b8d

File tree

1 file changed

+20
-4
lines changed

1 file changed

+20
-4
lines changed

Diff for: bsp/stm32/libraries/HAL_Drivers/drv_hwtimer.c

+20-4
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,16 @@ static void timer_init(struct rt_hwtimer_device *timer, rt_uint32_t state)
168168
uint32_t FLatency = 0;
169169
RCC_ClkInitTypeDef RCC_ClkInitStruct;
170170
HAL_RCC_GetClockConfig(&RCC_ClkInitStruct, &FLatency);
171-
uint32_t pclk1_doubler = 1 + ( RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1 );
172-
uint32_t pclk2_doubler = 1 + ( RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1 );
171+
uint32_t pclk1_doubler = 1;
172+
uint32_t pclk2_doubler = 1;
173+
if(RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1)
174+
{
175+
pclk1_doubler = pclk1_doubler + 1;
176+
}
177+
if(RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1)
178+
{
179+
pclk2_doubler = pclk2_doubler + 1;
180+
}
173181

174182
/* time init */
175183
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)
@@ -300,8 +308,16 @@ static rt_err_t timer_ctrl(rt_hwtimer_t *timer, rt_uint32_t cmd, void *arg)
300308
uint32_t FLatency = 0;
301309
RCC_ClkInitTypeDef RCC_ClkInitStruct;
302310
HAL_RCC_GetClockConfig(&RCC_ClkInitStruct, &FLatency);
303-
uint32_t pclk1_doubler = 1 + ( RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1 );
304-
uint32_t pclk2_doubler = 1 + ( RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1 );
311+
uint32_t pclk1_doubler = 1;
312+
uint32_t pclk2_doubler = 1;
313+
if(RCC_ClkInitStruct.APB1CLKDivider != RCC_HCLK_DIV1)
314+
{
315+
pclk1_doubler = pclk1_doubler + 1;
316+
}
317+
if(RCC_ClkInitStruct.APB2CLKDivider != RCC_HCLK_DIV1)
318+
{
319+
pclk2_doubler = pclk2_doubler + 1;
320+
}
305321

306322
#if defined(SOC_SERIES_STM32F2) || defined(SOC_SERIES_STM32F4) || defined(SOC_SERIES_STM32F7)
307323
if (tim->Instance == TIM9 || tim->Instance == TIM10 || tim->Instance == TIM11)

0 commit comments

Comments
 (0)