Merge pull request #2693 from fpistm/assert_issue_pllr

fpistm · web-flow · commit 7ef0723af176 · 2025-03-19T14:31:50.000+01:00
fix(f7): PLLR value
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/generic_clock.c b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/generic_clock.c
@@ -44,6 +44,7 @@ WEAK void SystemClock_Config(void)
   RCC_OscInitStruct.PLL.PLLN = 216;
   RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
   RCC_OscInitStruct.PLL.PLLQ = 9;
+  RCC_OscInitStruct.PLL.PLLR = 2;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
     Error_Handler();
   }
diff --git a/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_REMRAM_V1.cpp b/variants/STM32F7xx/F765V(G-I)(H-T)_F767V(G-I)(H-T)_F777VI(H-T)/variant_REMRAM_V1.cpp
@@ -172,6 +172,7 @@ WEAK void SystemClock_Config(void)
   RCC_OscInitStruct.PLL.PLLN = 216;
   RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
   RCC_OscInitStruct.PLL.PLLQ = 9;
+  RCC_OscInitStruct.PLL.PLLR = 2;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
     Error_Handler();
   }
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/generic_clock.c b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/generic_clock.c
@@ -42,6 +42,7 @@ WEAK void SystemClock_Config(void)
   RCC_OscInitStruct.PLL.PLLN = 216;
   RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
   RCC_OscInitStruct.PLL.PLLQ = 9;
+  RCC_OscInitStruct.PLL.PLLR = 2;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
     Error_Handler();
   }
diff --git a/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_NUCLEO_F767ZI.cpp b/variants/STM32F7xx/F765Z(G-I)T_F767Z(G-I)T_F777ZIT/variant_NUCLEO_F767ZI.cpp
@@ -171,23 +171,6 @@ extern "C" {
 
 /**
   * @brief  System Clock Configuration
-  *         The system Clock is configured as follow :
-  *            System Clock source            = PLL (HSI)
-  *            SYSCLK(Hz)                     = 216000000
-  *            HCLK(Hz)                       = 216000000
-  *            AHB Prescaler                  = 1
-  *            APB1 Prescaler                 = 4
-  *            APB2 Prescaler                 = 2
-  *            HSE Frequency(Hz)              = 16000000
-  *            PLL_M                          = 8
-  *            PLL_N                          = 216
-  *            PLL_P                          = 2
-  *            PLL_Q                          = 9
-  *            PLLSAI_N                       = 192
-  *            PLLSAI_P                       = 2
-  *            VDD(V)                         = 3.3
-  *            Main regulator output voltage  = Scale1 mode
-  *            Flash Latency(WS)              = 7
   * @param  None
   * @retval None
   */
@@ -203,15 +186,16 @@ WEAK void SystemClock_Config(void)
   __HAL_PWR_VOLTAGESCALING_CONFIG(PWR_REGULATOR_VOLTAGE_SCALE1);
 
   /* Initializes the CPU, AHB and APB busses clocks */
-  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
-  RCC_OscInitStruct.HSIState = RCC_HSI_ON;
+  RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSE;
+  RCC_OscInitStruct.HSEState = RCC_HSE_BYPASS;
   RCC_OscInitStruct.HSICalibrationValue = 16;
   RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
   RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
-  RCC_OscInitStruct.PLL.PLLM = 8;
+  RCC_OscInitStruct.PLL.PLLM = 4;
   RCC_OscInitStruct.PLL.PLLN = 216;
   RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
   RCC_OscInitStruct.PLL.PLLQ = 9;
+  RCC_OscInitStruct.PLL.PLLR = 2;
   if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
     Error_Handler();
   }

Original file line number	Diff line number	Diff line change
`@@ -44,6 +44,7 @@ WEAK void SystemClock_Config(void)`
`44`	`44`	`RCC_OscInitStruct.PLL.PLLN = 216;`
`45`	`45`	`RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;`
`46`	`46`	`RCC_OscInitStruct.PLL.PLLQ = 9;`
	`47`	`+ RCC_OscInitStruct.PLL.PLLR = 2;`
`47`	`48`	`if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {`
`48`	`49`	`Error_Handler();`
`49`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -172,6 +172,7 @@ WEAK void SystemClock_Config(void)`
`172`	`172`	`RCC_OscInitStruct.PLL.PLLN = 216;`
`173`	`173`	`RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;`
`174`	`174`	`RCC_OscInitStruct.PLL.PLLQ = 9;`
	`175`	`+ RCC_OscInitStruct.PLL.PLLR = 2;`
`175`	`176`	`if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {`
`176`	`177`	`Error_Handler();`
`177`	`178`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ WEAK void SystemClock_Config(void)`
`42`	`42`	`RCC_OscInitStruct.PLL.PLLN = 216;`
`43`	`43`	`RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;`
`44`	`44`	`RCC_OscInitStruct.PLL.PLLQ = 9;`
	`45`	`+ RCC_OscInitStruct.PLL.PLLR = 2;`
`45`	`46`	`if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {`
`46`	`47`	`Error_Handler();`
`47`	`48`	`}`