Skip to content

Commit 188aa5e

Browse files
fpistmfpistm
committed
chore(variants): ensure LPUART clock source config
Since uart rework, LPUART source have to be properly set in SystemClock_Config() to ensure 9600 baudrate is supported. Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 457408a commit 188aa5e

34 files changed

Lines changed: 294 additions & 90 deletions

File tree

‎variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/generic_clock.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ WEAK void SystemClock_Config(void)
2626
{
2727
RCC_OscInitTypeDef RCC_OscInitStruct = {};
2828
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
29+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
2930

3031
/* Configure the main internal regulator output voltage */
3132
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
@@ -57,6 +58,12 @@ WEAK void SystemClock_Config(void)
5758
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
5859
Error_Handler();
5960
}
61+
/* Initializes the peripherals clocks */
62+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
63+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
64+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
65+
Error_Handler();
66+
}
6067
}
6168

6269
#endif /* ARDUINO_GENERIC_* */

‎variants/STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)/variant_NUCLEO_G031K8.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@ WEAK void SystemClock_Config(void)
8080
{
8181
RCC_OscInitTypeDef RCC_OscInitStruct = {};
8282
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
83+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
8384

8485
/* Configure the main internal regulator output voltage */
8586
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
@@ -111,6 +112,12 @@ WEAK void SystemClock_Config(void)
111112
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
112113
Error_Handler();
113114
}
115+
/* Initializes the peripherals clocks */
116+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
117+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
118+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
119+
Error_Handler();
120+
}
114121
}
115122

116123
#ifdef __cplusplus

‎variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/generic_clock.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ WEAK void SystemClock_Config(void)
2525
{
2626
RCC_OscInitTypeDef RCC_OscInitStruct = {};
2727
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
28+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
2829

2930
/* Configure the main internal regulator output voltage */
3031
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
@@ -53,6 +54,12 @@ WEAK void SystemClock_Config(void)
5354
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
5455
Error_Handler();
5556
}
57+
/* Initializes the peripherals clocks */
58+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
59+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
60+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
61+
Error_Handler();
62+
}
5663
}
5764

5865
#endif /* ARDUINO_GENERIC_* */

‎variants/STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)/variant_AGAFIA_SG0.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ WEAK void SystemClock_Config(void)
129129
{
130130
RCC_OscInitTypeDef RCC_OscInitStruct = {};
131131
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
132+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
132133

133134
/* Configure the main internal regulator output voltage */
134135
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
@@ -157,6 +158,12 @@ WEAK void SystemClock_Config(void)
157158
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
158159
Error_Handler();
159160
}
161+
/* Initializes the peripherals clocks */
162+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
163+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
164+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
165+
Error_Handler();
166+
}
160167
}
161168
#ifdef __cplusplus
162169
}

‎variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/generic_clock.c‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ WEAK void SystemClock_Config(void)
2424
{
2525
RCC_OscInitTypeDef RCC_OscInitStruct = {};
2626
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
27+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
2728

2829
/** Configure the main internal regulator output voltage
2930
*/
@@ -56,6 +57,12 @@ WEAK void SystemClock_Config(void)
5657
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
5758
Error_Handler();
5859
}
60+
/* Initializes the peripherals clocks */
61+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
62+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
63+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
64+
Error_Handler();
65+
}
5966
}
6067

6168
#endif /* ARDUINO_GENERIC_* */

‎variants/STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)/variant_NUCLEO_G071RB.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,7 @@ WEAK void SystemClock_Config(void)
133133
{
134134
RCC_OscInitTypeDef RCC_OscInitStruct = {};
135135
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
136+
RCC_PeriphCLKInitTypeDef PeriphClkInit = {};
136137

137138
/* Configure the main internal regulator output voltage */
138139
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
@@ -161,6 +162,12 @@ WEAK void SystemClock_Config(void)
161162
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
162163
Error_Handler();
163164
}
165+
/* Initializes the peripherals clocks */
166+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1;
167+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
168+
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
169+
Error_Handler();
170+
}
164171
}
165172

166173
#ifdef __cplusplus

‎variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/generic_clock.c‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ WEAK void SystemClock_Config(void)
5858
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
5959
Error_Handler();
6060
}
61-
/** Initializes the peripherals clocks
62-
*/
63-
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
61+
/* Initializes the peripherals clocks */
62+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_USB;
63+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
6464
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
6565
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
6666
Error_Handler();

‎variants/STM32G0xx/G0B1R(B-C-E)T_G0C1R(C-E)T/variant_NUCLEO_G0B1RE.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ WEAK void SystemClock_Config(void)
154154
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
155155
Error_Handler();
156156
}
157-
/** Initializes the peripherals clocks
158-
*/
159-
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
157+
/* Initializes the peripherals clocks */
158+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_USB;
159+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;
160160
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
161161
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
162162
Error_Handler();

‎variants/STM32G4xx/G431K(6-8-B)(T-U)_G441KB(T-U)/generic_clock.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,8 @@ WEAK void SystemClock_Config(void)
6161
}
6262
/** Initializes the peripherals clocks
6363
*/
64-
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
64+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_USB;
65+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;;
6566
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
6667
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
6768
Error_Handler();

‎variants/STM32G4xx/G431R(6-8)(I-T)_G431RB(I-T)x(Z)_G441RB(I-T)/generic_clock.c‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,8 @@ WEAK void SystemClock_Config(void)
6262
}
6363
/** Initializes the peripherals clocks
6464
*/
65-
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_USB;
65+
PeriphClkInit.PeriphClockSelection = RCC_PERIPHCLK_LPUART1 | RCC_PERIPHCLK_USB;
66+
PeriphClkInit.Lpuart1ClockSelection = RCC_LPUART1CLKSOURCE_HSI;;
6667
PeriphClkInit.UsbClockSelection = RCC_USBCLKSOURCE_HSI48;
6768
if (HAL_RCCEx_PeriphCLKConfig(&PeriphClkInit) != HAL_OK) {
6869
Error_Handler();

0 commit comments

Comments
 (0)