Minor changes

pull/3213/head
bcostm 2016-10-26 11:01:16 +02:00
parent c3b8943f66
commit ba8b33adc5
2 changed files with 5 additions and 5 deletions

View File

@ -166,7 +166,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
GPIO_InitStruct.Pin = GPIO_PIN_6;
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_HIGH;
GPIO_InitStruct.Speed = GPIO_SPEED_FAST;
HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
#endif

View File

@ -75,7 +75,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
HAL_RCC_GetClockConfig(&RCC_ClkInitStruct, &PclkFreq);
// Get timer clock value
PclkFreq = TIM_MST_GET_PCLK_FREQ();
PclkFreq = TIM_MST_GET_PCLK_FREQ;
// Enable timer clock
TIM_MST_RCC;
@ -86,7 +86,7 @@ HAL_StatusTypeDef HAL_InitTick(uint32_t TickPriority) {
// Configure time base
TimMasterHandle.Instance = TIM_MST;
TimMasterHandle.Init.Period = 0xFFFFFFFF;
TimMasterHandle.Init.Period = 0xFFFFFFFF;
// TIMxCLK = PCLKx when the APB prescaler = 1 else TIMxCLK = 2 * PCLKx
if (RCC_ClkInitStruct.APB1CLKDivider == RCC_HCLK_DIV1) {
@ -131,7 +131,7 @@ void HAL_SuspendTick(void)
TimMasterHandle.Instance = TIM_MST;
// Disable HAL tick and us_ticker update interrupts (used for 32 bit counter)
__HAL_TIM_DISABLE_IT(&TimMasterHandle, TIM_IT_CC2);
__HAL_TIM_DISABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
}
void HAL_ResumeTick(void)
@ -139,7 +139,7 @@ void HAL_ResumeTick(void)
TimMasterHandle.Instance = TIM_MST;
// Enable HAL tick and us_ticker update interrupts (used for 32 bit counter)
__HAL_TIM_ENABLE_IT(&TimMasterHandle, TIM_IT_CC2);
__HAL_TIM_ENABLE_IT(&TimMasterHandle, (TIM_IT_CC2 | TIM_IT_UPDATE));
}
#endif // !TIM_MST_16BIT