Skip to content

Commit 2432884

Browse files
fpistmfpistm
committed
system(wb) update STM32WBxx HAL Drivers to v1.14.6
Included in STM32CubeWB FW v1.23.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent e7a5392 commit 2432884

15 files changed

Lines changed: 275 additions & 165 deletions

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -564,6 +564,9 @@ extern "C" {
564564
#define OB_nBOOT0_RESET OB_NBOOT0_RESET
565565
#define OB_nBOOT0_SET OB_NBOOT0_SET
566566
#endif /* STM32U0 */
567+
#if defined(STM32H5)
568+
#define FLASH_ECC_AREA_EDATA FLASH_ECC_AREA_EDATA_BANK1
569+
#endif /* STM32H5 */
567570

568571
/**
569572
* @}
@@ -3698,10 +3701,8 @@ extern "C" {
36983701
#define RCC_SYSCLKSOURCE_STATUS_PLLR RCC_SYSCLKSOURCE_STATUS_PLLCLK
36993702
#endif
37003703

3701-
37023704
#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \
3703-
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || \
3704-
defined(STM32U0)
3705+
defined(STM32WL) || defined(STM32C0) || defined(STM32N6) || defined(STM32H7RS) || defined(STM32U0)
37053706
#define RCC_RTCCLKSOURCE_NO_CLK RCC_RTCCLKSOURCE_NONE
37063707
#else
37073708
#define RCC_RTCCLKSOURCE_NONE RCC_RTCCLKSOURCE_NO_CLK
@@ -3952,7 +3953,7 @@ extern "C" {
39523953
*/
39533954
#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \
39543955
defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \
3955-
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || \
3956+
defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32N6) || defined (STM32H7RS) || \
39563957
defined (STM32U0) || defined (STM32U3)
39573958
#else
39583959
#define __HAL_RTC_CLEAR_FLAG __HAL_RTC_EXTI_CLEAR_FLAG

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_lptim.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -441,6 +441,7 @@ typedef void (*pLPTIM_CallbackTypeDef)(LPTIM_HandleTypeDef *hlptim); /*!< poin
441441
* @brief Write the passed parameter in the Autoreload register.
442442
* @param __HANDLE__ LPTIM handle
443443
* @param __VALUE__ Autoreload value
444+
* This parameter must be a value between Min_Data = 0x0001 and Max_Data = 0xFFFF.
444445
* @retval None
445446
* @note The ARR register can only be modified when the LPTIM instance is enabled.
446447
*/
@@ -763,9 +764,6 @@ HAL_LPTIM_StateTypeDef HAL_LPTIM_GetState(const LPTIM_HandleTypeDef *hlptim);
763764
#define IS_LPTIM_COUNTER_SOURCE(__SOURCE__) (((__SOURCE__) == LPTIM_COUNTERSOURCE_INTERNAL) || \
764765
((__SOURCE__) == LPTIM_COUNTERSOURCE_EXTERNAL))
765766

766-
#define IS_LPTIM_AUTORELOAD(__AUTORELOAD__) ((0x00000001UL <= (__AUTORELOAD__)) &&\
767-
((__AUTORELOAD__) <= 0x0000FFFFUL))
768-
769767
#define IS_LPTIM_COMPARE(__COMPARE__) ((__COMPARE__) <= 0x0000FFFFUL)
770768

771769
#define IS_LPTIM_PERIOD(__PERIOD__) ((0x00000001UL <= (__PERIOD__)) &&\

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_hal_smartcard.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -721,13 +721,13 @@ typedef enum
721721
*/
722722
#define __HAL_SMARTCARD_DISABLE_IT(__HANDLE__, __INTERRUPT__) (((((__INTERRUPT__) & SMARTCARD_CR_MASK) >>\
723723
SMARTCARD_CR_POS) == 1U)?\
724-
((__HANDLE__)->Instance->CR1 &= ~ (1U <<\
724+
((__HANDLE__)->Instance->CR1 &= ~ (1UL <<\
725725
((__INTERRUPT__) & SMARTCARD_IT_MASK))): \
726726
((((__INTERRUPT__) & SMARTCARD_CR_MASK) >>\
727727
SMARTCARD_CR_POS) == 2U)?\
728-
((__HANDLE__)->Instance->CR2 &= ~ (1U <<\
728+
((__HANDLE__)->Instance->CR2 &= ~ (1UL <<\
729729
((__INTERRUPT__) & SMARTCARD_IT_MASK))): \
730-
((__HANDLE__)->Instance->CR3 &= ~ (1U <<\
730+
((__HANDLE__)->Instance->CR3 &= ~ (1UL <<\
731731
((__INTERRUPT__) & SMARTCARD_IT_MASK))))
732732

733733
/** @brief Check whether the specified SmartCard interrupt has occurred or not.

‎system/Drivers/STM32WBxx_HAL_Driver/Inc/stm32wbxx_ll_iwdg.h‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ __STATIC_INLINE void LL_IWDG_SetPrescaler(IWDG_TypeDef *IWDGx, uint32_t Prescale
208208
* @arg @ref LL_IWDG_PRESCALER_128
209209
* @arg @ref LL_IWDG_PRESCALER_256
210210
*/
211-
__STATIC_INLINE uint32_t LL_IWDG_GetPrescaler(IWDG_TypeDef *IWDGx)
211+
__STATIC_INLINE uint32_t LL_IWDG_GetPrescaler(const IWDG_TypeDef *IWDGx)
212212
{
213213
return (READ_REG(IWDGx->PR));
214214
}
@@ -231,7 +231,7 @@ __STATIC_INLINE void LL_IWDG_SetReloadCounter(IWDG_TypeDef *IWDGx, uint32_t Coun
231231
* @param IWDGx IWDG Instance
232232
* @retval Value between Min_Data=0 and Max_Data=0x0FFF
233233
*/
234-
__STATIC_INLINE uint32_t LL_IWDG_GetReloadCounter(IWDG_TypeDef *IWDGx)
234+
__STATIC_INLINE uint32_t LL_IWDG_GetReloadCounter(const IWDG_TypeDef *IWDGx)
235235
{
236236
return (READ_REG(IWDGx->RLR));
237237
}
@@ -254,7 +254,7 @@ __STATIC_INLINE void LL_IWDG_SetWindow(IWDG_TypeDef *IWDGx, uint32_t Window)
254254
* @param IWDGx IWDG Instance
255255
* @retval Value between Min_Data=0 and Max_Data=0x0FFF
256256
*/
257-
__STATIC_INLINE uint32_t LL_IWDG_GetWindow(IWDG_TypeDef *IWDGx)
257+
__STATIC_INLINE uint32_t LL_IWDG_GetWindow(const IWDG_TypeDef *IWDGx)
258258
{
259259
return (READ_REG(IWDGx->WINR));
260260
}
@@ -273,7 +273,7 @@ __STATIC_INLINE uint32_t LL_IWDG_GetWindow(IWDG_TypeDef *IWDGx)
273273
* @param IWDGx IWDG Instance
274274
* @retval State of bit (1 or 0).
275275
*/
276-
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_PVU(IWDG_TypeDef *IWDGx)
276+
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_PVU(const IWDG_TypeDef *IWDGx)
277277
{
278278
return ((READ_BIT(IWDGx->SR, IWDG_SR_PVU) == (IWDG_SR_PVU)) ? 1UL : 0UL);
279279
}
@@ -284,7 +284,7 @@ __STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_PVU(IWDG_TypeDef *IWDGx)
284284
* @param IWDGx IWDG Instance
285285
* @retval State of bit (1 or 0).
286286
*/
287-
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_RVU(IWDG_TypeDef *IWDGx)
287+
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_RVU(const IWDG_TypeDef *IWDGx)
288288
{
289289
return ((READ_BIT(IWDGx->SR, IWDG_SR_RVU) == (IWDG_SR_RVU)) ? 1UL : 0UL);
290290
}
@@ -295,7 +295,7 @@ __STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_RVU(IWDG_TypeDef *IWDGx)
295295
* @param IWDGx IWDG Instance
296296
* @retval State of bit (1 or 0).
297297
*/
298-
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_WVU(IWDG_TypeDef *IWDGx)
298+
__STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_WVU(const IWDG_TypeDef *IWDGx)
299299
{
300300
return ((READ_BIT(IWDGx->SR, IWDG_SR_WVU) == (IWDG_SR_WVU)) ? 1UL : 0UL);
301301
}
@@ -308,7 +308,7 @@ __STATIC_INLINE uint32_t LL_IWDG_IsActiveFlag_WVU(IWDG_TypeDef *IWDGx)
308308
* @param IWDGx IWDG Instance
309309
* @retval State of bits (1 or 0).
310310
*/
311-
__STATIC_INLINE uint32_t LL_IWDG_IsReady(IWDG_TypeDef *IWDGx)
311+
__STATIC_INLINE uint32_t LL_IWDG_IsReady(const IWDG_TypeDef *IWDGx)
312312
{
313313
return ((READ_BIT(IWDGx->SR, IWDG_SR_PVU | IWDG_SR_RVU | IWDG_SR_WVU) == 0U) ? 1UL : 0UL);
314314
}

0 commit comments

Comments
 (0)