Skip to content

Commit bf96377

Browse files
fpistmfpistm
committed
system(wl3) update STM32WL3x HAL Drivers to v1.3.0
Included in STM32CubeWL3 FW v1.3.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 19f8e10 commit bf96377

40 files changed

+2781
-1788
lines changed

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,10 @@ extern "C" {
361361
#if defined(STM32L4R5xx) || defined(STM32L4R9xx) || defined(STM32L4R9xx) || defined(STM32L4S5xx) || \
362362
defined(STM32L4S7xx) || defined(STM32L4S9xx)
363363
#define DMA_REQUEST_DCMI_PSSI DMA_REQUEST_DCMI
364-
#endif
364+
#elif defined(STM32L4P5xx) || defined(STM32L4Q5xx)
365+
#define DMA_REQUEST_PSSI DMA_REQUEST_DCMI_PSSI
366+
#define LL_DMAMUX_REQ_PSSI LL_DMAMUX_REQ_DCMI_PSSI
367+
#endif /* STM32L4R5xx || STM32L4R9xx || STM32L4R9xx || STM32L4S5xx || STM32L4S7xx || STM32L4S9xx */
365368

366369
#endif /* STM32L4 */
367370

@@ -564,6 +567,9 @@ extern "C" {
564567
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
565568
#define OB_nBOOT0_SET OB_NBOOT0_SET
566569
#endif /* STM32U0 */
570+
#if defined(STM32H5)
571+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
572+
#endif /* STM32H5 */
567573

568574
/**
569575
* @}
@@ -2146,6 +2152,13 @@ extern "C" {
21462152
#define UFB_MODE_BitNumber UFB_MODE_BIT_NUMBER
21472153
#define CMP_PD_BitNumber CMP_PD_BIT_NUMBER
21482154

2155+
#if defined(STM32H7RS) || defined(STM32N6)
2156+
#define FMC_SWAPBMAP_DISABLE FMC_SWAPBANK_MODE0
2157+
#define FMC_SWAPBMAP_SDRAM_SRAM FMC_SWAPBANK_MODE1
2158+
#define HAL_SetFMCMemorySwappingConfig HAL_FMC_SetBankSwapConfig
2159+
#define HAL_GetFMCMemorySwappingConfig HAL_FMC_GetBankSwapConfig
2160+
#endif /* STM32H7RS || STM32N6 */
2161+
21492162
/**
21502163
* @}
21512164
*/

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ extern "C" {
4848
* @brief HAL Driver version number
4949
*/
5050
#define __STM32WL3X_HAL_VERSION_MAIN (0x01U) /*!< [31:24] main version */
51-
#define __STM32WL3X_HAL_VERSION_SUB1 (0x02U) /*!< [23:16] sub1 version */
51+
#define __STM32WL3X_HAL_VERSION_SUB1 (0x03U) /*!< [23:16] sub1 version */
5252
#define __STM32WL3X_HAL_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
5353
#define __STM32WL3X_HAL_VERSION_RC (0x00U) /*!< [7:0] release candidate */
5454
#define __STM32WL3X_HAL_VERSION ((__STM32WL3X_HAL_VERSION_MAIN << 24U)\

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_adc.h‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -300,10 +300,14 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
300300
* @{
301301
*/
302302

303-
#define ADC_SAMPLING_AT_START (LL_ADC_SAMPLING_AT_START) /*!< Sampling only at conversion start (default) */
304-
#define ADC_SAMPLING_AT_END (LL_ADC_SAMPLING_AT_END) /*!< Sampling sampling phase starts after end of
305-
conversion, and stops upon trigger event
306-
(Also known as Bulb sampling mode). */
303+
#define ADC_SAMPLING_AT_START (LL_ADC_SAMPLING_AT_START) /*!< Sampling phase starts only at conversion start and
304+
sampling time is 125ns regardless of the sampling
305+
period (default). */
306+
#define ADC_SAMPLING_AT_END (LL_ADC_SAMPLING_AT_END) /*!< Sampling phase starts after end of
307+
conversion, and stops upon trigger event (Also known
308+
as Bulb sampling mode).
309+
Sampling time is a function of the sampling period
310+
(Sample rate). */
307311

308312
/**
309313
* @}

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_gpio_ex.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ extern "C" {
5252
*
5353
*/
5454

55-
#if defined(STM32WL3XX)
55+
#if defined(STM32WL3XX) || defined(STM32WL3RX)
5656
/**
5757
* @brief AF 0 selection
5858
*/

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_i2c_ex.h‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ extern "C" {
5353
/** @defgroup I2CEx_FastModePlus I2C Extended Fast Mode Plus
5454
* @{
5555
*/
56+
#if defined (I2C1) || defined (I2C2)
5657
#define I2C_FASTMODEPLUS_PA0 SYSCFG_I2C_FMP_CTRL_I2C1_PA0_FMP /*!< Enable Fast Mode Plus on PA0 */
5758
#define I2C_FASTMODEPLUS_PA1 SYSCFG_I2C_FMP_CTRL_I2C1_PA1_FMP /*!< Enable Fast Mode Plus on PA1 */
5859
#define I2C_FASTMODEPLUS_PB6 SYSCFG_I2C_FMP_CTRL_I2C1_PB6_FMP /*!< Enable Fast Mode Plus on PB6 */
@@ -63,6 +64,7 @@ extern "C" {
6364
#define I2C_FASTMODEPLUS_PA7 SYSCFG_I2C_FMP_CTRL_I2C2_PA7_FMP /*!< Enable Fast Mode Plus on PA7 */
6465
#define I2C_FASTMODEPLUS_PA13 SYSCFG_I2C_FMP_CTRL_I2C2_PA13_FMP /*!< Enable Fast Mode Plus on PA13 */
6566
#define I2C_FASTMODEPLUS_PA14 SYSCFG_I2C_FMP_CTRL_I2C2_PA14_FMP /*!< Enable Fast Mode Plus on PA14 */
67+
#endif /* I2C1 || I2C2 */
6668
/**
6769
* @}
6870
*/
@@ -126,16 +128,19 @@ void HAL_I2CEx_DisableFastModePlus(uint32_t ConfigFastModePlus);
126128

127129
#define IS_I2C_DIGITAL_FILTER(FILTER) ((FILTER) <= 0x0000000FU)
128130

129-
#define IS_I2C_FASTMODEPLUS(__CONFIG__) ((((__CONFIG__) & (I2C_FASTMODEPLUS_PB6)) == I2C_FASTMODEPLUS_PB6) || \
130-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB7)) == I2C_FASTMODEPLUS_PB7) || \
131-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA0)) == I2C_FASTMODEPLUS_PA0) || \
132-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA1)) == I2C_FASTMODEPLUS_PA1) || \
133-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB10)) == I2C_FASTMODEPLUS_PB10) || \
134-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB11)) == I2C_FASTMODEPLUS_PB11) || \
135-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA6)) == I2C_FASTMODEPLUS_PA6) || \
136-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA7)) == I2C_FASTMODEPLUS_PA7) || \
137-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA13)) == I2C_FASTMODEPLUS_PA13) || \
138-
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA14)) == I2C_FASTMODEPLUS_PA14))
131+
#if defined(I2C1) || defined(I2C2)
132+
#define IS_I2C_FASTMODEPLUS(__CONFIG__) ( \
133+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB7)) == I2C_FASTMODEPLUS_PB7) || \
134+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA0)) == I2C_FASTMODEPLUS_PA0) || \
135+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA1)) == I2C_FASTMODEPLUS_PA1) || \
136+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB10)) == I2C_FASTMODEPLUS_PB10) || \
137+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PB11)) == I2C_FASTMODEPLUS_PB11) || \
138+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA6)) == I2C_FASTMODEPLUS_PA6) || \
139+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA7)) == I2C_FASTMODEPLUS_PA7) || \
140+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA13)) == I2C_FASTMODEPLUS_PA13) || \
141+
(((__CONFIG__) & (I2C_FASTMODEPLUS_PA14)) == I2C_FASTMODEPLUS_PA14))
142+
#endif /* I2C1 || I2C2 */
143+
139144
/**
140145
* @}
141146
*/

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_i2s.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ extern "C" {
2727
/* Includes ------------------------------------------------------------------*/
2828
#include "stm32wl3x_hal_def.h"
2929

30+
#if defined(SPI_I2S_SUPPORT)
3031
/** @addtogroup STM32WL3x_HAL_Driver
3132
* @{
3233
*/
@@ -543,6 +544,7 @@ uint32_t HAL_I2S_GetError(I2S_HandleTypeDef *hi2s);
543544
/**
544545
* @}
545546
*/
547+
#endif /* SPI_I2S_SUPPORT */
546548

547549
#ifdef __cplusplus
548550
}

‎system/Drivers/STM32WL3x_HAL_Driver/Inc/stm32wl3x_hal_lpawur.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ extern "C" {
3030
/** @addtogroup STM32WL3x_HAL_Driver
3131
* @{
3232
*/
33-
33+
#if defined (LPAWUR)
3434
/** @addtogroup LPAWUR
3535
* @{
3636
*/
@@ -179,7 +179,7 @@ void HAL_LPAWUR_MspDeInit(void);
179179
/**
180180
* @}
181181
*/
182-
182+
#endif /* LPAWUR */
183183
/**
184184
* @}
185185
*/

0 commit comments

Comments
 (0)