From ba8b33adc520b77a15cf97968c448e201bd45588 Mon Sep 17 00:00:00 2001 From: bcostm Date: Wed, 26 Oct 2016 11:01:16 +0200 Subject: [PATCH] Minor changes --- targets/TARGET_STM/stm_hal_tick_16b.c | 2 +- targets/TARGET_STM/stm_hal_tick_32b.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/targets/TARGET_STM/stm_hal_tick_16b.c b/targets/TARGET_STM/stm_hal_tick_16b.c index 867c629492..97fc6103cb 100644 --- a/targets/TARGET_STM/stm_hal_tick_16b.c +++ b/targets/TARGET_STM/stm_hal_tick_16b.c @@ -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 diff --git a/targets/TARGET_STM/stm_hal_tick_32b.c b/targets/TARGET_STM/stm_hal_tick_32b.c index 8f1166883a..aa8ee3bed3 100644 --- a/targets/TARGET_STM/stm_hal_tick_32b.c +++ b/targets/TARGET_STM/stm_hal_tick_32b.c @@ -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