Skip to content

Commit 061ec8e

Browse files
ABOSTMfpistm
authored andcommitted
Update STM32Cube_FW from Cube version v1.13.3
Signed-off-by: Alexandre Bourdiol <[email protected]>
1 parent 1f3c876 commit 061ec8e

File tree

4 files changed

+236
-226
lines changed

4 files changed

+236
-226
lines changed

src/utility/STM32Cube_FW/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
## Source
33

4-
[STMicroelectronics/STM32CubeWB Release v1.13.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.13.0)
5-
- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.13.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
4+
[STMicroelectronics/STM32CubeWB Release v1.13.3](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.13.3)
5+
- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.13.3/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
66

src/utility/STM32Cube_FW/ble_bufsize.h

+20-13
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
/*****************************************************************************
22
* @file ble_bufsize.h
3-
* @author MCD
3+
* @author MDG
44
* @brief Definition of BLE stack buffers size
55
*****************************************************************************
66
* @attention
77
*
8-
* Copyright (c) 2018-2021 STMicroelectronics.
8+
* Copyright (c) 2018-2022 STMicroelectronics.
99
* All rights reserved.
1010
*
1111
* This software is licensed under terms that can be found in the LICENSE file
@@ -97,28 +97,28 @@
9797
* mentioned parameters.
9898
*/
9999
#if (BEACON_ONLY != 0)
100-
#define BLE_FIXED_BUFFER_SIZE_BYTES 4184 /* Beacon only */
100+
#define BLE_FIXED_BUFFER_SIZE_BYTES 4076 /* Beacon only */
101101
#elif (LL_ONLY != 0)
102-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6068 /* LL only */
102+
#define BLE_FIXED_BUFFER_SIZE_BYTES 5936 /* LL only */
103103
#elif (SLAVE_ONLY != 0)
104-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6096 /* Peripheral only */
104+
#define BLE_FIXED_BUFFER_SIZE_BYTES 6204 /* Peripheral only */
105105
#elif (BASIC_FEATURES != 0)
106-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6400 /* Basic Features */
106+
#define BLE_FIXED_BUFFER_SIZE_BYTES 6532 /* Basic Features */
107107
#else
108-
#define BLE_FIXED_BUFFER_SIZE_BYTES 7312 /* Full stack */
108+
#define BLE_FIXED_BUFFER_SIZE_BYTES 7052 /* Full stack */
109109
#endif
110110

111111
/*
112112
* BLE_PER_LINK_SIZE_BYTES: additional memory size used per link
113113
*/
114114
#if (BEACON_ONLY != 0)
115-
#define BLE_PER_LINK_SIZE_BYTES 192 /* Beacon only */
115+
#define BLE_PER_LINK_SIZE_BYTES 128 /* Beacon only */
116116
#elif (LL_ONLY != 0)
117117
#define BLE_PER_LINK_SIZE_BYTES 260 /* LL only */
118118
#elif (SLAVE_ONLY != 0)
119-
#define BLE_PER_LINK_SIZE_BYTES 388 /* Peripheral only */
119+
#define BLE_PER_LINK_SIZE_BYTES 392 /* Peripheral only */
120120
#elif (BASIC_FEATURES != 0)
121-
#define BLE_PER_LINK_SIZE_BYTES 388 /* Basic Features */
121+
#define BLE_PER_LINK_SIZE_BYTES 440 /* Basic Features */
122122
#else
123123
#define BLE_PER_LINK_SIZE_BYTES 444 /* Full stack */
124124
#endif
@@ -141,10 +141,17 @@
141141
/*
142142
* BLE_EXT_ADV_BUFFER_SIZE
143143
* additional memory size used for Extended advertising;
144-
* It has to be added to BLE_TOTAL_BUFFER_SIZE().
145-
* The formula used is based on:(1792 + ((set_nbr) * (60 + (2 * (data_len)))))
144+
* It has to be added to BLE_TOTAL_BUFFER_SIZE() if the Extended advertising
145+
* feature is used.
146+
*
147+
* @param set_nbr: Maximum number of advertising sets.
148+
* Valid values are from 1 to 8.
149+
*
150+
* @param data_len: Maximum size of advertising data.
151+
* Valid values are from 31 to 1650.
146152
*/
147-
#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) (7596)
153+
#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) \
154+
(2304 + ((892 + (DIVC(data_len, 207) * 244)) * (set_nbr)))
148155

149156
/*
150157
* BLE_TOTAL_BUFFER_SIZE_GATT: this macro returns the amount of memory,

src/utility/STM32Cube_FW/shci.h

+6-3
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ extern "C" {
526526
* - bit 0: 1: LL only 0: LL + host
527527
* - bit 1: 1: no service change desc. 0: with service change desc.
528528
* - bit 2: 1: device name Read-Only 0: device name R/W
529-
* - bit 3: 1: extended advertizing supported 0: extended advertizing not supported [NOT SUPPORTED]
529+
* - bit 3: 1: extended advertizing supported 0: extended advertizing not supported
530530
* - bit 4: 1: CS Algo #2 supported 0: CS Algo #2 not supported
531531
* - bit 7: 1: LE Power Class 1 0: LE Power Classe 2-3
532532
* - other bits: reserved ( shall be set to 0)
@@ -585,8 +585,8 @@ extern "C" {
585585
#define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO (1<<2)
586586
#define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW (0<<2)
587587

588-
#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV (1<<3) /*NOT SUPPORTED*/
589-
#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV (0<<3) /*NOT SUPPORTED*/
588+
#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV (1<<3)
589+
#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV (0<<3)
590590

591591
#define SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2 (1<<4)
592592
#define SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2 (0<<4)
@@ -856,6 +856,9 @@ extern "C" {
856856
#define INFO_STACK_TYPE_BLE_HCI 0x02
857857
#define INFO_STACK_TYPE_BLE_LIGHT 0x03
858858
#define INFO_STACK_TYPE_BLE_BEACON 0x04
859+
#define INFO_STACK_TYPE_BLE_BASIC 0x05
860+
#define INFO_STACK_TYPE_BLE_FULL_EXT_ADV 0x06
861+
#define INFO_STACK_TYPE_BLE_HCI_EXT_ADV 0x07
859862
#define INFO_STACK_TYPE_THREAD_FTD 0x10
860863
#define INFO_STACK_TYPE_THREAD_MTD 0x11
861864
#define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC 0x50

0 commit comments

Comments
 (0)