Skip to content

Commit 299be57

Browse files
committed
system(WB) update STM32WBxx HAL Drivers to v1.12.0
Included in STM32CubeWB FW v1.15.0 Signed-off-by: Frederic Pillon <[email protected]>
1 parent 0911397 commit 299be57

Some content is hidden

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

56 files changed

+1796
-1528
lines changed

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

+18-5
Original file line numberDiff line numberDiff line change
@@ -214,6 +214,11 @@ extern "C" {
214214
#endif
215215

216216
#endif
217+
218+
#if defined(STM32U5)
219+
#define __HAL_COMP_COMP1_EXTI_CLEAR_RASING_FLAG __HAL_COMP_COMP1_EXTI_CLEAR_RISING_FLAG
220+
#endif
221+
217222
/**
218223
* @}
219224
*/
@@ -268,7 +273,7 @@ extern "C" {
268273
#define DAC_WAVEGENERATION_NOISE DAC_WAVE_NOISE
269274
#define DAC_WAVEGENERATION_TRIANGLE DAC_WAVE_TRIANGLE
270275

271-
#if defined(STM32G4) || defined(STM32H7) || defined (STM32U5)
276+
#if defined(STM32G4) || defined(STM32L5) || defined(STM32H7) || defined (STM32U5)
272277
#define DAC_CHIPCONNECT_DISABLE DAC_CHIPCONNECT_EXTERNAL
273278
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
274279
#endif
@@ -530,6 +535,9 @@ extern "C" {
530535
#define OB_USER_nBOOT0 OB_USER_NBOOT0
531536
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
532537
#define OB_nBOOT0_SET OB_NBOOT0_SET
538+
#define OB_USER_SRAM134_RST OB_USER_SRAM_RST
539+
#define OB_SRAM134_RST_ERASE OB_SRAM_RST_ERASE
540+
#define OB_SRAM134_RST_NOT_ERASE OB_SRAM_RST_NOT_ERASE
533541
#endif /* STM32U5 */
534542

535543
/**
@@ -672,8 +680,6 @@ extern "C" {
672680

673681
#if defined(STM32U5)
674682
#define GPIO_AF0_RTC_50Hz GPIO_AF0_RTC_50HZ
675-
#endif /* STM32U5 */
676-
#if defined(STM32U5)
677683
#define GPIO_AF0_S2DSTOP GPIO_AF0_SRDSTOP
678684
#define GPIO_AF11_LPGPIO GPIO_AF11_LPGPIO1
679685
#endif /* STM32U5 */
@@ -686,7 +692,9 @@ extern "C" {
686692
*/
687693
#if defined(STM32U5)
688694
#define GTZC_PERIPH_DCMI GTZC_PERIPH_DCMI_PSSI
695+
#define GTZC_PERIPH_LTDC GTZC_PERIPH_LTDCUSB
689696
#endif /* STM32U5 */
697+
690698
/**
691699
* @}
692700
*/
@@ -1005,7 +1013,7 @@ extern "C" {
10051013
#define OPAMP_PGACONNECT_VM0 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO0
10061014
#define OPAMP_PGACONNECT_VM1 OPAMP_PGA_CONNECT_INVERTINGINPUT_IO1
10071015

1008-
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4)
1016+
#if defined(STM32L1) || defined(STM32L4) || defined(STM32L5) || defined(STM32H7) || defined(STM32G4) || defined(STM32U5)
10091017
#define HAL_OPAMP_MSP_INIT_CB_ID HAL_OPAMP_MSPINIT_CB_ID
10101018
#define HAL_OPAMP_MSP_DEINIT_CB_ID HAL_OPAMP_MSPDEINIT_CB_ID
10111019
#endif
@@ -2959,6 +2967,11 @@ extern "C" {
29592967

29602968
#define __HAL_RCC_WWDG_IS_CLK_ENABLED __HAL_RCC_WWDG1_IS_CLK_ENABLED
29612969
#define __HAL_RCC_WWDG_IS_CLK_DISABLED __HAL_RCC_WWDG1_IS_CLK_DISABLED
2970+
#define RCC_SPI4CLKSOURCE_D2PCLK1 RCC_SPI4CLKSOURCE_D2PCLK2
2971+
#define RCC_SPI5CLKSOURCE_D2PCLK1 RCC_SPI5CLKSOURCE_D2PCLK2
2972+
#define RCC_SPI45CLKSOURCE_D2PCLK1 RCC_SPI45CLKSOURCE_D2PCLK2
2973+
#define RCC_SPI45CLKSOURCE_CDPCLK1 RCC_SPI45CLKSOURCE_CDPCLK2
2974+
#define RCC_SPI45CLKSOURCE_PCLK1 RCC_SPI45CLKSOURCE_PCLK2
29622975
#endif
29632976

29642977
#define __WWDG_CLK_DISABLE __HAL_RCC_WWDG_CLK_DISABLE
@@ -3586,7 +3599,7 @@ extern "C" {
35863599
*/
35873600
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || defined (STM32L4P5xx)|| \
35883601
defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3589-
defined (STM32WB_GEN2) || defined (STM32WBA) || defined (STM32C0)
3602+
defined (STM32C0)
35903603
#else
35913604
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG
35923605
#endif

system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#define STM32_ASSERT_H
2424

2525
#ifdef __cplusplus
26-
extern "C" {
26+
extern "C" {
2727
#endif
2828

2929
/* Exported types ------------------------------------------------------------*/
@@ -39,11 +39,11 @@
3939
* If expr is true, it returns no value.
4040
* @retval None
4141
*/
42-
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
42+
#define assert_param(expr) ((expr) ? (void)0U : assert_failed((uint8_t *)__FILE__, __LINE__))
4343
/* Exported functions ------------------------------------------------------- */
44-
void assert_failed(uint8_t* file, uint32_t line);
44+
void assert_failed(uint8_t *file, uint32_t line);
4545
#else
46-
#define assert_param(expr) ((void)0U)
46+
#define assert_param(expr) ((void)0U)
4747
#endif /* USE_FULL_ASSERT */
4848

4949
#ifdef __cplusplus

0 commit comments

Comments
 (0)