Skip to content

Commit 7ef0723

Browse files
authored
Merge pull request stm32duino#2693 from fpistm/assert_issue_pllr
fix(f7): PLLR value
2 parents e4b9bc8 + 1ef1f86 commit 7ef0723

File tree

4 files changed

+7
-20
lines changed

4 files changed

+7
-20
lines changed

Diff for: variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/generic_clock.c

+1
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ WEAK void SystemClock_Config(void)
4444
RCC_OscInitStruct.PLL.PLLN = 216;
4545
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
4646
RCC_OscInitStruct.PLL.PLLQ = 9;
47+
RCC_OscInitStruct.PLL.PLLR = 2;
4748
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
4849
Error_Handler();
4950
}

Diff for: variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_REMRAM_V1.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ WEAK void SystemClock_Config(void)
172172
RCC_OscInitStruct.PLL.PLLN = 216;
173173
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
174174
RCC_OscInitStruct.PLL.PLLQ = 9;
175+
RCC_OscInitStruct.PLL.PLLR = 2;
175176
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
176177
Error_Handler();
177178
}

Diff for: variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/generic_clock.c

+1
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ WEAK void SystemClock_Config(void)
4242
RCC_OscInitStruct.PLL.PLLN = 216;
4343
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
4444
RCC_OscInitStruct.PLL.PLLQ = 9;
45+
RCC_OscInitStruct.PLL.PLLR = 2;
4546
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
4647
Error_Handler();
4748
}

Diff for: variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_NUCLEO_F767ZI.cpp

+4-20
Original file line numberDiff line numberDiff line change
@@ -171,23 +171,6 @@ extern "C" {
171171

172172
/**
173173
* @brief System Clock Configuration
174-
* The system Clock is configured as follow :
175-
* System Clock source = PLL (HSI)
176-
* SYSCLK(Hz) = 216000000
177-
* HCLK(Hz) = 216000000
178-
* AHB Prescaler = 1
179-
* APB1 Prescaler = 4
180-
* APB2 Prescaler = 2
181-
* HSE Frequency(Hz) = 16000000
182-
* PLL_M = 8
183-
* PLL_N = 216
184-
* PLL_P = 2
185-
* PLL_Q = 9
186-
* PLLSAI_N = 192
187-
* PLLSAI_P = 2
188-
* VDD(V) = 3.3
189-
* Main regulator output voltage = Scale1 mode
190-
* Flash Latency(WS) = 7
191174
* @param None
192175
* @retval None
193176
*/
@@ -203,15 +186,16 @@ WEAK void SystemClock_Config(void)
203186
__HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
204187

205188
/* Initializes the CPU, AHB and APB busses clocks */
206-
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
207-
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
189+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
190+
RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
208191
RCC_OscInitStruct.HSICalibrationValue = 16;
209192
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
210193
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
211-
RCC_OscInitStruct.PLL.PLLM = 8;
194+
RCC_OscInitStruct.PLL.PLLM = 4;
212195
RCC_OscInitStruct.PLL.PLLN = 216;
213196
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
214197
RCC_OscInitStruct.PLL.PLLQ = 9;
198+
RCC_OscInitStruct.PLL.PLLR = 2;
215199
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
216200
Error_Handler();
217201
}

0 commit comments

Comments
 (0)