Skip to content

Commit 3c69b9d

Browse files
fpistmfpistm
authored
Merge pull request #1464 from fpistm/UpdateWB
Update STM32WB HAL and CMSIS drivers
2 parents 24928e9 + c61f5a5 commit 3c69b9d

File tree

103 files changed

+4561
-2915
lines changed

Some content is hidden

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

103 files changed

+4561
-2915
lines changed

‎libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus_ex.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@
1212
#include "stm32l4xx_hal_smbus_ex.c"
1313
#elif STM32L5xx
1414
#include "stm32l5xx_hal_smbus_ex.c"
15+
#elif STM32WBxx
16+
#include "stm32wbxx_hal_smbus_ex.c"
1517
#endif
1618
#pragma GCC diagnostic pop

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -957,6 +956,16 @@ typedef struct
957956
* @{
958957
*/
959958

959+
/** @addtogroup Hardware_Constant_Definition
960+
* @{
961+
*/
962+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
963+
964+
/**
965+
* @}
966+
*/
967+
968+
960969
/** @addtogroup Peripheral_Registers_Bits_Definition
961970
* @{
962971
*/
@@ -3239,6 +3248,9 @@ typedef struct
32393248
#define FLASH_ECCR_CPUID_Pos (26U)
32403249
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
32413250
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
3251+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
3252+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
3253+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
32423254
#define FLASH_ECCR_ECCC_Pos (30U)
32433255
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
32443256
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -972,6 +971,16 @@ typedef struct
972971
* @{
973972
*/
974973

974+
/** @addtogroup Hardware_Constant_Definition
975+
* @{
976+
*/
977+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
978+
979+
/**
980+
* @}
981+
*/
982+
983+
975984
/** @addtogroup Peripheral_Registers_Bits_Definition
976985
* @{
977986
*/
@@ -3335,6 +3344,9 @@ typedef struct
33353344
#define FLASH_ECCR_CPUID_Pos (26U)
33363345
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
33373346
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
3347+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
3348+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
3349+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
33383350
#define FLASH_ECCR_ECCC_Pos (30U)
33393351
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
33403352
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -957,6 +956,16 @@ typedef struct
957956
* @{
958957
*/
959958

959+
/** @addtogroup Hardware_Constant_Definition
960+
* @{
961+
*/
962+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
963+
964+
/**
965+
* @}
966+
*/
967+
968+
960969
/** @addtogroup Peripheral_Registers_Bits_Definition
961970
* @{
962971
*/
@@ -3720,6 +3729,9 @@ typedef struct
37203729
#define FLASH_ECCR_CPUID_Pos (26U)
37213730
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
37223731
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
3732+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
3733+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
3734+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
37233735
#define FLASH_ECCR_ECCC_Pos (30U)
37243736
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
37253737
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -1149,6 +1148,16 @@ typedef struct
11491148
* @{
11501149
*/
11511150

1151+
/** @addtogroup Hardware_Constant_Definition
1152+
* @{
1153+
*/
1154+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
1155+
1156+
/**
1157+
* @}
1158+
*/
1159+
1160+
11521161
/** @addtogroup Peripheral_Registers_Bits_Definition
11531162
* @{
11541163
*/
@@ -4098,6 +4107,9 @@ typedef struct
40984107
#define FLASH_ECCR_CPUID_Pos (26U)
40994108
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
41004109
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
4110+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
4111+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
4112+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
41014113
#define FLASH_ECCR_ECCC_Pos (30U)
41024114
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
41034115
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -958,6 +957,16 @@ typedef struct
958957
* @{
959958
*/
960959

960+
/** @addtogroup Hardware_Constant_Definition
961+
* @{
962+
*/
963+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
964+
965+
/**
966+
* @}
967+
*/
968+
969+
961970
/** @addtogroup Peripheral_Registers_Bits_Definition
962971
* @{
963972
*/
@@ -3721,6 +3730,9 @@ typedef struct
37213730
#define FLASH_ECCR_CPUID_Pos (26U)
37223731
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
37233732
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
3733+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
3734+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
3735+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
37243736
#define FLASH_ECCR_ECCC_Pos (30U)
37253737
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
37263738
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -1195,6 +1194,16 @@ typedef struct
11951194
* @{
11961195
*/
11971196

1197+
/** @addtogroup Hardware_Constant_Definition
1198+
* @{
1199+
*/
1200+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
1201+
1202+
/**
1203+
* @}
1204+
*/
1205+
1206+
11981207
/** @addtogroup Peripheral_Registers_Bits_Definition
11991208
* @{
12001209
*/
@@ -4150,6 +4159,9 @@ typedef struct
41504159
#define FLASH_ECCR_CPUID_Pos (26U)
41514160
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
41524161
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
4162+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
4163+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
4164+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
41534165
#define FLASH_ECCR_ECCC_Pos (30U)
41544166
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
41554167
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

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

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,12 @@
1414
******************************************************************************
1515
* @attention
1616
*
17-
* <h2><center>&copy; Copyright (c) 2019 STMicroelectronics.
18-
* All rights reserved.</center></h2>
17+
* Copyright (c) 2019-2021 STMicroelectronics.
18+
* All rights reserved.
1919
*
20-
* This software component is licensed by ST under Apache License, Version 2.0,
21-
* the "License"; You may not use this file except in compliance with the
22-
* License. You may obtain a copy of the License at:
23-
* opensource.org/licenses/Apache-2.0
20+
* This software is licensed under terms that can be found in the LICENSE file
21+
* in the root directory of this software component.
22+
* If no LICENSE file comes with this software, it is provided AS-IS.
2423
*
2524
******************************************************************************
2625
*/
@@ -1195,6 +1194,16 @@ typedef struct
11951194
* @{
11961195
*/
11971196

1197+
/** @addtogroup Hardware_Constant_Definition
1198+
* @{
1199+
*/
1200+
#define LSI_STARTUP_TIME 130U /*!< LSI Maximum startup time in us */
1201+
1202+
/**
1203+
* @}
1204+
*/
1205+
1206+
11981207
/** @addtogroup Peripheral_Registers_Bits_Definition
11991208
* @{
12001209
*/
@@ -4150,6 +4159,9 @@ typedef struct
41504159
#define FLASH_ECCR_CPUID_Pos (26U)
41514160
#define FLASH_ECCR_CPUID_Msk (0x7UL << FLASH_ECCR_CPUID_Pos) /*!< 0x1C000000 */
41524161
#define FLASH_ECCR_CPUID FLASH_ECCR_CPUID_Msk /*!< CPU identification */
4162+
#define FLASH_ECCR_CPUID_0 (0x1U << FLASH_ECCR_CPUID_Pos) /*!< 0x04000000 */
4163+
#define FLASH_ECCR_CPUID_1 (0x2U << FLASH_ECCR_CPUID_Pos) /*!< 0x08000000 */
4164+
#define FLASH_ECCR_CPUID_2 (0x4U << FLASH_ECCR_CPUID_Pos) /*!< 0x10000000 */
41534165
#define FLASH_ECCR_ECCC_Pos (30U)
41544166
#define FLASH_ECCR_ECCC_Msk (0x1UL << FLASH_ECCR_ECCC_Pos) /*!< 0x40000000 */
41554167
#define FLASH_ECCR_ECCC FLASH_ECCR_ECCC_Msk /*!< ECC correction */

0 commit comments

Comments
 (0)