Skip to content

Commit 9e98a2c

Browse files
adbridgeadbridge
authored
Merge pull request #14592 from JeanMarcR/STM32G4_NEW_CUBE
STM32G4 update drivers version to CUBE V1.4.0
2 parents 5ef56cc + 331cf70 commit 9e98a2c

File tree

94 files changed

+5813
-3523
lines changed

Some content is hidden

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

94 files changed

+5813
-3523
lines changed

‎targets/TARGET_STM/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ This table summarizes the STM32Cube versions currently used in Mbed OS master br
6868
| F4 | 1.26.1 | https://github.com/STMicroelectronics/STM32CubeF4 |
6969
| F7 | 1.16.0 | https://github.com/STMicroelectronics/STM32CubeF7 |
7070
| G0 | 1.4.1 | https://github.com/STMicroelectronics/STM32CubeG0 |
71-
| G4 | 1.1.0 | https://github.com/STMicroelectronics/STM32CubeG4 |
71+
| G4 | 1.4.0 | https://github.com/STMicroelectronics/STM32CubeG4 |
7272
| H7 | 1.8.0 | https://github.com/STMicroelectronics/STM32CubeH7 |
7373
| L0 | 1.12.0 | https://github.com/STMicroelectronics/STM32CubeL0 |
7474
| L1 | 1.10.2 | https://github.com/STMicroelectronics/STM32CubeL1 |

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g471xx.h

Lines changed: 223 additions & 0 deletions
Large diffs are not rendered by default.

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g474xx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1120,7 +1120,6 @@ typedef struct
11201120
typedef struct {
11211121
HRTIM_Master_TypeDef sMasterRegs;
11221122
HRTIM_Timerx_TypeDef sTimerxRegs[6];
1123-
// uint32_t RESERVED0[32];
11241123
HRTIM_Common_TypeDef sCommonRegs;
11251124
}HRTIM_TypeDef;
11261125

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g484xx.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1152,7 +1152,6 @@ typedef struct
11521152
typedef struct {
11531153
HRTIM_Master_TypeDef sMasterRegs;
11541154
HRTIM_Timerx_TypeDef sTimerxRegs[6];
1155-
// uint32_t RESERVED0[32];
11561155
HRTIM_Common_TypeDef sCommonRegs;
11571156
}HRTIM_TypeDef;
11581157

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMSIS/stm32g4xx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,11 +85,11 @@
8585
#endif /* USE_HAL_DRIVER */
8686

8787
/**
88-
* @brief CMSIS Device version number V1.2.0
88+
* @brief CMSIS Device version number V1.2.1
8989
*/
9090
#define __STM32G4_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
9191
#define __STM32G4_CMSIS_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
92-
#define __STM32G4_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
92+
#define __STM32G4_CMSIS_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
9393
#define __STM32G4_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
9494
#define __STM32G4_CMSIS_VERSION ((__STM32G4_CMSIS_VERSION_MAIN << 24)\
9595
|(__STM32G4_CMSIS_VERSION_SUB1 << 16)\

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ target_sources(mbed-stm32g4cube-fw
5252
STM32G4xx_HAL_Driver/stm32g4xx_hal_smartcard.c
5353
STM32G4xx_HAL_Driver/stm32g4xx_hal_smartcard_ex.c
5454
STM32G4xx_HAL_Driver/stm32g4xx_hal_smbus.c
55+
STM32G4xx_HAL_Driver/stm32g4xx_hal_smbus_ex.c
5556
STM32G4xx_HAL_Driver/stm32g4xx_hal_spi.c
5657
STM32G4xx_HAL_Driver/stm32g4xx_hal_spi_ex.c
5758
STM32G4xx_HAL_Driver/stm32g4xx_hal_sram.c

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/Legacy/stm32_hal_legacy.h

Lines changed: 79 additions & 102 deletions
Large diffs are not rendered by default.

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@
4949
/* Private typedef -----------------------------------------------------------*/
5050
/* Private define ------------------------------------------------------------*/
5151
/**
52-
* @brief STM32G4xx HAL Driver version number V1.2.0
52+
* @brief STM32G4xx HAL Driver version number V1.2.1
5353
*/
5454
#define __STM32G4xx_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
5555
#define __STM32G4xx_HAL_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
56-
#define __STM32G4xx_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
56+
#define __STM32G4xx_HAL_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
5757
#define __STM32G4xx_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
5858
#define __STM32G4xx_HAL_VERSION ((__STM32G4xx_HAL_VERSION_MAIN << 24U)\
5959
|(__STM32G4xx_HAL_VERSION_SUB1 << 16U)\

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal_adc.c

Lines changed: 113 additions & 91 deletions
Large diffs are not rendered by default.

‎targets/TARGET_STM/TARGET_STM32G4/STM32Cube_FW/STM32G4xx_HAL_Driver/stm32g4xx_hal_adc.h

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ typedef struct
384384
typedef struct __ADC_HandleTypeDef
385385
#else
386386
typedef struct
387-
#endif
387+
#endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
388388
{
389389
ADC_TypeDef *Instance; /*!< Register base address */
390390
ADC_InitTypeDef Init; /*!< ADC initialization parameters and regular conversions setting */
@@ -769,7 +769,6 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
769769
* @}
770770
*/
771771

772-
773772
/** @defgroup ADC_Event_type ADC Event type
774773
* @{
775774
*/
@@ -1239,7 +1238,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
12391238
#else
12401239
#define __HAL_ADC_RESET_HANDLE_STATE(__HANDLE__) \
12411240
((__HANDLE__)->State = HAL_ADC_STATE_RESET)
1242-
#endif
1241+
#endif /* USE_HAL_ADC_REGISTER_CALLBACKS */
12431242

12441243
/**
12451244
* @brief Enable ADC interrupt.
@@ -1667,7 +1666,7 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
16671666
*/
16681667
#define __HAL_ADC_MULTI_CONV_DATA_MASTER_SLAVE(__ADC_MULTI_MASTER_SLAVE__, __ADC_MULTI_CONV_DATA__) \
16691668
__LL_ADC_MULTI_CONV_DATA_MASTER_SLAVE((__ADC_MULTI_MASTER_SLAVE__), (__ADC_MULTI_CONV_DATA__))
1670-
#endif
1669+
#endif /* ADC_MULTIMODE_SUPPORT */
16711670

16721671
/**
16731672
* @brief Helper macro to select the ADC common instance
@@ -1738,10 +1737,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17381737
*/
17391738
#define __HAL_ADC_CONVERT_DATA_RESOLUTION(__DATA__,\
17401739
__ADC_RESOLUTION_CURRENT__,\
1741-
__ADC_RESOLUTION_TARGET__) \
1742-
__LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__), \
1743-
(__ADC_RESOLUTION_CURRENT__), \
1744-
(__ADC_RESOLUTION_TARGET__))
1740+
__ADC_RESOLUTION_TARGET__) \
1741+
__LL_ADC_CONVERT_DATA_RESOLUTION((__DATA__),\
1742+
(__ADC_RESOLUTION_CURRENT__),\
1743+
(__ADC_RESOLUTION_TARGET__))
17451744

17461745
/**
17471746
* @brief Helper macro to calculate the voltage (unit: mVolt)
@@ -1761,10 +1760,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17611760
*/
17621761
#define __HAL_ADC_CALC_DATA_TO_VOLTAGE(__VREFANALOG_VOLTAGE__,\
17631762
__ADC_DATA__,\
1764-
__ADC_RESOLUTION__) \
1765-
__LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__), \
1766-
(__ADC_DATA__), \
1767-
(__ADC_RESOLUTION__))
1763+
__ADC_RESOLUTION__) \
1764+
__LL_ADC_CALC_DATA_TO_VOLTAGE((__VREFANALOG_VOLTAGE__),\
1765+
(__ADC_DATA__),\
1766+
(__ADC_RESOLUTION__))
17681767

17691768
/**
17701769
* @brief Helper macro to calculate analog reference voltage (Vref+)
@@ -1792,9 +1791,9 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
17921791
* @retval Analog reference voltage (unit: mV)
17931792
*/
17941793
#define __HAL_ADC_CALC_VREFANALOG_VOLTAGE(__VREFINT_ADC_DATA__,\
1795-
__ADC_RESOLUTION__) \
1796-
__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__), \
1797-
(__ADC_RESOLUTION__))
1794+
__ADC_RESOLUTION__) \
1795+
__LL_ADC_CALC_VREFANALOG_VOLTAGE((__VREFINT_ADC_DATA__),\
1796+
(__ADC_RESOLUTION__))
17981797

17991798
/**
18001799
* @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1843,10 +1842,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
18431842
*/
18441843
#define __HAL_ADC_CALC_TEMPERATURE(__VREFANALOG_VOLTAGE__,\
18451844
__TEMPSENSOR_ADC_DATA__,\
1846-
__ADC_RESOLUTION__) \
1847-
__LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__), \
1848-
(__TEMPSENSOR_ADC_DATA__), \
1849-
(__ADC_RESOLUTION__))
1845+
__ADC_RESOLUTION__) \
1846+
__LL_ADC_CALC_TEMPERATURE((__VREFANALOG_VOLTAGE__),\
1847+
(__TEMPSENSOR_ADC_DATA__),\
1848+
(__ADC_RESOLUTION__))
18501849

18511850
/**
18521851
* @brief Helper macro to calculate the temperature (unit: degree Celsius)
@@ -1897,13 +1896,13 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
18971896
__TEMPSENSOR_CALX_TEMP__,\
18981897
__VREFANALOG_VOLTAGE__,\
18991898
__TEMPSENSOR_ADC_DATA__,\
1900-
__ADC_RESOLUTION__) \
1901-
__LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__), \
1902-
(__TEMPSENSOR_TYP_CALX_V__), \
1903-
(__TEMPSENSOR_CALX_TEMP__), \
1904-
(__VREFANALOG_VOLTAGE__), \
1905-
(__TEMPSENSOR_ADC_DATA__), \
1906-
(__ADC_RESOLUTION__))
1899+
__ADC_RESOLUTION__) \
1900+
__LL_ADC_CALC_TEMPERATURE_TYP_PARAMS((__TEMPSENSOR_TYP_AVGSLOPE__),\
1901+
(__TEMPSENSOR_TYP_CALX_V__),\
1902+
(__TEMPSENSOR_CALX_TEMP__),\
1903+
(__VREFANALOG_VOLTAGE__),\
1904+
(__TEMPSENSOR_ADC_DATA__),\
1905+
(__ADC_RESOLUTION__))
19071906

19081907
/**
19091908
* @}

0 commit comments

Comments
 (0)