Skip to content

Commit 20e87a1

Browse files
fpistmfpistm
authored
Merge pull request #1734 from fpistm/variant_update
variant: update entries and ci config
2 parents 1a2c5e9 + a1a22cb commit 20e87a1

File tree

5 files changed

+141
-26
lines changed

5 files changed

+141
-26
lines changed

‎CI/build/conf/cores_config.json

+10
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,9 @@
8787
"GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX",
8888
"GENERIC_F446RCTX",
8989
"GENERIC_F446VETX",
90+
"GENERIC_F722RCTX",
91+
"GENERIC_F730R8TX",
92+
"GENERIC_F732RETX",
9093
"GENERIC_F745ZETX", "GENERIC_F745ZGTX",
9194
"GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX",
9295
"GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX",
@@ -103,8 +106,15 @@
103106
"GENERIC_G030K6TX",
104107
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
105108
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
109+
"GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX",
110+
"GENERIC_G041F6PX", "GENERIC_G041F8PX",
106111
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
112+
"GENERIC_G070CBTX", "GENERIC_G070KBTX",
113+
"GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX",
114+
"GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX",
115+
"GENERIC_G071G8UXN", "GENERIC_G071GBUXN",
107116
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
117+
"GENERIC_G081CBTX",
108118
"GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX",
109119
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
110120
"GENERIC_G441KBTX",

‎CI/build/conf/cores_config_ci.json

+10
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,9 @@
8686
"GENERIC_F439ZGTX", "GENERIC_F439ZGYX", "GENERIC_F439ZITX", "GENERIC_F439ZIYX",
8787
"GENERIC_F446RCTX",
8888
"GENERIC_F446VETX",
89+
"GENERIC_F722RCTX",
90+
"GENERIC_F730R8TX",
91+
"GENERIC_F732RETX",
8992
"GENERIC_F745ZETX", "GENERIC_F745ZGTX",
9093
"GENERIC_F746BETX", "GENERIC_F746BGTX", "GENERIC_F746NEHX",
9194
"GENERIC_F746ZETX", "GENERIC_F746ZEYX", "GENERIC_F746ZGYX",
@@ -102,8 +105,15 @@
102105
"GENERIC_G030K6TX",
103106
"GENERIC_G031J4MX", "GENERIC_G031J6MX",
104107
"GENERIC_G031K4TX", "GENERIC_G031K4UX", "GENERIC_G031K6TX", "GENERIC_G031K6UX", "GENERIC_G031K8TX", "GENERIC_G031K8UX",
108+
"GENERIC_G031F4PX", "GENERIC_G031F6PX", "GENERIC_G031F8PX", "GENERIC_G031Y8YX",
109+
"GENERIC_G041F6PX", "GENERIC_G041F8PX",
105110
"GENERIC_G041K6TX", "GENERIC_G041K6UX", "GENERIC_G041K8UX",
111+
"GENERIC_G070CBTX", "GENERIC_G070KBTX",
112+
"GENERIC_G071C6TX", "GENERIC_G071C8TX", "GENERIC_G071CBTX",
113+
"GENERIC_G071C6UX", "GENERIC_G071C8UX", "GENERIC_G071CBUX",
114+
"GENERIC_G071G8UXN", "GENERIC_G071GBUXN",
106115
"GENERIC_G071R6TX", "GENERIC_G071R8TX", "GENERIC_G071RBIX", "GENERIC_G071RBTX", "GENERIC_G081RBIX",
116+
"GENERIC_G081CBTX",
107117
"GENERIC_G0B1RBTX", "GENERIC_G0B1RCTX", "GENERIC_G0C1RCTX", "GENERIC_G0C1RETX",
108118
"GENERIC_G431K6TX", "GENERIC_G431K6UX", "GENERIC_G431K8TX", "GENERIC_G431K8UX", "GENERIC_G431KBTX", "GENERIC_G431KBUX",
109119
"GENERIC_G441KBTX",

‎README.md

+3
Original file line numberDiff line numberDiff line change
@@ -314,9 +314,12 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
314314
| :yellow_heart: | STM32G070CB | Generic Board | **2.3.0** | |
315315
| :yellow_heart: | STM32G070KB | Generic Board | **2.3.0** | |
316316
| :yellow_heart: | STM32G070RB | Generic Board | **2.3.0** | |
317+
| :yellow_heart: | STM32G071C6T<br>STM32G071C8T<br>STM32G071CBT | Generic Board | **2.3.0** | |
318+
| :yellow_heart: | STM32G071C6U<br>STM32G071C8U<br>STM32G071CBU | Generic Board | **2.3.0** | |
317319
| :yellow_heart: | STM32G071G8UxN | Generic Board | **2.3.0** | |
318320
| :yellow_heart: | STM32G071GBUxN | Generic Board | **2.3.0** | |
319321
| :green_heart: | STM32G071R6<br>STM32G071R8<br>STM32G071RB | Generic Board | *2.0.0* | |
322+
| :yellow_heart: | STM32G081CBT<br>STM32G081CBU | Generic Board | **2.3.0** | |
320323
| :yellow_heart: | STM32G081GBUxN | Generic Board | **2.3.0** | |
321324
| :green_heart: | STM32G081RB | Generic Board | *2.0.0* | |
322325
| :green_heart: | STM32G0B1RB<br>STM32G0B1RC<br>STM32G0B1RE | Generic Board | *2.1.0* | |

‎boards.txt

+88-24
Original file line numberDiff line numberDiff line change
@@ -3399,30 +3399,6 @@ GenG0.menu.pnum.GENERIC_G031Y8YX.build.board=GENERIC_G031Y8YX
33993399
GenG0.menu.pnum.GENERIC_G031Y8YX.build.product_line=STM32G031xx
34003400
GenG0.menu.pnum.GENERIC_G031Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
34013401

3402-
# Generic G041F6Px
3403-
GenG0.menu.pnum.GENERIC_G041F6PX=Generic G041F6Px
3404-
GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_size=32768
3405-
GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_data_size=8192
3406-
GenG0.menu.pnum.GENERIC_G041F6PX.build.board=GENERIC_G041F6PX
3407-
GenG0.menu.pnum.GENERIC_G041F6PX.build.product_line=STM32G041xx
3408-
GenG0.menu.pnum.GENERIC_G041F6PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3409-
3410-
# Generic G041F8Px
3411-
GenG0.menu.pnum.GENERIC_G041F8PX=Generic G041F8Px
3412-
GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_size=65536
3413-
GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_data_size=8192
3414-
GenG0.menu.pnum.GENERIC_G041F8PX.build.board=GENERIC_G041F8PX
3415-
GenG0.menu.pnum.GENERIC_G041F8PX.build.product_line=STM32G041xx
3416-
GenG0.menu.pnum.GENERIC_G041F8PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3417-
3418-
# Generic G041Y8Yx
3419-
GenG0.menu.pnum.GENERIC_G041Y8YX=Generic G041Y8Yx
3420-
GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_size=65536
3421-
GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_data_size=8192
3422-
GenG0.menu.pnum.GENERIC_G041Y8YX.build.board=GENERIC_G041Y8YX
3423-
GenG0.menu.pnum.GENERIC_G041Y8YX.build.product_line=STM32G041xx
3424-
GenG0.menu.pnum.GENERIC_G041Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3425-
34263402
# Generic G031K4Tx
34273403
GenG0.menu.pnum.GENERIC_G031K4TX=Generic G031K4Tx
34283404
GenG0.menu.pnum.GENERIC_G031K4TX.upload.maximum_size=16384
@@ -3471,6 +3447,22 @@ GenG0.menu.pnum.GENERIC_G031K8UX.build.board=GENERIC_G031K8UX
34713447
GenG0.menu.pnum.GENERIC_G031K8UX.build.product_line=STM32G031xx
34723448
GenG0.menu.pnum.GENERIC_G031K8UX.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)
34733449

3450+
# Generic G041F6Px
3451+
GenG0.menu.pnum.GENERIC_G041F6PX=Generic G041F6Px
3452+
GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_size=32768
3453+
GenG0.menu.pnum.GENERIC_G041F6PX.upload.maximum_data_size=8192
3454+
GenG0.menu.pnum.GENERIC_G041F6PX.build.board=GENERIC_G041F6PX
3455+
GenG0.menu.pnum.GENERIC_G041F6PX.build.product_line=STM32G041xx
3456+
GenG0.menu.pnum.GENERIC_G041F6PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3457+
3458+
# Generic G041F8Px
3459+
GenG0.menu.pnum.GENERIC_G041F8PX=Generic G041F8Px
3460+
GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_size=65536
3461+
GenG0.menu.pnum.GENERIC_G041F8PX.upload.maximum_data_size=8192
3462+
GenG0.menu.pnum.GENERIC_G041F8PX.build.board=GENERIC_G041F8PX
3463+
GenG0.menu.pnum.GENERIC_G041F8PX.build.product_line=STM32G041xx
3464+
GenG0.menu.pnum.GENERIC_G041F8PX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3465+
34743466
# Generic G041J6Mx
34753467
GenG0.menu.pnum.GENERIC_G041J6MX=Generic G041J6Mx
34763468
GenG0.menu.pnum.GENERIC_G041J6MX.upload.maximum_size=32768
@@ -3511,6 +3503,14 @@ GenG0.menu.pnum.GENERIC_G041K8UX.build.board=GENERIC_G041K8UX
35113503
GenG0.menu.pnum.GENERIC_G041K8UX.build.product_line=STM32G041xx
35123504
GenG0.menu.pnum.GENERIC_G041K8UX.build.variant=STM32G0xx/G031K(4-6-8)(T-U)_G041K(6-8)(T-U)
35133505

3506+
# Generic G041Y8Yx
3507+
GenG0.menu.pnum.GENERIC_G041Y8YX=Generic G041Y8Yx
3508+
GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_size=65536
3509+
GenG0.menu.pnum.GENERIC_G041Y8YX.upload.maximum_data_size=8192
3510+
GenG0.menu.pnum.GENERIC_G041Y8YX.build.board=GENERIC_G041Y8YX
3511+
GenG0.menu.pnum.GENERIC_G041Y8YX.build.product_line=STM32G041xx
3512+
GenG0.menu.pnum.GENERIC_G041Y8YX.build.variant=STM32G0xx/G031F(4-6-8)P_G031Y8Y_G041F(6-8)P_G041Y8Y
3513+
35143514
# Generic G070CBTx
35153515
GenG0.menu.pnum.GENERIC_G070CBTX=Generic G070CBTx
35163516
GenG0.menu.pnum.GENERIC_G070CBTX.upload.maximum_size=131072
@@ -3535,6 +3535,54 @@ GenG0.menu.pnum.GENERIC_G070RBTX.build.board=GENERIC_G070RBTX
35353535
GenG0.menu.pnum.GENERIC_G070RBTX.build.product_line=STM32G070xx
35363536
GenG0.menu.pnum.GENERIC_G070RBTX.build.variant=STM32G0xx/G070RBT
35373537

3538+
# Generic G071C6Tx
3539+
GenG0.menu.pnum.GENERIC_G071C6TX=Generic G071C6Tx
3540+
GenG0.menu.pnum.GENERIC_G071C6TX.upload.maximum_size=32768
3541+
GenG0.menu.pnum.GENERIC_G071C6TX.upload.maximum_data_size=36864
3542+
GenG0.menu.pnum.GENERIC_G071C6TX.build.board=GENERIC_G071C6TX
3543+
GenG0.menu.pnum.GENERIC_G071C6TX.build.product_line=STM32G071xx
3544+
GenG0.menu.pnum.GENERIC_G071C6TX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3545+
3546+
# Generic G071C8Tx
3547+
GenG0.menu.pnum.GENERIC_G071C8TX=Generic G071C8Tx
3548+
GenG0.menu.pnum.GENERIC_G071C8TX.upload.maximum_size=65536
3549+
GenG0.menu.pnum.GENERIC_G071C8TX.upload.maximum_data_size=36864
3550+
GenG0.menu.pnum.GENERIC_G071C8TX.build.board=GENERIC_G071C8TX
3551+
GenG0.menu.pnum.GENERIC_G071C8TX.build.product_line=STM32G071xx
3552+
GenG0.menu.pnum.GENERIC_G071C8TX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3553+
3554+
# Generic G071CBTx
3555+
GenG0.menu.pnum.GENERIC_G071CBTX=Generic G071CBTx
3556+
GenG0.menu.pnum.GENERIC_G071CBTX.upload.maximum_size=131072
3557+
GenG0.menu.pnum.GENERIC_G071CBTX.upload.maximum_data_size=36864
3558+
GenG0.menu.pnum.GENERIC_G071CBTX.build.board=GENERIC_G071CBTX
3559+
GenG0.menu.pnum.GENERIC_G071CBTX.build.product_line=STM32G071xx
3560+
GenG0.menu.pnum.GENERIC_G071CBTX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3561+
3562+
# Generic G071C6Ux
3563+
GenG0.menu.pnum.GENERIC_G071C6UX=Generic G071C6Ux
3564+
GenG0.menu.pnum.GENERIC_G071C6UX.upload.maximum_size=32768
3565+
GenG0.menu.pnum.GENERIC_G071C6UX.upload.maximum_data_size=36864
3566+
GenG0.menu.pnum.GENERIC_G071C6UX.build.board=GENERIC_G071C6UX
3567+
GenG0.menu.pnum.GENERIC_G071C6UX.build.product_line=STM32G071xx
3568+
GenG0.menu.pnum.GENERIC_G071C6UX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3569+
3570+
# Generic G071C8Ux
3571+
GenG0.menu.pnum.GENERIC_G071C8UX=Generic G071C8Ux
3572+
GenG0.menu.pnum.GENERIC_G071C8UX.upload.maximum_size=65536
3573+
GenG0.menu.pnum.GENERIC_G071C8UX.upload.maximum_data_size=36864
3574+
GenG0.menu.pnum.GENERIC_G071C8UX.build.board=GENERIC_G071C8UX
3575+
GenG0.menu.pnum.GENERIC_G071C8UX.build.product_line=STM32G071xx
3576+
GenG0.menu.pnum.GENERIC_G071C8UX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3577+
3578+
# Generic G071CBUx
3579+
GenG0.menu.pnum.GENERIC_G071CBUX=Generic G071CBUx
3580+
GenG0.menu.pnum.GENERIC_G071CBUX.upload.maximum_size=131072
3581+
GenG0.menu.pnum.GENERIC_G071CBUX.upload.maximum_data_size=36864
3582+
GenG0.menu.pnum.GENERIC_G071CBUX.build.board=GENERIC_G071CBUX
3583+
GenG0.menu.pnum.GENERIC_G071CBUX.build.product_line=STM32G071xx
3584+
GenG0.menu.pnum.GENERIC_G071CBUX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3585+
35383586
# Generic G071G8UxN
35393587
GenG0.menu.pnum.GENERIC_G071G8UXN=Generic G071G8UxN
35403588
GenG0.menu.pnum.GENERIC_G071G8UXN.upload.maximum_size=65536
@@ -3583,6 +3631,22 @@ GenG0.menu.pnum.GENERIC_G071RBIX.build.board=GENERIC_G071RBIX
35833631
GenG0.menu.pnum.GENERIC_G071RBIX.build.product_line=STM32G071xx
35843632
GenG0.menu.pnum.GENERIC_G071RBIX.build.variant=STM32G0xx/G071R(6-8)T_G071RB(I-T)_G081RB(I-T)
35853633

3634+
# Generic G081CBTx
3635+
GenG0.menu.pnum.GENERIC_G081CBTX=Generic G081CBTx
3636+
GenG0.menu.pnum.GENERIC_G081CBTX.upload.maximum_size=131072
3637+
GenG0.menu.pnum.GENERIC_G081CBTX.upload.maximum_data_size=36864
3638+
GenG0.menu.pnum.GENERIC_G081CBTX.build.board=GENERIC_G081CBTX
3639+
GenG0.menu.pnum.GENERIC_G081CBTX.build.product_line=STM32G081xx
3640+
GenG0.menu.pnum.GENERIC_G081CBTX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3641+
3642+
# Generic G081CBUx
3643+
GenG0.menu.pnum.GENERIC_G081CBUX=Generic G081CBUx
3644+
GenG0.menu.pnum.GENERIC_G081CBUX.upload.maximum_size=131072
3645+
GenG0.menu.pnum.GENERIC_G081CBUX.upload.maximum_data_size=36864
3646+
GenG0.menu.pnum.GENERIC_G081CBUX.build.board=GENERIC_G081CBUX
3647+
GenG0.menu.pnum.GENERIC_G081CBUX.build.product_line=STM32G081xx
3648+
GenG0.menu.pnum.GENERIC_G081CBUX.build.variant=STM32G0xx/G071C(6-8-B)(T-U)_G081CB(T-U)
3649+
35863650
# Generic G081GBUxN
35873651
GenG0.menu.pnum.GENERIC_G081GBUXN=Generic G081GBUxN
35883652
GenG0.menu.pnum.GENERIC_G081GBUXN.upload.maximum_size=131072

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

+30-2
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,36 @@
2323
*/
2424
WEAK void SystemClock_Config(void)
2525
{
26-
/* SystemClock_Config can be generated by STM32CubeMX */
27-
#warning "SystemClock_Config() is empty. Default clock at reset is used."
26+
RCC_OscInitTypeDef RCC_OscInitStruct = {};
27+
RCC_ClkInitTypeDef RCC_ClkInitStruct = {};
28+
29+
/* Configure the main internal regulator output voltage */
30+
HAL_PWREx_ControlVoltageScaling(PWR_REGULATOR_VOLTAGE_SCALE1);
31+
/* Initializes the CPU, AHB and APB busses clocks */
32+
RCC_OscInitStruct.OscillatorType = RCC_OSCILLATORTYPE_HSI;
33+
RCC_OscInitStruct.HSIState = RCC_HSI_ON;
34+
RCC_OscInitStruct.HSIDiv = RCC_HSI_DIV1;
35+
RCC_OscInitStruct.HSICalibrationValue = RCC_HSICALIBRATION_DEFAULT;
36+
RCC_OscInitStruct.PLL.PLLState = RCC_PLL_ON;
37+
RCC_OscInitStruct.PLL.PLLSource = RCC_PLLSOURCE_HSI;
38+
RCC_OscInitStruct.PLL.PLLM = RCC_PLLM_DIV1;
39+
RCC_OscInitStruct.PLL.PLLN = 8;
40+
RCC_OscInitStruct.PLL.PLLP = RCC_PLLP_DIV2;
41+
RCC_OscInitStruct.PLL.PLLQ = RCC_PLLQ_DIV2;
42+
RCC_OscInitStruct.PLL.PLLR = RCC_PLLR_DIV2;
43+
if (HAL_RCC_OscConfig(&RCC_OscInitStruct) != HAL_OK) {
44+
Error_Handler();
45+
}
46+
/* Initializes the CPU, AHB and APB busses clocks */
47+
RCC_ClkInitStruct.ClockType = RCC_CLOCKTYPE_HCLK | RCC_CLOCKTYPE_SYSCLK
48+
| RCC_CLOCKTYPE_PCLK1;
49+
RCC_ClkInitStruct.SYSCLKSource = RCC_SYSCLKSOURCE_PLLCLK;
50+
RCC_ClkInitStruct.AHBCLKDivider = RCC_SYSCLK_DIV1;
51+
RCC_ClkInitStruct.APB1CLKDivider = RCC_HCLK_DIV1;
52+
53+
if (HAL_RCC_ClockConfig(&RCC_ClkInitStruct, FLASH_LATENCY_2) != HAL_OK) {
54+
Error_Handler();
55+
}
2856
}
2957

3058
#endif /* ARDUINO_GENERIC_* */

0 commit comments

Comments
 (0)