Skip to content

Commit 1ef5348

Browse files
authored
Merge pull request #1843 from ABOSTM/WB_CUBE_UPDATE_1_14_1
system(wb) update STM32WBxx HAL Drivers to v1.11.0 and CMSIS Drivers to v1.11.0
2 parents 1bd9c9d + 2fd2170 commit 1ef5348

File tree

88 files changed

+22187
-9708
lines changed

Some content is hidden

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

88 files changed

+22187
-9708
lines changed

cores/arduino/stm32/stm32_def_build.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -426,6 +426,8 @@
426426
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
427427
#elif defined(STM32WB15xx)
428428
#define CMSIS_STARTUP_FILE "startup_stm32wb15xx_cm4.s"
429+
#elif defined(STM32WB1Mxx)
430+
#define CMSIS_STARTUP_FILE "startup_stm32wb1mxx_cm4.s"
429431
#elif defined(STM32WB30xx)
430432
#define CMSIS_STARTUP_FILE "startup_stm32wb30xx_cm4.s"
431433
#elif defined(STM32WB35xx)

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb10xx.h

Lines changed: 66 additions & 66 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb15xx.h

Lines changed: 65 additions & 65 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb1mxx.h

Lines changed: 11029 additions & 0 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb30xx.h

Lines changed: 78 additions & 78 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb35xx.h

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb50xx.h

Lines changed: 2920 additions & 2920 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb55xx.h

Lines changed: 3604 additions & 3604 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wb5mxx.h

Lines changed: 80 additions & 80 deletions
Large diffs are not rendered by default.

system/Drivers/CMSIS/Device/ST/STM32WBxx/Include/stm32wbxx.h

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
#define __STM32WBxx_H
3939

4040
#ifdef __cplusplus
41-
extern "C" {
41+
extern "C" {
4242
#endif /* __cplusplus */
4343

4444
/** @addtogroup Library_configuration_section
@@ -57,19 +57,19 @@
5757
*/
5858
#if !defined (USE_HAL_DRIVER)
5959
/**
60-
* @brief Comment the line below if you will not use the peripherals drivers.
60+
* @brief Comment the line below if you will not use the peripherals drivers.
6161
In this case, these drivers will not be included and the application code will
6262
be based on direct access to peripherals registers
6363
*/
64-
/*#define USE_HAL_DRIVER */
64+
/*#define USE_HAL_DRIVER */
6565
#endif /* USE_HAL_DRIVER */
6666

6767
/**
6868
* @brief CMSIS Device version number
6969
*/
7070
#define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
71-
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0AU) /*!< [23:16] sub1 version */
72-
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x01U) /*!< [15:8] sub2 version */
71+
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x0BU) /*!< [23:16] sub1 version */
72+
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
7373
#define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
7474
#define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\
7575
|(__STM32WBxx_CMSIS_VERSION_SUB1 << 16)\
@@ -85,21 +85,23 @@
8585
*/
8686

8787
#if defined(STM32WB55xx)
88-
#include "stm32wb55xx.h"
88+
#include "stm32wb55xx.h"
8989
#elif defined(STM32WB5Mxx)
90-
#include "stm32wb5mxx.h"
90+
#include "stm32wb5mxx.h"
9191
#elif defined(STM32WB50xx)
92-
#include "stm32wb50xx.h"
92+
#include "stm32wb50xx.h"
9393
#elif defined(STM32WB35xx)
94-
#include "stm32wb35xx.h"
94+
#include "stm32wb35xx.h"
9595
#elif defined(STM32WB30xx)
96-
#include "stm32wb30xx.h"
96+
#include "stm32wb30xx.h"
9797
#elif defined(STM32WB15xx)
98-
#include "stm32wb15xx.h"
98+
#include "stm32wb15xx.h"
9999
#elif defined(STM32WB10xx)
100-
#include "stm32wb10xx.h"
100+
#include "stm32wb10xx.h"
101+
#elif defined(STM32WB1Mxx)
102+
#include "stm32wb1mxx.h"
101103
#else
102-
#error "Please select first the target STM32WBxx device used in your application, for instance xxx (in stm32wbxx.h file)"
104+
#error "Please select first the target STM32WBxx device used in your application, for instance xxx (in stm32wbxx.h file)"
103105
#endif
104106
/**
105107
* @}
@@ -211,7 +213,7 @@ typedef enum
211213
*/
212214

213215
#if defined (USE_HAL_DRIVER)
214-
#include "stm32wbxx_hal.h"
216+
#include "stm32wbxx_hal.h"
215217
#endif /* USE_HAL_DRIVER */
216218

217219
#ifdef __cplusplus

0 commit comments

Comments
 (0)