Commit 223d8e37 authored by Alessandro Manganaro's avatar Alessandro Manganaro Committed by Erwan Gouriou
Browse files

stm32cube: update stm32wba to cube version V1.3.1 

Update Cube version for STM32WBAxx series
on https://github.com/STMicroelectronics
from version v1.2.0
to version v1.3.1

Signed-off-by: default avatarAlessandro Manganaro <alessandro.manganaro@st.com>
parent 54724a81

stm32cube/stm32wbaxx/README

+2 −2
Changes for stm32cube/stm32wbaxx/README: 2 added lines, 2 removed lines.
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ Origin: 
   http://www.st.com/en/embedded-software/stm32cubewba.html



Status:

   version v1.2.0

   version v1.3.1



Purpose:

   ST Microelectronics official MCU package for STM32WBA series.
@@ -23,7 +23,7 @@ URL: 
   https://github.com/STMicroelectronics/STM32CubeWBA



Commit:

   b489561c58eed1d7ef434fe31c1bd279aa1451d7

   8d1d0ffef7a3a25d8ee8f589a614bc5da65c9300



Maintained-by:

   External

stm32cube/stm32wbaxx/drivers/include/Legacy/stm32_hal_legacy.h

+28 −9
Changes for stm32cube/stm32wbaxx/drivers/include/Legacy/stm32_hal_legacy.h: 28 added lines, 9 removed lines.
Original line number Diff line number Diff line
@@ -548,6 +548,16 @@ extern "C" { 
#define OB_SRAM134_RST_ERASE          OB_SRAM_RST_ERASE

#define OB_SRAM134_RST_NOT_ERASE      OB_SRAM_RST_NOT_ERASE

#endif /* STM32U5 */

#if defined(STM32U0)

#define OB_USER_nRST_STOP             OB_USER_NRST_STOP

#define OB_USER_nRST_STDBY            OB_USER_NRST_STDBY

#define OB_USER_nRST_SHDW             OB_USER_NRST_SHDW

#define OB_USER_nBOOT_SEL             OB_USER_NBOOT_SEL

#define OB_USER_nBOOT0                OB_USER_NBOOT0

#define OB_USER_nBOOT1                OB_USER_NBOOT1

#define OB_nBOOT0_RESET               OB_NBOOT0_RESET

#define OB_nBOOT0_SET                 OB_NBOOT0_SET

#endif /* STM32U0 */



/**

  * @}
@@ -1239,10 +1249,10 @@ extern "C" { 
#define RTC_TAMPERPIN_PA0  RTC_TAMPERPIN_POS1

#define RTC_TAMPERPIN_PI8  RTC_TAMPERPIN_POS1



#if defined(STM32H5)

#if defined(STM32H5) || defined(STM32H7RS)

#define TAMP_SECRETDEVICE_ERASE_NONE        TAMP_DEVICESECRETS_ERASE_NONE

#define TAMP_SECRETDEVICE_ERASE_BKP_SRAM    TAMP_DEVICESECRETS_ERASE_BKPSRAM

#endif /* STM32H5 */

#endif /* STM32H5 || STM32H7RS */



#if defined(STM32WBA)

#define TAMP_SECRETDEVICE_ERASE_NONE            TAMP_DEVICESECRETS_ERASE_NONE
@@ -1254,10 +1264,10 @@ extern "C" { 
#define TAMP_SECRETDEVICE_ERASE_ALL             TAMP_DEVICESECRETS_ERASE_ALL

#endif /* STM32WBA */



#if defined(STM32H5) || defined(STM32WBA)

#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)

#define TAMP_SECRETDEVICE_ERASE_DISABLE     TAMP_DEVICESECRETS_ERASE_NONE

#define TAMP_SECRETDEVICE_ERASE_ENABLE      TAMP_SECRETDEVICE_ERASE_ALL

#endif /* STM32H5 || STM32WBA */

#endif /* STM32H5 || STM32WBA || STM32H7RS */



#if defined(STM32F7)

#define RTC_TAMPCR_TAMPXE          RTC_TAMPER_ENABLE_BITS_MASK
@@ -1595,7 +1605,7 @@ extern "C" { 
#define ETH_MAC_SMALL_FIFO_RW_ACTIVE          0x00000006U  /* MAC small FIFO read / write controllers active */

#define ETH_MAC_MII_RECEIVE_PROTOCOL_ACTIVE   0x00000001U  /* MAC MII receive protocol engine active */



#define ETH_TxPacketConfig                    ETH_TxPacketConfig_t  /* Transmit Packet Configuration structure definition */

#define ETH_TxPacketConfig        ETH_TxPacketConfigTypeDef   /* Transmit Packet Configuration structure definition */



/**

  * @}
@@ -1989,12 +1999,12 @@ extern "C" { 
/** @defgroup HAL_RTC_Aliased_Functions HAL RTC Aliased Functions maintained for legacy purpose

  * @{

  */

#if defined(STM32H5) || defined(STM32WBA)

#if defined(STM32H5) || defined(STM32WBA) || defined(STM32H7RS)

#define HAL_RTCEx_SetBoothardwareKey            HAL_RTCEx_LockBootHardwareKey

#define HAL_RTCEx_BKUPBlock_Enable              HAL_RTCEx_BKUPBlock

#define HAL_RTCEx_BKUPBlock_Disable             HAL_RTCEx_BKUPUnblock

#define HAL_RTCEx_Erase_SecretDev_Conf          HAL_RTCEx_ConfigEraseDeviceSecrets

#endif /* STM32H5 || STM32WBA */

#endif /* STM32H5 || STM32WBA || STM32H7RS */



/**

  * @}
@@ -3644,8 +3654,12 @@ extern "C" { 
#define RCC_MCOSOURCE_PLLCLK_NODIV  RCC_MCO1SOURCE_PLLCLK

#define RCC_MCOSOURCE_PLLCLK_DIV2   RCC_MCO1SOURCE_PLLCLK_DIV2



#if defined(STM32U0)

#define RCC_SYSCLKSOURCE_STATUS_PLLR   RCC_SYSCLKSOURCE_STATUS_PLLCLK

#endif



#if defined(STM32L4) || defined(STM32WB) || defined(STM32G0) || defined(STM32G4) || defined(STM32L5) || \

    defined(STM32WL) || defined(STM32C0)

    defined(STM32WL) || defined(STM32C0) || defined(STM32H7RS) || defined(STM32U0)

#define RCC_RTCCLKSOURCE_NO_CLK     RCC_RTCCLKSOURCE_NONE

#else

#define RCC_RTCCLKSOURCE_NONE       RCC_RTCCLKSOURCE_NO_CLK
@@ -3747,8 +3761,10 @@ extern "C" { 
#define __HAL_RCC_GET_DFSDM_SOURCE  __HAL_RCC_GET_DFSDM1_SOURCE

#define RCC_DFSDM1CLKSOURCE_PCLK    RCC_DFSDM1CLKSOURCE_PCLK2

#define RCC_SWPMI1CLKSOURCE_PCLK    RCC_SWPMI1CLKSOURCE_PCLK1

#if !defined(STM32U0)

#define RCC_LPTIM1CLKSOURCE_PCLK    RCC_LPTIM1CLKSOURCE_PCLK1

#define RCC_LPTIM2CLKSOURCE_PCLK    RCC_LPTIM2CLKSOURCE_PCLK1

#endif



#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB1    RCC_DFSDM1AUDIOCLKSOURCE_I2S1

#define RCC_DFSDM1AUDIOCLKSOURCE_I2SAPB2    RCC_DFSDM1AUDIOCLKSOURCE_I2S2
@@ -3894,7 +3910,7 @@ extern "C" { 
  */

#if defined (STM32G0) || defined (STM32L5) || defined (STM32L412xx) || defined (STM32L422xx) || \

    defined (STM32L4P5xx)|| defined (STM32L4Q5xx) || defined (STM32G4) || defined (STM32WL) || defined (STM32U5) || \

    defined (STM32WBA) || defined (STM32H5) || defined (STM32C0)

    defined (STM32WBA) || defined (STM32H5) || defined (STM32C0) || defined (STM32H7RS) ||  defined (STM32U0)

#else

#define __HAL_RTC_CLEAR_FLAG                      __HAL_RTC_EXTI_CLEAR_FLAG

#endif
@@ -4217,6 +4233,9 @@ extern "C" { 
#define __HAL_TIM_GetCompare            __HAL_TIM_GET_COMPARE



#define TIM_BREAKINPUTSOURCE_DFSDM  TIM_BREAKINPUTSOURCE_DFSDM1



#define TIM_OCMODE_ASSYMETRIC_PWM1      TIM_OCMODE_ASYMMETRIC_PWM1

#define TIM_OCMODE_ASSYMETRIC_PWM2      TIM_OCMODE_ASYMMETRIC_PWM2

/**

  * @}

  */

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h

+1 −12
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal.h: 1 added line, 12 removed lines.
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ extern HAL_TickFreqTypeDef uwTickFreq; 
  * @brief STM32WBAxx HAL Driver version number

  */

#define __STM32WBAxx_HAL_VERSION_MAIN   (0x01U) /*!< [31:24] main version */

#define __STM32WBAxx_HAL_VERSION_SUB1   (0x02U) /*!< [23:16] sub1 version */

#define __STM32WBAxx_HAL_VERSION_SUB1   (0x03U) /*!< [23:16] sub1 version */

#define __STM32WBAxx_HAL_VERSION_SUB2   (0x00U) /*!< [15:8]  sub2 version */

#define __STM32WBAxx_HAL_VERSION_RC     (0x00U) /*!< [7:0]  release candidate */

#define __STM32WBAxx_HAL_VERSION    ((__STM32WBAxx_HAL_VERSION_MAIN << 24U)\
@@ -423,15 +423,6 @@ extern HAL_TickFreqTypeDef uwTickFreq; 
  * @}

  */



/** @defgroup HAL_Private_Macros HAL Private Macros

  * @{

  */

#define IS_TICKFREQ(FREQ) (((FREQ) == HAL_TICK_FREQ_10HZ)  || \

                           ((FREQ) == HAL_TICK_FREQ_100HZ) || \

                           ((FREQ) == HAL_TICK_FREQ_1KHZ))

/**

  * @}

  */

/* Exported functions --------------------------------------------------------*/



/** @addtogroup HAL_Exported_Functions
@@ -516,7 +507,6 @@ HAL_StatusTypeDef HAL_SYSCFG_GetLock(uint32_t *pItem); 
  * @}

  */





/** @addtogroup HAL_Exported_Functions_Group6

  * @{

  */
@@ -550,4 +540,3 @@ HAL_StatusTypeDef HAL_SYSCFG_GetConfigAttributes(uint32_t Item, uint32_t *pAttri 
#endif



#endif /* __STM32WBAxx_HAL_H */

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h

+4 −0
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_cortex.h: 4 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -282,11 +282,15 @@ void HAL_SYSTICK_Callback(void); 


void HAL_MPU_Enable(uint32_t MPU_Control);

void HAL_MPU_Disable(void);

void HAL_MPU_EnableRegion(uint32_t RegionNumber);

void HAL_MPU_DisableRegion(uint32_t RegionNumber);

void HAL_MPU_ConfigRegion(MPU_Region_InitTypeDef *MPU_RegionInit);

void HAL_MPU_ConfigMemoryAttributes(MPU_Attributes_InitTypeDef *MPU_AttributesInit);

#ifdef MPU_NS

void HAL_MPU_Enable_NS(uint32_t MPU_Control);

void HAL_MPU_Disable_NS(void);

void HAL_MPU_EnableRegion_NS(uint32_t RegionNumber);

void HAL_MPU_DisableRegion_NS(uint32_t RegionNumber);

void HAL_MPU_ConfigRegion_NS(MPU_Region_InitTypeDef *MPU_RegionInit);

void HAL_MPU_ConfigMemoryAttributes_NS(MPU_Attributes_InitTypeDef *MPU_AttributesInit);

#endif /* MPU_NS */

stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_flash.h

+1 −1
Changes for stm32cube/stm32wbaxx/drivers/include/stm32wbaxx_hal_flash.h: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -1017,7 +1017,7 @@ HAL_StatusTypeDef FLASH_WaitForLastOperation(uint32_t Timeout); 
#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U)

#define IS_OB_BOOT_LOCK(VALUE)             (((VALUE) == OB_BOOT_LOCK_DISABLE) || ((VALUE) == OB_BOOT_LOCK_ENABLE))



#define IS_OB_WMSEC_CONFIG(CFG)            ((((CFG) & 0x7F1U) != 0U) && (((CFG) & 0x1U) != 0U) && (((CFG) & 0xFFFFF80EU) == 0U))

#define IS_OB_WMSEC_CONFIG(CFG)            ((((CFG) & 0x1B4U) != 0U) && (((CFG) & 0x4U) != 0U) && (((CFG) & 0xFFFFFE4BU) == 0U))



#define IS_OB_WMSEC_AREA_EXCLUSIVE(WMSEC)  (((WMSEC) & OB_WMSEC_AREA1) != 0U)

#endif /* __ARM_FEATURE_CMSE */

CRA Git | Maintained and supported by SUSTech CRA and CCSE