Merge pull request #3741 from jeromecoutant/PR_TICK32

STM32 remove warning in hal_tick_32b.c file
pull/3898/head
Martin Kojtal 2017-03-06 16:49:52 +00:00 committed by GitHub
commit 750ac5152f
1 changed files with 3 additions and 2 deletions

View File

@ -22,6 +22,8 @@
extern TIM_HandleTypeDef TimMasterHandle;
extern void HAL_IncTick(void);
volatile uint32_t PreviousVal = 0;
void us_ticker_irq_handler(void);
@ -90,8 +92,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority)
if (RCC_ClkInitStruct.APB2CLKDivider == RCC_HCLK_DIV1) {
#endif
TimMasterHandle.Init.Prescaler = (uint16_t)((PclkFreq) / 1000000) - 1; // 1 us tick
}
else {
} else {
TimMasterHandle.Init.Prescaler = (uint16_t)((PclkFreq * 2) / 1000000) - 1; // 1 us tick
}