Commit91b29fb

authored

Merge pull request#2619 from ALTracer/fix/variant_WEACT_G474CE

variant(g4): Fix clock config of WeAct STM32G474CoreBoard

2 parents65677a2 +b940809 commit91b29fbCopy full SHA for 91b29fb

File tree

2 files changed

+20

-2

lines changed

variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU
- variant_WEACT_G474CE.cpp
- variant_WEACT_G474CE.h

2 files changed

+20

-2

lines changed

`‎variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_WEACT_G474CE.cpp‎`

Lines changed: 16 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -98,6 +98,7 @@ WEAK void SystemClock_Config(void)`
`98`	`98`	`RCC_OscInitTypeDef RCC_OscInitStruct = {};`
`99`	`99`	`RCC_ClkInitTypeDef RCC_ClkInitStruct = {};`
`100`	`100`	`#ifdef USBCON`
	`101`	`+ RCC_CRSInitTypeDef RCC_CRSInitStruct = {};`
`101`	`102`	`RCC_PeriphCLKInitTypeDef PeriphClkInit = {};`
`102`	`103`	`#endif`
`103`	`104`
`@@ -111,7 +112,7 @@ WEAK void SystemClock_Config(void)`
`111`	`112`	`RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;`
`112`	`113`	`RCC_OscInitStruct.HSI48State = RCC_HSI48_ON;`
`113`	`114`	`RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;`
`114`		`- RCC_OscInitStruct.PLL.PLLM =RCC_PLLM_DIV4;`
	`115`	`+ RCC_OscInitStruct.PLL.PLLM =RCC_PLLM_DIV2;`
`115`	`116`	`RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSE;`
`116`	`117`	`RCC_OscInitStruct.PLL.PLLN =85;`
`117`	`118`	`RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;`
`@@ -133,6 +134,19 @@ WEAK void SystemClock_Config(void)`
`133`	`134`	`}`
`134`	`135`
`135`	`136`	`#ifdef USBCON`
	`137`	`+/* Enable the SYSCFG APB clock*/`
	`138`	`+__HAL_RCC_CRS_CLK_ENABLE();`
	`139`	`+`
	`140`	`+/* Configures CRS*/`
	`141`	`+ RCC_CRSInitStruct.Prescaler = RCC_CRS_SYNC_DIV1;`
	`142`	`+ RCC_CRSInitStruct.Source = RCC_CRS_SYNC_SOURCE_USB;`
	`143`	`+ RCC_CRSInitStruct.Polarity = RCC_CRS_SYNC_POLARITY_RISING;`
	`144`	`+ RCC_CRSInitStruct.ReloadValue =__HAL_RCC_CRS_RELOADVALUE_CALCULATE(48000000,1000);`
	`145`	`+ RCC_CRSInitStruct.ErrorLimitValue = RCC_CRS_ERRORLIMIT_DEFAULT;`
	`146`	`+ RCC_CRSInitStruct.HSI48CalibrationValue = RCC_CRS_HSI48CALIBRATION_DEFAULT;`
	`147`	`+`
	`148`	`+HAL_RCCEx_CRSConfig(&RCC_CRSInitStruct);`
	`149`	`+`
`136`	`150`	`/* Initializes the peripherals clocks*/`
`137`	`151`	`PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;`
`138`	`152`	`PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;`
`@@ -146,4 +160,4 @@ WEAK void SystemClock_Config(void)`
`146`	`160`	`}// extern "C"`
`147`	`161`	`#endif`
`148`	`162`
`149`		`-#endif/ARDUINO_NUCLEO_G431RB/`
	`163`	`+#endif/ARDUINO_WEACT_G474CE/`

`‎variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_WEACT_G474CE.h‎`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,10 @@`
`184`	`184`	`#defineHAL_QSPI_MODULE_ENABLED`
`185`	`185`	`#endif`
`186`	`186`
	`187`	`+#ifndefHSE_VALUE`
	`188`	`+#defineHSE_VALUE 8000000U`
	`189`	`+#endif`
	`190`	`+`
`187`	`191`	`/*----------------------------------------------------------------------------`
`188`	`192`	`* Arduino objects - C++ only`
`189`	`193`	`----------------------------------------------------------------------------/`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit91b29fb

File tree

2 files changed

2 files changed

`‎variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_WEACT_G474CE.cpp‎`

`‎variants/STM32G4xx/G473C(B-C-E)U_G474C(B-C-E)U_G483CEU_G484CEU/variant_WEACT_G474CE.h‎`

0 commit comments