mbed blinky
Fork of mbed-MapleMini by
Diff: SysClockConf.cpp
- Revision:
- 3:f0b2ddbf8ba6
- Parent:
- 1:7b9d53d8e473
--- a/SysClockConf.cpp Sun Oct 09 09:26:45 2016 +0000 +++ b/SysClockConf.cpp Mon Jul 10 21:53:17 2017 +0000 @@ -4,7 +4,7 @@ * @author Zoltan Hudak * @version * @date 05-July-2016 - * @brief System Clock configuration for STM32F103C8T6 + * @brief System Clock configuration for Maple Mini ****************************************************************************** * @attention * @@ -29,8 +29,13 @@ #include "SysClockConf.h" #include "mbed.h" -bool HSE_SystemClock_Config(void) { - RCC_OscInitTypeDef RCC_OscInitStruct; +#include "SysClockConf.h" +#include "mbed.h" + +void HSE_SystemClock_Config(void) { + RCC_OscInitTypeDef RCC_OscInitStruct; + RCC_ClkInitTypeDef RCC_ClkInitStruct; + RCC_PeriphCLKInitTypeDef PeriphClkInit; RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE; RCC_OscInitStruct.HSEState = RCC_HSE_ON; @@ -38,43 +43,26 @@ RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON; RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE; RCC_OscInitStruct.PLL.PLLMUL = RCC_PLL_MUL9; - - if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) { - return false; - } - - RCC_ClkInitTypeDef RCC_ClkInitStruct; - - RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK - |RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; + HAL_RCC_OscConfig(&RCC_OscInitStruct); + RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK|RCC_CLOCKTYPE_SYSCLK|RCC_CLOCKTYPE_PCLK1|RCC_CLOCKTYPE_PCLK2; RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK; RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1; RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV2; RCC_ClkInitStruct.APB2CLKDivider = RCC_HCLK_DIV1; - if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) { - return false; - } - - RCC_PeriphCLKInitTypeDef PeriphClkInit; - + HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2); PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_ADC|RCC_PERIPHCLK_USB; PeriphClkInit.AdcClockSelection = RCC_ADCPCLK2_DIV6; - PeriphClkInit.UsbClockSelection = RCC_USBPLLCLK_DIV1_5; - if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) { - return false; - } - return true; + PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_PLL_DIV1_5; + HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit); } -bool confSysClock(void) { +void confSysClock(void) { HAL_RCC_DeInit(); - if (!HSE_SystemClock_Config()) { - return false; - } + HSE_SystemClock_Config(); SystemCoreClockUpdate(); - return true; } +