Skip to content

system(wb) update STM32WBxx HAL Drivers to v1.11.0 and CMSIS Drivers to v1.11.0 #1843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Oct 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions cores/arduino/stm32/stm32_def_build.h
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,8 @@
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
#elif defined(STM32WB15xx)
#define CMSIS_STARTUP_FILE "startup_stm32wb15xx_cm4.s"
#elif defined(STM32WB1Mxx)
#define CMSIS_STARTUP_FILE "startup_stm32wb1mxx_cm4.s"
#elif defined(STM32WB30xx)
#define CMSIS_STARTUP_FILE "startup_stm32wb30xx_cm4.s"
#elif defined(STM32WB35xx)
Expand Down
132 changes: 66 additions & 66 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h

Large diffs are not rendered by default.

130 changes: 65 additions & 65 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h

Large diffs are not rendered by default.

11,029 changes: 11,029 additions & 0 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb1mxx.h

Large diffs are not rendered by default.

156 changes: 78 additions & 78 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h

Large diffs are not rendered by default.

160 changes: 80 additions & 80 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h

Large diffs are not rendered by default.

5,840 changes: 2,920 additions & 2,920 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h

Large diffs are not rendered by default.

7,208 changes: 3,604 additions & 3,604 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h

Large diffs are not rendered by default.

160 changes: 80 additions & 80 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h

Large diffs are not rendered by default.

30 changes: 16 additions & 14 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
#define __STM32WBxx_H

#ifdef __cplusplus
extern "C" {
extern "C" {
#endif /* __cplusplus */

/** @addtogroup Library_configuration_section
Expand All @@ -57,19 +57,19 @@
*/
#if !defined (USE_HAL_DRIVER)
/**
* @brief Comment the line below if you will not use the peripherals drivers.
* @brief Comment the line below if you will not use the peripherals drivers.
In this case, these drivers will not be included and the application code will
be based on direct access to peripherals registers
*/
/*#define USE_HAL_DRIVER */
/*#define USE_HAL_DRIVER */
#endif /* USE_HAL_DRIVER */

/**
* @brief CMSIS Device version number
*/
#define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0AU) /*!< [23:16] sub1 version */
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0BU) /*!< [23:16] sub1 version */
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
#define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
#define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\
|(__STM32WBxx_CMSIS_VERSION_SUB1 << 16)\
Expand All @@ -85,21 +85,23 @@
*/

#if defined(STM32WB55xx)
#include "stm32wb55xx.h"
#include "stm32wb55xx.h"
#elif defined(STM32WB5Mxx)
#include "stm32wb5mxx.h"
#include "stm32wb5mxx.h"
#elif defined(STM32WB50xx)
#include "stm32wb50xx.h"
#include "stm32wb50xx.h"
#elif defined(STM32WB35xx)
#include "stm32wb35xx.h"
#include "stm32wb35xx.h"
#elif defined(STM32WB30xx)
#include "stm32wb30xx.h"
#include "stm32wb30xx.h"
#elif defined(STM32WB15xx)
#include "stm32wb15xx.h"
#include "stm32wb15xx.h"
#elif defined(STM32WB10xx)
#include "stm32wb10xx.h"
#include "stm32wb10xx.h"
#elif defined(STM32WB1Mxx)
#include "stm32wb1mxx.h"
#else
#error "Please select first the target STM32WBxx device used in your application, for instance xxx (in stm32wbxx.h file)"
#error "Please select first the target STM32WBxx device used in your application, for instance xxx (in stm32wbxx.h file)"
#endif
/**
* @}
Expand Down Expand Up @@ -211,7 +213,7 @@ typedef enum
*/

#if defined (USE_HAL_DRIVER)
#include "stm32wbxx_hal.h"
#include "stm32wbxx_hal.h"
#endif /* USE_HAL_DRIVER */

#ifdef __cplusplus
Expand Down
32 changes: 16 additions & 16 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/system_stm32wbxx.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
******************************************************************************
* @file system_stm32wbxx.h
* @author MCD Application Team
* @brief CMSIS Cortex Device System Source File for STM32WBxx devices.
* @brief CMSIS Cortex Device System Source File for STM32WBxx devices.
******************************************************************************
* @attention
*
Expand All @@ -22,17 +22,17 @@

/** @addtogroup stm32wbxx_system
* @{
*/
*/

/**
* @brief Define to prevent recursive inclusion
*/
#ifndef __SYSTEM_STM32WBXX_H
#define __SYSTEM_STM32WBXX_H

#ifdef __cplusplus
extern "C" {
#endif
extern "C" {
#endif

#include <stdint.h>

Expand All @@ -48,22 +48,22 @@
/** @addtogroup STM32WBxx_System_Exported_types
* @{
*/
/* The SystemCoreClock variable is updated in three ways:
1) by calling CMSIS function SystemCoreClockUpdate()
2) by calling HAL API function HAL_RCC_GetSysClockFreq()
3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
Note: If you use this function to configure the system clock; then there
is no need to call the 2 first functions listed above, since SystemCoreClock
variable is updated automatically.
*/
/* The SystemCoreClock variable is updated in three ways:
1) by calling CMSIS function SystemCoreClockUpdate()
2) by calling HAL API function HAL_RCC_GetSysClockFreq()
3) each time HAL_RCC_ClockConfig() is called to configure the system clock frequency
Note: If you use this function to configure the system clock; then there
is no need to call the 2 first functions listed above, since SystemCoreClock
variable is updated automatically.
*/

extern uint32_t SystemCoreClock; /*!< System Clock Frequency */

extern const uint32_t AHBPrescTable[16]; /*!< AHB prescalers table values */
extern const uint32_t APBPrescTable[8]; /*!< APB prescalers table values */
extern const uint32_t MSIRangeTable[16]; /*!< MSI ranges table values */

#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx)
#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB1Mxx)
extern const uint32_t SmpsPrescalerTable[4][6]; /*!< SMPS factor ranges table values */
#endif
/**
Expand All @@ -89,7 +89,7 @@ extern const uint32_t SmpsPrescalerTable[4][6]; /*!< SMPS factor ranges table v
/** @addtogroup STM32WBxx_System_Exported_Functions
* @{
*/

extern void SystemInit(void);
extern void SystemCoreClockUpdate(void);
/**
Expand All @@ -105,7 +105,7 @@ extern void SystemCoreClockUpdate(void);
/**
* @}
*/

/**
* @}
*/
16 changes: 1 addition & 15 deletions system/Drivers/CMSIS/Device/ST/STM32WBxx/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,7 @@ Details about the content of this release are available in the release note [her

## Compatibility information

In this table, you can find the successive versions of this CMSIS Device component, in-line with the corresponding versions of the full MCU package:

CMSIS Device WB | CMSIS Core | Was delivered in the full MCU package
--------------- | ---------- | -------------------------------------
Tag v1.0.0 | Tag v4.5_cm4 | Tag v1.0.0
Tag v1.1.0 | Tag v4.5_cm4 | Tag v1.1.0
Tag v1.2.0 | Tag v5.4.0_cm4 | Tag v1.2.0
Tag v1.3.0 | Tag v5.4.0_cm4 | Tag v1.3.0
Tag v1.4.0 | Tag v5.4.0_cm4 | Tag v1.5.0
Tag v1.5.0 | Tag v5.4.0_cm4 | Tag v1.8.0
Tag v1.7.0 | Tag v5.6.0_cm4 | Tag v1.10.0
Tag v1.8.0 | Tag v5.6.0_cm4 | Tag v1.11.0
Tag v1.9.0 | Tag v5.6.0_cm4 | Tag v1.12.0
Tag v1.10.0 | Tag v5.6.0_cm4 | Tag v1.13.0
Tag v1.10.1 | Tag v5.6.0_cm4 | Tag v1.13.3
It is **crucial** that you use a consistent set of versions for the CMSIS Core - CMSIS Device, as mentioned in [this](https://htmlpreview.github.io/?https://github.com/STMicroelectronics/STM32CubeWB/blob/master/Release_Notes.html) release note.

The full **STM32CubeWB** MCU package is available [here](https://github.com/STMicroelectronics/STM32CubeWB).

Expand Down
Loading