Skip to content

Commit 07bb4f0

Browse files
ABOSTMABOSTM
authored
Merge pull request #568 from fpistm/STM32G4
Add STM32 G4 support + Nucleo-G474RE, Nucleo-G431RB and Nucleo-G431KB variants
2 parents dec43e4 + 2fc4169 commit 07bb4f0

File tree

358 files changed

+375872
-87
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

358 files changed

+375872
-87
lines changed

‎README.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
6262
| :green_heart: | [Nucleo F411RE](http://www.st.com/en/evaluation-tools/nucleo-f411re.html) | *0.2.1* | |
6363
| :green_heart: | [Nucleo F446RE](http://www.st.com/en/evaluation-tools/nucleo-f446re.html) | *1.1.1* | |
6464
| :green_heart: | [Nucleo-G071RB](https://www.st.com/en/evaluation-tools/nucleo-g071rb.html) | *1.6.0* | |
65+
| :yellow_heart: | [Nucleo-G431RB](https://www.st.com/en/evaluation-tools/nucleo-g431rb.html) | **1.7.0** | |
66+
| :yellow_heart: | [Nucleo-G474RE](https://www.st.com/en/evaluation-tools/nucleo-g474re.html) | **1.7.0** | |
6567
| :green_heart: | [Nucleo L053R8](http://www.st.com/en/evaluation-tools/nucleo-l053r8.html) | *0.1.0* | |
6668
| :green_heart: | [Nucleo L073RZ](http://www.st.com/en/evaluation-tools/nucleo-l073rz.html) | *1.4.0* | |
6769
| :green_heart: | [Nucleo L152RE](http://www.st.com/en/evaluation-tools/nucleo-l152re.html) | *1.0.0* | |
@@ -72,6 +74,7 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
7274
| Status | [Nucleo 32](https://www.st.com/content/st_com/en/products/evaluation-tools/product-evaluation-tools/mcu-eval-tools/stm32-mcu-eval-tools/stm32-nucleo-boards.html) | Release | Comment |
7375
| :---: | --- | :---: | :--- |
7476
| :green_heart: | [Nucleo F303K8](http://www.st.com/en/evaluation-tools/nucleo-f303k8.html) | *1.1.0* | |
77+
| :yellow_heart: | [Nucleo-G431KB](https://www.st.com/en/evaluation-tools/nucleo-g431kb.html) | **1.7.0** | |
7578
| :green_heart: | [Nucleo L031K6](http://www.st.com/en/evaluation-tools/nucleo-l031k6.html) | *1.1.1* | |
7679
| :green_heart: | [Nucleo L412KB](http://www.st.com/en/evaluation-tools/nucleo-l412kb.html) | *1.5.0* | |
7780
| :green_heart: | [Nucleo L432KC](http://www.st.com/en/evaluation-tools/nucleo-l432kc.html) | *0.2.0* | |

‎boards.txt‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -268,6 +268,30 @@ Nucleo_64.menu.pnum.NUCLEO_G071RB.build.variant=NUCLEO_G071RB
268268
Nucleo_64.menu.pnum.NUCLEO_G071RB.build.cmsis_lib_gcc=arm_cortexM0l_math
269269
Nucleo_64.menu.pnum.NUCLEO_G071RB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
270270

271+
# NUCLEO_G431RB board
272+
Nucleo_64.menu.pnum.NUCLEO_G431RB=Nucleo G431RB
273+
Nucleo_64.menu.pnum.NUCLEO_G431RB.node=NODE_G431RB
274+
Nucleo_64.menu.pnum.NUCLEO_G431RB.upload.maximum_size=131072
275+
Nucleo_64.menu.pnum.NUCLEO_G431RB.upload.maximum_data_size=32768
276+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
277+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.board=NUCLEO_G431RB
278+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.series=STM32G4xx
279+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.product_line=STM32G431xx
280+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=NUCLEO_G431RB
281+
Nucleo_64.menu.pnum.NUCLEO_G431RB.build.cmsis_lib_gcc=arm_cortexM4l_math
282+
283+
# NUCLEO_G474RE board
284+
Nucleo_64.menu.pnum.NUCLEO_G474RE=Nucleo G474RE
285+
Nucleo_64.menu.pnum.NUCLEO_G474RE.node=NODE_G474RE
286+
Nucleo_64.menu.pnum.NUCLEO_G474RE.upload.maximum_size=524288
287+
Nucleo_64.menu.pnum.NUCLEO_G474RE.upload.maximum_data_size=131072
288+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
289+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.board=NUCLEO_G474RE
290+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.series=STM32G4xx
291+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.product_line=STM32G474xx
292+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=NUCLEO_G474RE
293+
Nucleo_64.menu.pnum.NUCLEO_G474RE.build.cmsis_lib_gcc=arm_cortexM4l_math
294+
271295
# NUCLEO_L053R8 board
272296
Nucleo_64.menu.pnum.NUCLEO_L053R8=Nucleo L053R8
273297
Nucleo_64.menu.pnum.NUCLEO_L053R8.node=NODE_L053R8
@@ -421,6 +445,18 @@ Nucleo_32.menu.pnum.NUCLEO_F303K8.build.product_line=STM32F303x8
421445
Nucleo_32.menu.pnum.NUCLEO_F303K8.build.variant=NUCLEO_F303K8
422446
Nucleo_32.menu.pnum.NUCLEO_F303K8.build.cmsis_lib_gcc=arm_cortexM4l_math
423447

448+
# NUCLEO_G431KB board
449+
Nucleo_32.menu.pnum.NUCLEO_G431KB=Nucleo G431KB
450+
Nucleo_32.menu.pnum.NUCLEO_G431KB.node=NODE_G431KB
451+
Nucleo_32.menu.pnum.NUCLEO_G431KB.upload.maximum_size=131072
452+
Nucleo_32.menu.pnum.NUCLEO_G431KB.upload.maximum_data_size=32768
453+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
454+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.board=NUCLEO_G431KB
455+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.series=STM32G4xx
456+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.product_line=STM32G431xx
457+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.variant=NUCLEO_G431KB
458+
Nucleo_32.menu.pnum.NUCLEO_G431KB.build.cmsis_lib_gcc=arm_cortexM4l_math
459+
424460
# Upload menu
425461
Nucleo_32.menu.upload_method.MassStorage=Mass Storage
426462
Nucleo_32.menu.upload_method.MassStorage.upload.protocol=

‎cores/arduino/pins_arduino.c‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,16 @@ PinName analogInputToPinName(uint32_t pin)
4040
PinName pn = digitalPinToPinName(analogInputToDigitalPin(pin));
4141
if (pn == NC) {
4242
switch (pin) {
43-
#ifdef ATEMP
43+
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
4444
case ATEMP:
4545
pn = PADC_TEMP;
4646
break;
4747
#endif
48+
#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
49+
case ATEMP_ADC5:
50+
pn = PADC_TEMP_ADC5;
51+
break;
52+
#endif
4853
#ifdef AVREF
4954
case AVREF:
5055
pn = PADC_VREF;

‎cores/arduino/pins_arduino.h‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ static const uint8_t SCL = PIN_WIRE_SCL;
203203

204204
// ADC internal channels (not a pins)
205205
// Only used for analogRead()
206-
#ifdef ADC_CHANNEL_TEMPSENSOR
206+
#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
207207
#define ATEMP (NUM_DIGITAL_PINS + 1)
208208
#endif
209209
#ifdef ADC_CHANNEL_VREFINT
@@ -212,6 +212,9 @@ static const uint8_t SCL = PIN_WIRE_SCL;
212212
#ifdef ADC_CHANNEL_VBAT
213213
#define AVBAT (NUM_DIGITAL_PINS + 3)
214214
#endif
215+
#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
216+
#define ATEMP_ADC5 (NUM_DIGITAL_PINS + 4)
217+
#endif
215218

216219
#ifdef __cplusplus
217220
extern "C" {

‎cores/arduino/stm32/HAL/stm32yyxx_hal.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifdef STM32G0xx
2020
#include "stm32g0xx_hal.c"
2121
#endif
22+
#ifdef STM32G4xx
23+
#include "stm32g4xx_hal.c"
24+
#endif
2225
#ifdef STM32H7xx
2326
#include "stm32h7xx_hal.c"
2427
#endif

‎cores/arduino/stm32/HAL/stm32yyxx_hal_adc.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifdef STM32G0xx
2020
#include "stm32g0xx_hal_adc.c"
2121
#endif
22+
#ifdef STM32G4xx
23+
#include "stm32g4xx_hal_adc.c"
24+
#endif
2225
#ifdef STM32H7xx
2326
#include "stm32h7xx_hal_adc.c"
2427
#endif

‎cores/arduino/stm32/HAL/stm32yyxx_hal_adc_ex.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifdef STM32G0xx
2020
#include "stm32g0xx_hal_adc_ex.c"
2121
#endif
22+
#ifdef STM32G4xx
23+
#include "stm32g4xx_hal_adc_ex.c"
24+
#endif
2225
#ifdef STM32H7xx
2326
#include "stm32h7xx_hal_adc_ex.c"
2427
#endif

‎cores/arduino/stm32/HAL/stm32yyxx_hal_comp.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
#ifdef STM32G0xx
88
#include "stm32g0xx_hal_comp.c"
99
#endif
10+
#ifdef STM32G4xx
11+
#include "stm32g4xx_hal_comp.c"
12+
#endif
1013
#ifdef STM32H7xx
1114
#include "stm32h7xx_hal_comp.c"
1215
#endif

‎cores/arduino/stm32/HAL/stm32yyxx_hal_cordic.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
#ifdef STM32G4xx
2+
#include "stm32g4xx_hal_cordic.c"
3+
#endif

‎cores/arduino/stm32/HAL/stm32yyxx_hal_cortex.c‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@
1919
#ifdef STM32G0xx
2020
#include "stm32g0xx_hal_cortex.c"
2121
#endif
22+
#ifdef STM32G4xx
23+
#include "stm32g4xx_hal_cortex.c"
24+
#endif
2225
#ifdef STM32H7xx
2326
#include "stm32h7xx_hal_cortex.c"
2427
#endif

0 commit comments

Comments
 (0)