Skip to content

Commit 296707d

Browse files
authored
Merge pull request #1345 from fpistm/updateWB
Update STM32WB HAL and CMSIS drivers
2 parents d8f88bd + 8c7668d commit 296707d

File tree

82 files changed

+26127
-1334
lines changed

Some content is hidden

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

82 files changed

+26127
-1334
lines changed

cores/arduino/stm32/stm32_def_build.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -394,6 +394,10 @@
394394
#define CMSIS_STARTUP_FILE "startup_stm32mp157cxx_cm4.s"
395395
#elif defined(STM32MP15xx)
396396
#define CMSIS_STARTUP_FILE "startup_stm32mp15xx.s"
397+
#elif defined(STM32WB10xx)
398+
#define CMSIS_STARTUP_FILE "startup_stm32wb10xx_cm4.s"
399+
#elif defined(STM32WB15xx)
400+
#define CMSIS_STARTUP_FILE "startup_stm32wb15xx_cm4.s"
397401
#elif defined(STM32WB30xx)
398402
#define CMSIS_STARTUP_FILE "startup_stm32wb30xx_cm4.s"
399403
#elif defined(STM32WB35xx)

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

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

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

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

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1818
* All rights reserved.</center></h2>
1919
*
20-
* This software component is licensed by ST under BSD 3-Clause license,
20+
* This software component is licensed by ST under Apache License, Version 2.0,
2121
* the "License"; You may not use this file except in compliance with the
2222
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/BSD-3-Clause
23+
* opensource.org/licenses/Apache-2.0
2424
*
2525
******************************************************************************
2626
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1818
* All rights reserved.</center></h2>
1919
*
20-
* This software component is licensed by ST under BSD 3-Clause license,
20+
* This software component is licensed by ST under Apache License, Version 2.0,
2121
* the "License"; You may not use this file except in compliance with the
2222
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/BSD-3-Clause
23+
* opensource.org/licenses/Apache-2.0
2424
*
2525
******************************************************************************
2626
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1818
* All rights reserved.</center></h2>
1919
*
20-
* This software component is licensed by ST under BSD 3-Clause license,
20+
* This software component is licensed by ST under Apache License, Version 2.0,
2121
* the "License"; You may not use this file except in compliance with the
2222
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/BSD-3-Clause
23+
* opensource.org/licenses/Apache-2.0
2424
*
2525
******************************************************************************
2626
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1818
* All rights reserved.</center></h2>
1919
*
20-
* This software component is licensed by ST under BSD 3-Clause license,
20+
* This software component is licensed by ST under Apache License, Version 2.0,
2121
* the "License"; You may not use this file except in compliance with the
2222
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/BSD-3-Clause
23+
* opensource.org/licenses/Apache-2.0
2424
*
2525
******************************************************************************
2626
*/

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@
1717
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1818
* All rights reserved.</center></h2>
1919
*
20-
* This software component is licensed by ST under BSD 3-Clause license,
20+
* This software component is licensed by ST under Apache License, Version 2.0,
2121
* the "License"; You may not use this file except in compliance with the
2222
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/BSD-3-Clause
23+
* opensource.org/licenses/Apache-2.0
2424
*
2525
******************************************************************************
2626
*/

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@
1919
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
2020
* All rights reserved.</center></h2>
2121
*
22-
* This software component is licensed by ST under BSD 3-Clause license,
22+
* This software component is licensed by ST under Apache License, Version 2.0,
2323
* the "License"; You may not use this file except in compliance with the
2424
* License. You may obtain a copy of the License at:
25-
* opensource.org/licenses/BSD-3-Clause
25+
* opensource.org/licenses/Apache-2.0
2626
*
2727
******************************************************************************
2828
*/
@@ -69,7 +69,7 @@
6969
* @brief CMSIS Device version number
7070
*/
7171
#define __STM32WBxx_CMSIS_VERSION_MAIN (0x01U) /*!< [31:24] main version */
72-
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x07U) /*!< [23:16] sub1 version */
72+
#define __STM32WBxx_CMSIS_VERSION_SUB1 (0x08U) /*!< [23:16] sub1 version */
7373
#define __STM32WBxx_CMSIS_VERSION_SUB2 (0x00U) /*!< [15:8] sub2 version */
7474
#define __STM32WBxx_CMSIS_VERSION_RC (0x00U) /*!< [7:0] release candidate */
7575
#define __STM32WBxx_CMSIS_DEVICE_VERSION ((__STM32WBxx_CMSIS_VERSION_MAIN << 24)\
@@ -95,6 +95,10 @@
9595
#include "stm32wb35xx.h"
9696
#elif defined(STM32WB30xx)
9797
#include "stm32wb30xx.h"
98+
#elif defined(STM32WB15xx)
99+
#include "stm32wb15xx.h"
100+
#elif defined(STM32WB10xx)
101+
#include "stm32wb10xx.h"
98102
#else
99103
#error "Please select first the target STM32WBxx device used in your application, for instance xxx (in stm32wbxx.h file)"
100104
#endif

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@
99
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
1010
* All rights reserved.</center></h2>
1111
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
12+
* This software component is licensed by ST under Apache License, Version 2.0,
1313
* the "License"; You may not use this file except in compliance with the
1414
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
15+
* opensource.org/licenses/Apache-2.0
1616
*
1717
******************************************************************************
1818
*/
@@ -64,7 +64,7 @@ extern const uint32_t AHBPrescTable[16]; /*!< AHB prescalers table values */
6464
extern const uint32_t APBPrescTable[8]; /*!< APB prescalers table values */
6565
extern const uint32_t MSIRangeTable[16]; /*!< MSI ranges table values */
6666

67-
#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx)
67+
#if defined(STM32WB55xx) || defined(STM32WB5Mxx) || defined(STM32WB35xx) || defined (STM32WB15xx) || defined (STM32WB10xx)
6868
extern const uint32_t SmpsPrescalerTable[4][6]; /*!< SMPS factor ranges table values */
6969
#endif
7070
/**

0 commit comments

Comments
 (0)