Skip to content

Commit 6ad352d

Browse files
committed
[F2] Update STM32F2xx HAL Drivers to v1.2.5
Included in STM32CubeF2 FW v1.9.1 Signed-off-by: Frederic Pillon <[email protected]>
1 parent a4058ae commit 6ad352d

File tree

66 files changed

+5964
-3145
lines changed

Some content is hidden

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

66 files changed

+5964
-3145
lines changed

system/Drivers/STM32F2xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 28 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
#define AES_CLEARFLAG_CCF CRYP_CLEARFLAG_CCF
3939
#define AES_CLEARFLAG_RDERR CRYP_CLEARFLAG_RDERR
4040
#define AES_CLEARFLAG_WRERR CRYP_CLEARFLAG_WRERR
41-
4241
/**
4342
* @}
4443
*/
@@ -241,7 +240,7 @@
241240
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
242241
#endif
243242

244-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4)
243+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)
245244
#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID
246245
#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID
247246
#endif
@@ -313,8 +312,13 @@
313312
#endif /* STM32L4 */
314313

315314
#if defined(STM32G0)
316-
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317-
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
315+
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
316+
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
317+
#define DMA_REQUEST_TIM16_TRIG_COM DMA_REQUEST_TIM16_COM
318+
#define DMA_REQUEST_TIM17_TRIG_COM DMA_REQUEST_TIM17_COM
319+
320+
#define LL_DMAMUX_REQ_TIM16_TRIG_COM LL_DMAMUX_REQ_TIM16_COM
321+
#define LL_DMAMUX_REQ_TIM17_TRIG_COM LL_DMAMUX_REQ_TIM17_COM
318322
#endif
319323

320324
#if defined(STM32H7)
@@ -643,6 +647,10 @@
643647
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
644648
#define HAL_HRTIM_ExternalEventCounterDisable HAL_HRTIM_ExtEventCounterDisable
645649
#define HAL_HRTIM_ExternalEventCounterReset HAL_HRTIM_ExtEventCounterReset
650+
#define HRTIM_TIMEEVENT_A HRTIM_EVENTCOUNTER_A
651+
#define HRTIM_TIMEEVENT_B HRTIM_EVENTCOUNTER_B
652+
#define HRTIM_TIMEEVENTRESETMODE_UNCONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_UNCONDITIONAL
653+
#define HRTIM_TIMEEVENTRESETMODE_CONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_CONDITIONAL
646654
#endif /* STM32G4 */
647655

648656
#if defined(STM32H7)
@@ -955,7 +963,7 @@
955963
#define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0
956964
#define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1
957965

958-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7)
966+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)
959967
#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID
960968
#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID
961969
#endif
@@ -1450,7 +1458,7 @@
14501458
#define HASH_HMACKeyType_ShortKey HASH_HMAC_KEYTYPE_SHORTKEY
14511459
#define HASH_HMACKeyType_LongKey HASH_HMAC_KEYTYPE_LONGKEY
14521460

1453-
#if defined(STM32L4) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
1461+
#if defined(STM32L4) || defined(STM32L5) || defined(STM32F2) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
14541462

14551463
#define HAL_HASH_MD5_Accumulate HAL_HASH_MD5_Accmlt
14561464
#define HAL_HASH_MD5_Accumulate_End HAL_HASH_MD5_Accmlt_End
@@ -1472,7 +1480,7 @@
14721480
#define HAL_HASHEx_SHA256_Accumulate_IT HAL_HASHEx_SHA256_Accmlt_IT
14731481
#define HAL_HASHEx_SHA256_Accumulate_End_IT HAL_HASHEx_SHA256_Accmlt_End_IT
14741482

1475-
#endif /* STM32L4 || STM32F4 || STM32F7 || STM32H7 */
1483+
#endif /* STM32L4 || STM32L5 || STM32F2 || STM32F4 || STM32F7 || STM32H7 */
14761484
/**
14771485
* @}
14781486
*/
@@ -1531,18 +1539,18 @@
15311539

15321540
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
15331541

1534-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
1542+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F0) || defined(STM32F1) || defined(STM32F2) || defined(STM32F3) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4) || defined(STM32L1)
15351543
#define HAL_I2C_Master_Sequential_Transmit_IT HAL_I2C_Master_Seq_Transmit_IT
15361544
#define HAL_I2C_Master_Sequential_Receive_IT HAL_I2C_Master_Seq_Receive_IT
15371545
#define HAL_I2C_Slave_Sequential_Transmit_IT HAL_I2C_Slave_Seq_Transmit_IT
15381546
#define HAL_I2C_Slave_Sequential_Receive_IT HAL_I2C_Slave_Seq_Receive_IT
1539-
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1540-
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)
1547+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
1548+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)|| defined(STM32L1)
15411549
#define HAL_I2C_Master_Sequential_Transmit_DMA HAL_I2C_Master_Seq_Transmit_DMA
15421550
#define HAL_I2C_Master_Sequential_Receive_DMA HAL_I2C_Master_Seq_Receive_DMA
15431551
#define HAL_I2C_Slave_Sequential_Transmit_DMA HAL_I2C_Slave_Seq_Transmit_DMA
15441552
#define HAL_I2C_Slave_Sequential_Receive_DMA HAL_I2C_Slave_Seq_Receive_DMA
1545-
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1553+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
15461554

15471555
#if defined(STM32F4)
15481556
#define HAL_FMPI2C_Master_Sequential_Transmit_IT HAL_FMPI2C_Master_Seq_Transmit_IT
@@ -1563,10 +1571,10 @@
15631571
*/
15641572

15651573
#if defined(STM32G0)
1566-
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1567-
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1568-
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1569-
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
1574+
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1575+
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1576+
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1577+
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
15701578
#endif
15711579
#define HAL_PWR_PVDConfig HAL_PWR_ConfigPVD
15721580
#define HAL_PWR_DisableBkUpReg HAL_PWREx_DisableBkUpReg
@@ -3243,9 +3251,8 @@
32433251
#define RCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
32443252
#define RCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
32453253

3246-
#if defined(STM32L4)
3254+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32473255
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
3248-
#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32493256
#else
32503257
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
32513258
#endif
@@ -3481,9 +3488,9 @@
34813488
#define __HAL_SD_SDIO_CLEAR_FLAG __HAL_SD_SDMMC_CLEAR_FLAG
34823489
#define __HAL_SD_SDIO_GET_IT __HAL_SD_SDMMC_GET_IT
34833490
#define __HAL_SD_SDIO_CLEAR_IT __HAL_SD_SDMMC_CLEAR_IT
3484-
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3485-
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3486-
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
3491+
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3492+
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3493+
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
34873494
/* alias CMSIS for compatibilities */
34883495
#define SDIO_IRQn SDMMC1_IRQn
34893496
#define SDIO_IRQHandler SDMMC1_IRQHandler
@@ -3751,7 +3758,7 @@
37513758
/** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose
37523759
* @{
37533760
*/
3754-
#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7)
3761+
#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7) || defined(STM32H7)
37553762
#define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE
37563763
#endif /* STM32L4 || STM32F4 || STM32F7 */
37573764
/**

0 commit comments

Comments
 (0)