Skip to content

Commit 0402aed

Browse files
fpistmfpistm
committed
[L4] Update STM32L4xx HAL Drivers to v1.12.0
Included in STM32CubeL4 FW v1.16.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 952fb78 commit 0402aed

File tree

94 files changed

+6889
-3462
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

+6889
-3462
lines changed

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

+29-21
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@
241241
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
242242
#endif
243243

244-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4)
244+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)
245245
#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID
246246
#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID
247247
#endif
@@ -313,8 +313,13 @@
313313
#endif /* STM32L4 */
314314

315315
#if defined(STM32G0)
316-
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317-
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
316+
#define DMA_REQUEST_DAC1_CHANNEL1 DMA_REQUEST_DAC1_CH1
317+
#define DMA_REQUEST_DAC1_CHANNEL2 DMA_REQUEST_DAC1_CH2
318+
#define DMA_REQUEST_TIM16_TRIG_COM DMA_REQUEST_TIM16_COM
319+
#define DMA_REQUEST_TIM17_TRIG_COM DMA_REQUEST_TIM17_COM
320+
321+
#define LL_DMAMUX_REQ_TIM16_TRIG_COM LL_DMAMUX_REQ_TIM16_COM
322+
#define LL_DMAMUX_REQ_TIM17_TRIG_COM LL_DMAMUX_REQ_TIM17_COM
318323
#endif
319324

320325
#if defined(STM32H7)
@@ -643,6 +648,10 @@
643648
#define HAL_HRTIM_ExternalEventCounterEnable HAL_HRTIM_ExtEventCounterEnable
644649
#define HAL_HRTIM_ExternalEventCounterDisable HAL_HRTIM_ExtEventCounterDisable
645650
#define HAL_HRTIM_ExternalEventCounterReset HAL_HRTIM_ExtEventCounterReset
651+
#define HRTIM_TIMEEVENT_A HRTIM_EVENTCOUNTER_A
652+
#define HRTIM_TIMEEVENT_B HRTIM_EVENTCOUNTER_B
653+
#define HRTIM_TIMEEVENTRESETMODE_UNCONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_UNCONDITIONAL
654+
#define HRTIM_TIMEEVENTRESETMODE_CONDITIONAL HRTIM_EVENTCOUNTER_RSTMODE_CONDITIONAL
646655
#endif /* STM32G4 */
647656

648657
#if defined(STM32H7)
@@ -955,7 +964,7 @@
955964
#define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0
956965
#define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1
957966

958-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7)
967+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)
959968
#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID
960969
#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID
961970
#endif
@@ -1450,7 +1459,7 @@
14501459
#define HASH_HMACKeyType_ShortKey HASH_HMAC_KEYTYPE_SHORTKEY
14511460
#define HASH_HMACKeyType_LongKey HASH_HMAC_KEYTYPE_LONGKEY
14521461

1453-
#if defined(STM32L4) || defined(STM32H7)
1462+
#if defined(STM32L4) || defined(STM32L5) || defined(STM32F4) || defined(STM32F7) || defined(STM32H7)
14541463

14551464
#define HAL_HASH_MD5_Accumulate HAL_HASH_MD5_Accmlt
14561465
#define HAL_HASH_MD5_Accumulate_End HAL_HASH_MD5_Accmlt_End
@@ -1472,7 +1481,7 @@
14721481
#define HAL_HASHEx_SHA256_Accumulate_IT HAL_HASHEx_SHA256_Accmlt_IT
14731482
#define HAL_HASHEx_SHA256_Accumulate_End_IT HAL_HASHEx_SHA256_Accmlt_End_IT
14741483

1475-
#endif /* STM32L4 || STM32H7 */
1484+
#endif /* STM32L4 || STM32L5 || STM32F4 || STM32F7 || STM32H7 */
14761485
/**
14771486
* @}
14781487
*/
@@ -1531,18 +1540,18 @@
15311540

15321541
#define HAL_I2CFastModePlusConfig(SYSCFG_I2CFastModePlus, cmd) (((cmd)==ENABLE)? HAL_I2CEx_EnableFastModePlus(SYSCFG_I2CFastModePlus): HAL_I2CEx_DisableFastModePlus(SYSCFG_I2CFastModePlus))
15331542

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)
1543+
#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)
15351544
#define HAL_I2C_Master_Sequential_Transmit_IT HAL_I2C_Master_Seq_Transmit_IT
15361545
#define HAL_I2C_Master_Sequential_Receive_IT HAL_I2C_Master_Seq_Receive_IT
15371546
#define HAL_I2C_Slave_Sequential_Transmit_IT HAL_I2C_Slave_Seq_Transmit_IT
15381547
#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)
1548+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F0 || STM32F1 || STM32F2 || STM32F3 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
1549+
#if defined(STM32H7) || defined(STM32WB) || defined(STM32G0) || defined(STM32F4) || defined(STM32F7) || defined(STM32L0) || defined(STM32L4) || defined(STM32L5) || defined(STM32G4)|| defined(STM32L1)
15411550
#define HAL_I2C_Master_Sequential_Transmit_DMA HAL_I2C_Master_Seq_Transmit_DMA
15421551
#define HAL_I2C_Master_Sequential_Receive_DMA HAL_I2C_Master_Seq_Receive_DMA
15431552
#define HAL_I2C_Slave_Sequential_Transmit_DMA HAL_I2C_Slave_Seq_Transmit_DMA
15441553
#define HAL_I2C_Slave_Sequential_Receive_DMA HAL_I2C_Slave_Seq_Receive_DMA
1545-
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 */
1554+
#endif /* STM32H7 || STM32WB || STM32G0 || STM32F4 || STM32F7 || STM32L0 || STM32L4 || STM32L5 || STM32G4 || STM32L1 */
15461555

15471556
#if defined(STM32F4)
15481557
#define HAL_FMPI2C_Master_Sequential_Transmit_IT HAL_FMPI2C_Master_Seq_Transmit_IT
@@ -1563,10 +1572,10 @@
15631572
*/
15641573

15651574
#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
1575+
#define HAL_PWR_ConfigPVD HAL_PWREx_ConfigPVD
1576+
#define HAL_PWR_EnablePVD HAL_PWREx_EnablePVD
1577+
#define HAL_PWR_DisablePVD HAL_PWREx_DisablePVD
1578+
#define HAL_PWR_PVD_IRQHandler HAL_PWREx_PVD_IRQHandler
15701579
#endif
15711580
#define HAL_PWR_PVDConfig HAL_PWR_ConfigPVD
15721581
#define HAL_PWR_DisableBkUpReg HAL_PWREx_DisableBkUpReg
@@ -3243,9 +3252,8 @@
32433252
#define RCC_MCOSOURCE_PLLCLK_NODIV RCC_MCO1SOURCE_PLLCLK
32443253
#define RCC_MCOSOURCE_PLLCLK_DIV2 RCC_MCO1SOURCE_PLLCLK_DIV2
32453254

3246-
#if defined(STM32L4)
3255+
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32473256
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
3248-
#elif defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5)
32493257
#else
32503258
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
32513259
#endif
@@ -3481,9 +3489,9 @@
34813489
#define __HAL_SD_SDIO_CLEAR_FLAG __HAL_SD_SDMMC_CLEAR_FLAG
34823490
#define __HAL_SD_SDIO_GET_IT __HAL_SD_SDMMC_GET_IT
34833491
#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
3492+
#define SDIO_STATIC_FLAGS SDMMC_STATIC_FLAGS
3493+
#define SDIO_CMD0TIMEOUT SDMMC_CMD0TIMEOUT
3494+
#define SD_SDIO_SEND_IF_COND SD_SDMMC_SEND_IF_COND
34873495
/* alias CMSIS for compatibilities */
34883496
#define SDIO_IRQn SDMMC1_IRQn
34893497
#define SDIO_IRQHandler SDMMC1_IRQHandler
@@ -3751,9 +3759,9 @@
37513759
/** @defgroup HAL_QSPI_Aliased_Macros HAL QSPI Aliased Macros maintained for legacy purpose
37523760
* @{
37533761
*/
3754-
#if defined (STM32L4)
3762+
#if defined (STM32L4) || defined (STM32F4) || defined (STM32F7) || defined(STM32H7)
37553763
#define HAL_QPSI_TIMEOUT_DEFAULT_VALUE HAL_QSPI_TIMEOUT_DEFAULT_VALUE
3756-
#endif
3764+
#endif /* STM32L4 || STM32F4 || STM32F7 */
37573765
/**
37583766
* @}
37593767
*/

‎system/Drivers/STM32L4xx_HAL_Driver/Inc/stm32l4xx_hal.h

+32-19
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@
3838
*/
3939

4040
/* Exported types ------------------------------------------------------------*/
41-
/* Exported constants --------------------------------------------------------*/
42-
43-
/** @defgroup HAL_Exported_Constants HAL Exported Constants
41+
/** @defgroup HAL_Exported_Types HAL Exported Types
4442
* @{
4543
*/
4644

4745
/** @defgroup HAL_TICK_FREQ Tick Frequency
4846
* @{
4947
*/
50-
#define HAL_TICK_FREQ_10HZ 100U
51-
#define HAL_TICK_FREQ_100HZ 10U
52-
#define HAL_TICK_FREQ_1KHZ 1U
53-
#define HAL_TICK_FREQ_DEFAULT HAL_TICK_FREQ_1KHZ
54-
48+
typedef enum
49+
{
50+
HAL_TICK_FREQ_10HZ = 100U,
51+
HAL_TICK_FREQ_100HZ = 10U,
52+
HAL_TICK_FREQ_1KHZ = 1U,
53+
HAL_TICK_FREQ_DEFAULT = HAL_TICK_FREQ_1KHZ
54+
} HAL_TickFreqTypeDef;
5555
/**
5656
* @}
5757
*/
@@ -60,6 +60,12 @@
6060
* @}
6161
*/
6262

63+
/* Exported constants --------------------------------------------------------*/
64+
65+
/** @defgroup HAL_Exported_Constants HAL Exported Constants
66+
* @{
67+
*/
68+
6369
/** @defgroup SYSCFG_Exported_Constants SYSCFG Exported Constants
6470
* @{
6571
*/
@@ -247,7 +253,14 @@
247253
* @}
248254
*/
249255

256+
/**
257+
* @}
258+
*/
259+
250260
/* Exported macros -----------------------------------------------------------*/
261+
/** @defgroup HAL_Exported_Macros HAL Exported Macros
262+
* @{
263+
*/
251264

252265
/** @defgroup DBGMCU_Exported_Macros DBGMCU Exported Macros
253266
* @{
@@ -536,19 +549,15 @@
536549
* @}
537550
*/
538551

552+
/**
553+
* @}
554+
*/
555+
539556
/* Private macros ------------------------------------------------------------*/
540557
/** @defgroup HAL_Private_Macros HAL Private Macros
541558
* @{
542559
*/
543560

544-
#define IS_TICKFREQ(__FREQ__) (((__FREQ__) == HAL_TICK_FREQ_10HZ) || \
545-
((__FREQ__) == HAL_TICK_FREQ_100HZ) || \
546-
((__FREQ__) == HAL_TICK_FREQ_1KHZ))
547-
548-
/**
549-
* @}
550-
*/
551-
552561
/** @defgroup SYSCFG_Private_Macros SYSCFG Private Macros
553562
* @{
554563
*/
@@ -598,14 +607,18 @@
598607
* @}
599608
*/
600609

610+
/**
611+
* @}
612+
*/
613+
601614
/* Exported variables --------------------------------------------------------*/
602615

603616
/** @addtogroup HAL_Exported_Variables
604617
* @{
605618
*/
606619
extern __IO uint32_t uwTick;
607620
extern uint32_t uwTickPrio;
608-
extern uint32_t uwTickFreq;
621+
extern HAL_TickFreqTypeDef uwTickFreq;
609622
/**
610623
* @}
611624
*/
@@ -640,8 +653,8 @@ void HAL_IncTick(void);
640653
void HAL_Delay(uint32_t Delay);
641654
uint32_t HAL_GetTick(void);
642655
uint32_t HAL_GetTickPrio(void);
643-
HAL_StatusTypeDef HAL_SetTickFreq(uint32_t Freq);
644-
uint32_t HAL_GetTickFreq(void);
656+
HAL_StatusTypeDef HAL_SetTickFreq(HAL_TickFreqTypeDef Freq);
657+
HAL_TickFreqTypeDef HAL_GetTickFreq(void);
645658
void HAL_SuspendTick(void);
646659
void HAL_ResumeTick(void);
647660
uint32_t HAL_GetHalVersion(void);

0 commit comments

Comments
 (0)