stm32duino · ABOSTM · Jul 23, 2019 · Jul 19, 2019 · Jul 19, 2019 · Jul 19, 2019
diff --git a/README.md b/README.md
@@ -62,6 +62,8 @@ User can add a STM32 based board following this [wiki](https://github.com/stm32d
 | :green_heart: | [Nucleo F411RE](http://www.st.com/en/evaluation-tools/nucleo-f411re.html) | *0.2.1* |  |
 | :green_heart: | [Nucleo F446RE](http://www.st.com/en/evaluation-tools/nucleo-f446re.html) | *1.1.1* |  |
 | :green_heart: | [Nucleo-G071RB](https://www.st.com/en/evaluation-tools/nucleo-g071rb.html) | *1.6.0* |  |
+| :yellow_heart: | [Nucleo-G431RB](https://www.st.com/en/evaluation-tools/nucleo-g431rb.html) | **1.7.0** |  |
+| :yellow_heart: | [Nucleo-G474RE](https://www.st.com/en/evaluation-tools/nucleo-g474re.html) | **1.7.0** |  |
 | :green_heart: | [Nucleo L053R8](http://www.st.com/en/evaluation-tools/nucleo-l053r8.html) | *0.1.0* |  |
 | :green_heart: | [Nucleo L073RZ](http://www.st.com/en/evaluation-tools/nucleo-l073rz.html) | *1.4.0* |  |
 | :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
 | 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 |
 | :---: | --- | :---: | :--- |
 | :green_heart: | [Nucleo F303K8](http://www.st.com/en/evaluation-tools/nucleo-f303k8.html) | *1.1.0* |  |
+| :yellow_heart: | [Nucleo-G431KB](https://www.st.com/en/evaluation-tools/nucleo-g431kb.html) | **1.7.0** |  |
 | :green_heart: | [Nucleo L031K6](http://www.st.com/en/evaluation-tools/nucleo-l031k6.html) | *1.1.1* |  |
 | :green_heart: | [Nucleo L412KB](http://www.st.com/en/evaluation-tools/nucleo-l412kb.html) | *1.5.0* |  |
 | :green_heart: | [Nucleo L432KC](http://www.st.com/en/evaluation-tools/nucleo-l432kc.html) | *0.2.0* |  |

diff --git a/boards.txt b/boards.txt
@@ -268,6 +268,30 @@ Nucleo_64.menu.pnum.NUCLEO_G071RB.build.variant=NUCLEO_G071RB
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.cmsis_lib_gcc=arm_cortexM0l_math
 Nucleo_64.menu.pnum.NUCLEO_G071RB.build.extra_flags=-D{build.product_line} {build.enable_usb} {build.xSerial} -D__CORTEX_SC=0
 
+# NUCLEO_G431RB board
+Nucleo_64.menu.pnum.NUCLEO_G431RB=Nucleo G431RB
+Nucleo_64.menu.pnum.NUCLEO_G431RB.node=NODE_G431RB
+Nucleo_64.menu.pnum.NUCLEO_G431RB.upload.maximum_size=131072
+Nucleo_64.menu.pnum.NUCLEO_G431RB.upload.maximum_data_size=32768
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.board=NUCLEO_G431RB
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.series=STM32G4xx
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.product_line=STM32G431xx
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.variant=NUCLEO_G431RB
+Nucleo_64.menu.pnum.NUCLEO_G431RB.build.cmsis_lib_gcc=arm_cortexM4l_math
+
+# NUCLEO_G474RE board
+Nucleo_64.menu.pnum.NUCLEO_G474RE=Nucleo G474RE
+Nucleo_64.menu.pnum.NUCLEO_G474RE.node=NODE_G474RE
+Nucleo_64.menu.pnum.NUCLEO_G474RE.upload.maximum_size=524288
+Nucleo_64.menu.pnum.NUCLEO_G474RE.upload.maximum_data_size=131072
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.board=NUCLEO_G474RE
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.series=STM32G4xx
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.product_line=STM32G474xx
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.variant=NUCLEO_G474RE
+Nucleo_64.menu.pnum.NUCLEO_G474RE.build.cmsis_lib_gcc=arm_cortexM4l_math
+
 # NUCLEO_L053R8 board
 Nucleo_64.menu.pnum.NUCLEO_L053R8=Nucleo L053R8
 Nucleo_64.menu.pnum.NUCLEO_L053R8.node=NODE_L053R8
@@ -421,6 +445,18 @@ Nucleo_32.menu.pnum.NUCLEO_F303K8.build.product_line=STM32F303x8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.variant=NUCLEO_F303K8
 Nucleo_32.menu.pnum.NUCLEO_F303K8.build.cmsis_lib_gcc=arm_cortexM4l_math
 
+# NUCLEO_G431KB board
+Nucleo_32.menu.pnum.NUCLEO_G431KB=Nucleo G431KB
+Nucleo_32.menu.pnum.NUCLEO_G431KB.node=NODE_G431KB
+Nucleo_32.menu.pnum.NUCLEO_G431KB.upload.maximum_size=131072
+Nucleo_32.menu.pnum.NUCLEO_G431KB.upload.maximum_data_size=32768
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.mcu=cortex-m4 -mfpu=fpv4-sp-d16 -mfloat-abi=hard
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.board=NUCLEO_G431KB
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.series=STM32G4xx
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.product_line=STM32G431xx
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.variant=NUCLEO_G431KB
+Nucleo_32.menu.pnum.NUCLEO_G431KB.build.cmsis_lib_gcc=arm_cortexM4l_math
+
 # Upload menu
 Nucleo_32.menu.upload_method.MassStorage=Mass Storage
 Nucleo_32.menu.upload_method.MassStorage.upload.protocol=

diff --git a/cores/arduino/pins_arduino.c b/cores/arduino/pins_arduino.c
@@ -40,11 +40,16 @@ PinName analogInputToPinName(uint32_t pin)
   PinName pn = digitalPinToPinName(analogInputToDigitalPin(pin));
   if (pn == NC) {
     switch (pin) {
-#ifdef ATEMP
+#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
       case ATEMP:
         pn = PADC_TEMP;
         break;
 #endif
+#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
+      case ATEMP_ADC5:
+        pn = PADC_TEMP_ADC5;
+        break;
+#endif
 #ifdef AVREF
       case AVREF:
         pn = PADC_VREF;

diff --git a/cores/arduino/pins_arduino.h b/cores/arduino/pins_arduino.h
@@ -203,7 +203,7 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 
 // ADC internal channels (not a pins)
 // Only used for analogRead()
-#ifdef ADC_CHANNEL_TEMPSENSOR
+#if defined(ADC_CHANNEL_TEMPSENSOR) || defined(ADC_CHANNEL_TEMPSENSOR_ADC1)
 #define ATEMP        (NUM_DIGITAL_PINS + 1)
 #endif
 #ifdef ADC_CHANNEL_VREFINT
@@ -212,6 +212,9 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #ifdef ADC_CHANNEL_VBAT
 #define AVBAT        (NUM_DIGITAL_PINS + 3)
 #endif
+#if defined(ADC5) && defined(ADC_CHANNEL_TEMPSENSOR_ADC5)
+#define ATEMP_ADC5   (NUM_DIGITAL_PINS + 4)
+#endif
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal.c b/cores/arduino/stm32/HAL/stm32yyxx_hal.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_adc.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_adc.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_adc.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_adc.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_adc.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_adc_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_adc_ex.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_adc_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_adc_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_adc_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_comp.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_comp.c
@@ -7,6 +7,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_comp.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_comp.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_comp.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cordic.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_cordic.c
@@ -0,0 +1,3 @@
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_cordic.c"
+#endif
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cortex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_cortex.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_cortex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_cortex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_cortex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_crc.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_crc.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_crc.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_crc.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_crc.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_crc_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_crc_ex.c
@@ -10,6 +10,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_crc_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_crc_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_crc_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp.c
@@ -10,6 +10,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_cryp.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_cryp.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_cryp.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_cryp_ex.c
@@ -7,6 +7,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_cryp_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_cryp_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_cryp_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dac.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_dac.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_dac.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_dac.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_dac.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dac_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_dac_ex.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_dac_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_dac_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_dac_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dma.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_dma.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_dma.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_dma.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_dma.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_dma_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_dma_ex.c
@@ -10,6 +10,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_dma_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_dma_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_dma_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_exti.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_exti.c
@@ -7,6 +7,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_exti.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_exti.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_exti.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fdcan.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_fdcan.c
@@ -1,3 +1,6 @@
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_fdcan.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_fdcan.c"
 #endif
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_flash.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_flash.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_flash.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_flash.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ex.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_flash_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_flash_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_flash_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ramfunc.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_flash_ramfunc.c
@@ -1,6 +1,9 @@
 #ifdef STM32F4xx
 #include "stm32f4xx_hal_flash_ramfunc.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_flash_ramfunc.c"
+#endif
 #ifdef STM32L0xx
 #include "stm32l0xx_hal_flash_ramfunc.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_fmac.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_fmac.c
@@ -0,0 +1,3 @@
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_fmac.c"
+#endif
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_gpio.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_gpio.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_gpio.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_gpio.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_gpio.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_hrtim.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_hrtim.c
@@ -1,6 +1,9 @@
 #ifdef STM32F3xx
 #include "stm32f3xx_hal_hrtim.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_hrtim.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_hrtim.c"
 #endif
diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_i2c.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_i2c.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_i2c.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c_ex.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_i2c_ex.c
@@ -13,6 +13,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_i2c_ex.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_i2c_ex.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_i2c_ex.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_i2s.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_i2s.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_i2s.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_i2s.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_i2s.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_irda.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_irda.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_irda.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_irda.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_irda.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_iwdg.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_iwdg.c
@@ -19,6 +19,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_iwdg.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_iwdg.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_iwdg.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_lptim.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_lptim.c
@@ -7,6 +7,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_lptim.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_lptim.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_lptim.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_msp_template.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_msp_template.c
@@ -20,6 +20,9 @@
 #ifdef STM32G0xx
 #include "stm32g0xx_hal_msp_template.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_msp_template.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_msp_template.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_nand.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_nand.c
@@ -13,6 +13,9 @@
 #ifdef STM32F7xx
 #include "stm32f7xx_hal_nand.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_nand.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_nand.c"
 #endif

diff --git a/cores/arduino/stm32/HAL/stm32yyxx_hal_nor.c b/cores/arduino/stm32/HAL/stm32yyxx_hal_nor.c
@@ -13,6 +13,9 @@
 #ifdef STM32F7xx
 #include "stm32f7xx_hal_nor.c"
 #endif
+#ifdef STM32G4xx
+#include "stm32g4xx_hal_nor.c"
+#endif
 #ifdef STM32H7xx
 #include "stm32h7xx_hal_nor.c"
 #endif