Skip to content

Commit 9479bc5

Browse files
committed
system(WB) update STM32WBxx HAL Drivers to v1.10.0
Included in STM32CubeWB FW v1.13.0 Signed-off-by: Alexandre Bourdiol <[email protected]>
1 parent 63a7c0e commit 9479bc5

File tree

162 files changed

+3597
-2998
lines changed

Some content is hidden

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

162 files changed

+3597
-2998
lines changed

Diff for: system/Drivers/STM32WBxx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

+54-5
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
******************************************************************************
88
* @attention
99
*
10-
* Copyright (c) 2019-2021 STMicroelectronics.
10+
* Copyright (c) 2021 STMicroelectronics.
1111
* All rights reserved.
1212
*
1313
* This software is licensed under terms that can be found in the LICENSE file
@@ -213,18 +213,20 @@ extern "C" {
213213
* @{
214214
*/
215215
#define __HAL_CORTEX_SYSTICKCLK_CONFIG HAL_SYSTICK_CLKSourceConfig
216+
#if defined(STM32U5)
217+
#define MPU_DEVICE_nGnRnE MPU_DEVICE_NGNRNE
218+
#define MPU_DEVICE_nGnRE MPU_DEVICE_NGNRE
219+
#define MPU_DEVICE_nGRE MPU_DEVICE_NGRE
220+
#endif /* STM32U5 */
216221
/**
217222
* @}
218223
*/
219224

220225
/** @defgroup CRC_Aliases CRC API aliases
221226
* @{
222227
*/
223-
#if defined(STM32WL) || defined(STM32WB) || defined(STM32L5) || defined(STM32L4)
224-
#else
225228
#define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for inter STM32 series compatibility */
226229
#define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for inter STM32 series compatibility */
227-
#endif
228230
/**
229231
* @}
230232
*/
@@ -259,6 +261,13 @@ extern "C" {
259261
#define DAC_CHIPCONNECT_ENABLE DAC_CHIPCONNECT_INTERNAL
260262
#endif
261263

264+
#if defined(STM32U5)
265+
#define DAC_TRIGGER_STOP_LPTIM1_OUT DAC_TRIGGER_STOP_LPTIM1_CH1
266+
#define DAC_TRIGGER_STOP_LPTIM3_OUT DAC_TRIGGER_STOP_LPTIM3_CH1
267+
#define DAC_TRIGGER_LPTIM1_OUT DAC_TRIGGER_LPTIM1_CH1
268+
#define DAC_TRIGGER_LPTIM3_OUT DAC_TRIGGER_LPTIM3_CH1
269+
#endif
270+
262271
#if defined(STM32L1) || defined(STM32L4) || defined(STM32G0) || defined(STM32L5) || defined(STM32H7) || defined(STM32F4) || defined(STM32G4)
263272
#define HAL_DAC_MSP_INIT_CB_ID HAL_DAC_MSPINIT_CB_ID
264273
#define HAL_DAC_MSP_DEINIT_CB_ID HAL_DAC_MSPDEINIT_CB_ID
@@ -644,6 +653,20 @@ extern "C" {
644653
#endif /* STM32F0 || STM32F3 || STM32F1 */
645654

646655
#define GPIO_AF6_DFSDM GPIO_AF6_DFSDM1
656+
657+
#if defined(STM32U5)
658+
#define GPIO_AF0_RTC_50Hz GPIO_AF0_RTC_50HZ
659+
#endif /* STM32U5 */
660+
/**
661+
* @}
662+
*/
663+
664+
/** @defgroup HAL_GTZC_Aliased_Defines HAL GTZC Aliased Defines maintained for legacy purpose
665+
* @{
666+
*/
667+
#if defined(STM32U5)
668+
#define GTZC_PERIPH_DCMI GTZC_PERIPH_DCMI_PSSI
669+
#endif /* STM32U5 */
647670
/**
648671
* @}
649672
*/
@@ -884,6 +907,7 @@ extern "C" {
884907
#if defined(STM32U5)
885908
#define LPTIM_ISR_CC1 LPTIM_ISR_CC1IF
886909
#define LPTIM_ISR_CC2 LPTIM_ISR_CC2IF
910+
#define LPTIM_CHANNEL_ALL 0x00000000U
887911
#endif /* STM32U5 */
888912
/**
889913
* @}
@@ -1448,7 +1472,8 @@ extern "C" {
14481472
*/
14491473

14501474
#if defined(STM32U5)
1451-
#define HAL_DCACHE_CleanInvalidateByAddr_IT HAL_DCACHE_AsyncCleanInvalidateByAddr
1475+
#define HAL_DCACHE_CleanInvalidateByAddr HAL_DCACHE_CleanInvalidByAddr
1476+
#define HAL_DCACHE_CleanInvalidateByAddr_IT HAL_DCACHE_CleanInvalidByAddr_IT
14521477
#endif /* STM32U5 */
14531478

14541479
/**
@@ -3410,7 +3435,19 @@ extern "C" {
34103435
#define __HAL_RCC_APB2_CLK_Disable_Clear __HAL_RCC_APB2_CLK_ENABLE
34113436
#define __HAL_RCC_APB3_CLK_Disable_Clear __HAL_RCC_APB3_CLK_ENABLE
34123437
#define IS_RCC_MSIPLLModeSelection IS_RCC_MSIPLLMODE_SELECT
3438+
#define RCC_PERIPHCLK_CLK48 RCC_PERIPHCLK_ICLK
3439+
#define RCC_CLK48CLKSOURCE_HSI48 RCC_ICLK_CLKSOURCE_HSI48
3440+
#define RCC_CLK48CLKSOURCE_PLL2 RCC_ICLK_CLKSOURCE_PLL2
3441+
#define RCC_CLK48CLKSOURCE_PLL1 RCC_ICLK_CLKSOURCE_PLL1
3442+
#define RCC_CLK48CLKSOURCE_MSIK RCC_ICLK_CLKSOURCE_MSIK
3443+
#define __HAL_RCC_ADC1_CLK_ENABLE __HAL_RCC_ADC12_CLK_ENABLE
3444+
#define __HAL_RCC_ADC1_CLK_DISABLE __HAL_RCC_ADC12_CLK_DISABLE
3445+
#define __HAL_RCC_ADC1_IS_CLK_ENABLED __HAL_RCC_ADC12_IS_CLK_ENABLED
3446+
#define __HAL_RCC_ADC1_IS_CLK_DISABLED __HAL_RCC_ADC12_IS_CLK_DISABLED
3447+
#define __HAL_RCC_ADC1_FORCE_RESET __HAL_RCC_ADC12_FORCE_RESET
3448+
#define __HAL_RCC_ADC1_RELEASE_RESET __HAL_RCC_ADC12_RELEASE_RESET
34133449
#endif
3450+
34143451
/**
34153452
* @}
34163453
*/
@@ -3491,12 +3528,14 @@ extern "C" {
34913528
#define SD_OCR_CID_CSD_OVERWRIETE SD_OCR_CID_CSD_OVERWRITE
34923529
#define SD_CMD_SD_APP_STAUS SD_CMD_SD_APP_STATUS
34933530

3531+
#if !defined(STM32F1) && !defined(STM32F2) && !defined(STM32F4) && !defined(STM32F7) && !defined(STM32L1)
34943532
#define eMMC_HIGH_VOLTAGE_RANGE EMMC_HIGH_VOLTAGE_RANGE
34953533
#define eMMC_DUAL_VOLTAGE_RANGE EMMC_DUAL_VOLTAGE_RANGE
34963534
#define eMMC_LOW_VOLTAGE_RANGE EMMC_LOW_VOLTAGE_RANGE
34973535

34983536
#define SDMMC_NSpeed_CLK_DIV SDMMC_NSPEED_CLK_DIV
34993537
#define SDMMC_HSpeed_CLK_DIV SDMMC_HSPEED_CLK_DIV
3538+
#endif
35003539

35013540
#if defined(STM32F4) || defined(STM32F2)
35023541
#define SD_SDMMC_DISABLED SD_SDIO_DISABLED
@@ -3826,6 +3865,16 @@ extern "C" {
38263865
* @}
38273866
*/
38283867

3868+
/** @defgroup HAL_Generic_Aliased_Macros HAL Generic Aliased Macros maintained for legacy purpose
3869+
* @{
3870+
*/
3871+
#if defined (STM32F7)
3872+
#define ART_ACCLERATOR_ENABLE ART_ACCELERATOR_ENABLE
3873+
#endif /* STM32F7 */
3874+
/**
3875+
* @}
3876+
*/
3877+
38293878
/** @defgroup HAL_PPP_Aliased_Macros HAL PPP Aliased Macros maintained for legacy purpose
38303879
* @{
38313880
*/

Diff for: system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32_assert_template.h

+5-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,12 @@
88
******************************************************************************
99
* @attention
1010
*
11-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
12-
* All rights reserved.</center></h2>
11+
* Copyright (c) 2019 STMicroelectronics.
12+
* All rights reserved.
1313
*
14-
* This software component is licensed by ST under BSD 3-Clause license,
15-
* the "License"; You may not use this file except in compliance with the
16-
* License. You may obtain a copy of the License at:
17-
* opensource.org/licenses/BSD-3-Clause
14+
* This software is licensed under terms that can be found in the LICENSE file
15+
* in the root directory of this software component.
16+
* If no LICENSE file comes with this software, it is provided AS-IS.
1817
*
1918
******************************************************************************
2019
*/
@@ -52,6 +51,3 @@
5251
#endif
5352

5453
#endif /* STM32_ASSERT_H */
55-
56-
57-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal.h

+5-8
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
******************************************************************************
88
* @attention
99
*
10-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
11-
* All rights reserved.</center></h2>
10+
* Copyright (c) 2019 STMicroelectronics.
11+
* All rights reserved.
1212
*
13-
* This software component is licensed by ST under BSD 3-Clause license,
14-
* the "License"; You may not use this file except in compliance with the
15-
* License. You may obtain a copy of the License at:
16-
* opensource.org/licenses/BSD-3-Clause
13+
* This software is licensed under terms that can be found in the LICENSE file
14+
* in the root directory of this software component.
15+
* If no LICENSE file comes with this software, it is provided AS-IS.
1716
*
1817
******************************************************************************
1918
*/
@@ -695,5 +694,3 @@ uint32_t HAL_SYSCFG_IsEnabledSecurityAccess(uint32_t SecurityAccess);
695694
#endif
696695

697696
#endif /* STM32WBxx_HAL_H */
698-
699-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc.h

+5-9
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2019 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -1890,7 +1889,4 @@ void ADC_DMAError(DMA_HandleTypeDef *hdma);
18901889
}
18911890
#endif
18921891

1893-
18941892
#endif /* STM32WBxx_HAL_ADC_H */
1895-
1896-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

Diff for: system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_adc_ex.h

+15-19
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* Copyright (c) 2019 STMicroelectronics.
10+
* All rights reserved.
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
12+
* This software is licensed under terms that can be found in the LICENSE file
13+
* in the root directory of this software component.
14+
* If no LICENSE file comes with this software, it is provided AS-IS.
1615
*
1716
******************************************************************************
1817
*/
@@ -188,7 +187,7 @@ typedef struct
188187
#if defined (ADC_SUPPORT_2_5_MSPS)
189188
/* Feature "ADC group injected" not available on ADC peripheral of this STM32WB device */
190189
#else
191-
/** @defgroup ADC_injected_external_trigger_source ADC group injected trigger source
190+
/** @defgroup ADCEx_injected_external_trigger_source ADC group injected trigger source
192191
* @{
193192
*/
194193
/* ADC group regular trigger sources for all ADC instances */
@@ -203,7 +202,7 @@ typedef struct
203202
* @}
204203
*/
205204

206-
/** @defgroup ADC_injected_external_trigger_edge ADC group injected trigger edge (when external trigger is selected)
205+
/** @defgroup ADCEx_injected_external_trigger_edge ADC group injected trigger edge (when external trigger is selected)
207206
* @{
208207
*/
209208
#define ADC_EXTERNALTRIGINJECCONV_EDGE_NONE (0x00000000UL) /*!< Injected conversions hardware trigger detection disabled */
@@ -215,7 +214,7 @@ typedef struct
215214
*/
216215
#endif /* ADC_SUPPORT_2_5_MSPS */
217216

218-
/** @defgroup ADC_HAL_EC_CHANNEL_SINGLE_DIFF_ENDING Channel - Single or differential ending
217+
/** @defgroup ADCEx_HAL_EC_CHANNEL_SINGLE_DIFF_ENDING Channel - Single or differential ending
219218
* @{
220219
*/
221220
#define ADC_SINGLE_ENDED (LL_ADC_SINGLE_ENDED) /*!< ADC channel ending set to single ended (literal also used to set calibration mode) */
@@ -226,7 +225,7 @@ typedef struct
226225
* @}
227226
*/
228227

229-
/** @defgroup ADC_HAL_EC_OFFSET_NB ADC instance - Offset number
228+
/** @defgroup ADCEx_HAL_EC_OFFSET_NB ADC instance - Offset number
230229
* @{
231230
*/
232231
#define ADC_OFFSET_NONE (ADC_OFFSET_4 + 1U) /*!< ADC offset disabled: no offset correction for the selected ADC channel */
@@ -241,7 +240,7 @@ typedef struct
241240
#if defined (ADC_SUPPORT_2_5_MSPS)
242241
/* Feature "ADC group injected" not available on ADC peripheral of this STM32WB device */
243242
#else
244-
/** @defgroup ADC_INJ_SEQ_RANKS ADC group injected - Sequencer ranks
243+
/** @defgroup ADCEx_INJ_SEQ_RANKS ADC group injected - Sequencer ranks
245244
* @{
246245
*/
247246
#define ADC_INJECTED_RANK_1 (LL_ADC_INJ_RANK_1) /*!< ADC group injected sequencer rank 1 */
@@ -253,7 +252,7 @@ typedef struct
253252
*/
254253
#endif /* ADC_SUPPORT_2_5_MSPS */
255254

256-
/** @defgroup ADC_HAL_EC_GROUPS ADC instance - Groups
255+
/** @defgroup ADCEx_HAL_EC_GROUPS ADC instance - Groups
257256
* @{
258257
*/
259258
#define ADC_REGULAR_GROUP (LL_ADC_GROUP_REGULAR) /*!< ADC group regular (available on all STM32 devices) */
@@ -267,7 +266,7 @@ typedef struct
267266
* @}
268267
*/
269268

270-
/** @defgroup ADC_CFGR_fields ADCx CFGR fields
269+
/** @defgroup ADCEx_CFGR_fields ADCx CFGR fields
271270
* @{
272271
*/
273272
#define ADC_CFGR_FIELDS (ADC_CFGR_AWD1CH | ADC_CFGR_JAUTO | ADC_CFGR_JAWD1EN |\
@@ -280,7 +279,7 @@ typedef struct
280279
* @}
281280
*/
282281

283-
/** @defgroup ADC_SMPR1_fields ADCx SMPR1 fields
282+
/** @defgroup ADCEx_SMPR1_fields ADCx SMPR1 fields
284283
* @{
285284
*/
286285
#define ADC_SMPR1_FIELDS (ADC_SMPR1_SMP9 | ADC_SMPR1_SMP8 | ADC_SMPR1_SMP7 |\
@@ -291,7 +290,7 @@ typedef struct
291290
* @}
292291
*/
293292

294-
/** @defgroup ADC_CFGR_fields_2 ADCx CFGR sub fields
293+
/** @defgroup ADCEx_CFGR_fields_2 ADCx CFGR sub fields
295294
* @{
296295
*/
297296
/* ADC_CFGR fields of parameters that can be updated when no conversion
@@ -391,7 +390,7 @@ typedef struct
391390
/**
392391
* @brief Enable ADC overrun mode.
393392
* @param _OVERRUN_MODE_ Overrun mode.
394-
* @retval Overun bit setting to be programmed into CFGR register
393+
* @retval Overrun bit setting to be programmed into CFGR register
395394
*/
396395
/* Note: Bit ADC_CFGR1_OVRMOD not used directly in constant */
397396
/* "ADC_OVR_DATA_OVERWRITTEN" to have this case defined to 0x00, to set it */
@@ -914,6 +913,3 @@ HAL_StatusTypeDef HAL_ADCEx_EnterADCDeepPowerDownMode(ADC_HandleTypeDef *h
914913
#endif
915914

916915
#endif /* STM32WBxx_HAL_ADC_EX_H */
917-
918-
919-
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/

0 commit comments

Comments
 (0)