mirror of https://github.com/ARMmbed/mbed-os.git
STM32F4 : correct ST HAL API call
- RCC init: one PLL parameter was missing - GPIO: mode was not allowed by ST HAL APIpull/3391/head
parent
fa8529dea3
commit
dd88e97e0b
|
@ -808,6 +808,8 @@ void SystemClock_Config(void)
|
||||||
RCC_OscInitStruct.PLL.PLLN = 336;
|
RCC_OscInitStruct.PLL.PLLN = 336;
|
||||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
||||||
RCC_OscInitStruct.PLL.PLLQ = 7;
|
RCC_OscInitStruct.PLL.PLLQ = 7;
|
||||||
|
RCC_OscInitStruct.PLL.PLLR = 2; // I2S clocks
|
||||||
|
|
||||||
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
||||||
|
|
||||||
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
|
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1
|
||||||
|
@ -843,6 +845,8 @@ void SystemClock_Config(void)
|
||||||
RCC_OscInitStruct.PLL.PLLN = 360;
|
RCC_OscInitStruct.PLL.PLLN = 360;
|
||||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
|
||||||
RCC_OscInitStruct.PLL.PLLQ = 7;
|
RCC_OscInitStruct.PLL.PLLQ = 7;
|
||||||
|
RCC_OscInitStruct.PLL.PLLR = 2; // I2S clocks
|
||||||
|
|
||||||
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
HAL_RCC_OscConfig(&RCC_OscInitStruct);
|
||||||
|
|
||||||
HAL_PWREx_ActivateOverDrive();
|
HAL_PWREx_ActivateOverDrive();
|
||||||
|
|
|
@ -840,6 +840,7 @@ uint8_t SetSysClock_PLL_HSE(uint8_t bypass)
|
||||||
RCC_OscInitStruct.PLL.PLLN = 192; // VCO output clock = 384 MHz (2 MHz * 192)
|
RCC_OscInitStruct.PLL.PLLN = 192; // VCO output clock = 384 MHz (2 MHz * 192)
|
||||||
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4; // PLLCLK = 96 MHz (384 MHz / 4)
|
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV4; // PLLCLK = 96 MHz (384 MHz / 4)
|
||||||
RCC_OscInitStruct.PLL.PLLQ = 8; // USB clock = 48 MHz (384 MHz / 8) --> Good for USB
|
RCC_OscInitStruct.PLL.PLLQ = 8; // USB clock = 48 MHz (384 MHz / 8) --> Good for USB
|
||||||
|
RCC_OscInitStruct.PLL.PLLR = 2; // I2S clocks
|
||||||
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
|
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK)
|
||||||
{
|
{
|
||||||
return 0; // FAIL
|
return 0; // FAIL
|
||||||
|
|
|
@ -304,7 +304,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
|
||||||
mode = STM_MODE_IT_FALLING;
|
mode = STM_MODE_IT_FALLING;
|
||||||
obj->event = EDGE_FALL;
|
obj->event = EDGE_FALL;
|
||||||
} else { // NONE or RISE
|
} else { // NONE or RISE
|
||||||
mode = STM_MODE_IT_EVT_RESET;
|
mode = STM_MODE_INPUT;
|
||||||
obj->event = EDGE_NONE;
|
obj->event = EDGE_NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -313,7 +313,7 @@ void gpio_irq_set(gpio_irq_t *obj, gpio_irq_event event, uint32_t enable)
|
||||||
mode = STM_MODE_IT_RISING;
|
mode = STM_MODE_IT_RISING;
|
||||||
obj->event = EDGE_RISE;
|
obj->event = EDGE_RISE;
|
||||||
} else { // NONE or FALL
|
} else { // NONE or FALL
|
||||||
mode = STM_MODE_IT_EVT_RESET;
|
mode = STM_MODE_INPUT;
|
||||||
obj->event = EDGE_NONE;
|
obj->event = EDGE_NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue