Update STM32Cube_FW from Cube version v1.13.3

Signed-off-by: Alexandre Bourdiol <[email protected]>
AresMaster · Apr 11, 2022 · 061ec8e · 061ec8e
1 parent 1f3c876
commit 061ec8e
Show file tree

Hide file tree

Showing 4 changed files with 236 additions and 226 deletions.
diff --git a/src/utility/STM32Cube_FW/README.md b/src/utility/STM32Cube_FW/README.md
@@ -1,6 +1,6 @@
 
 ## Source
 
-[STMicroelectronics/STM32CubeWB Release v1.13.0](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.13.0)
-- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.13.0/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
+[STMicroelectronics/STM32CubeWB Release v1.13.3](https://github.com/STMicroelectronics/STM32CubeWB/releases/tag/v1.13.3)
+- Application: [BLE_TransparentMode](https://github.com/STMicroelectronics/STM32CubeWB/tree/v1.13.3/Projects/P-NUCLEO-WB55.Nucleo/Applications/BLE/BLE_TransparentMode)
 
diff --git a/src/utility/STM32Cube_FW/ble_bufsize.h b/src/utility/STM32Cube_FW/ble_bufsize.h
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * @file    ble_bufsize.h
- * @author  MCD
+ * @author  MDG
  * @brief   Definition of BLE stack buffers size
  *****************************************************************************
  * @attention
  *
- * Copyright (c) 2018-2021 STMicroelectronics.
+ * Copyright (c) 2018-2022 STMicroelectronics.
  * All rights reserved.
  *
  * This software is licensed under terms that can be found in the LICENSE file
@@ -97,28 +97,28 @@
  *   mentioned parameters.
 */
 #if (BEACON_ONLY != 0)
-#define BLE_FIXED_BUFFER_SIZE_BYTES  4184   /* Beacon only */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  4076   /* Beacon only */
 #elif (LL_ONLY != 0)
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6068   /* LL only */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  5936   /* LL only */
 #elif (SLAVE_ONLY != 0)
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6096   /* Peripheral only */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6204   /* Peripheral only */
 #elif (BASIC_FEATURES != 0)
-#define BLE_FIXED_BUFFER_SIZE_BYTES  6400   /* Basic Features */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  6532   /* Basic Features */
 #else
-#define BLE_FIXED_BUFFER_SIZE_BYTES  7312   /* Full stack */
+#define BLE_FIXED_BUFFER_SIZE_BYTES  7052   /* Full stack */
 #endif
 
 /*
  * BLE_PER_LINK_SIZE_BYTES: additional memory size used per link
  */
 #if (BEACON_ONLY != 0)
-#define BLE_PER_LINK_SIZE_BYTES       192   /* Beacon only */
+#define BLE_PER_LINK_SIZE_BYTES       128   /* Beacon only */
 #elif (LL_ONLY != 0)
 #define BLE_PER_LINK_SIZE_BYTES       260   /* LL only */
 #elif (SLAVE_ONLY != 0)
-#define BLE_PER_LINK_SIZE_BYTES       388   /* Peripheral only */
+#define BLE_PER_LINK_SIZE_BYTES       392   /* Peripheral only */
 #elif (BASIC_FEATURES != 0)
-#define BLE_PER_LINK_SIZE_BYTES       388   /* Basic Features */
+#define BLE_PER_LINK_SIZE_BYTES       440   /* Basic Features */
 #else
 #define BLE_PER_LINK_SIZE_BYTES       444   /* Full stack */
 #endif
@@ -141,10 +141,17 @@
 /*
  * BLE_EXT_ADV_BUFFER_SIZE
  * additional memory size used for Extended advertising;
- * It has to be added to BLE_TOTAL_BUFFER_SIZE().
- * The formula used is based on:(1792 + ((set_nbr) * (60 + (2 * (data_len)))))
+ * It has to be added to BLE_TOTAL_BUFFER_SIZE() if the Extended advertising
+ * feature is used.
+ *
+ * @param set_nbr: Maximum number of advertising sets.
+ * Valid values are from 1 to 8.
+ *
+ * @param data_len: Maximum size of advertising data.
+ * Valid values are from 31 to 1650.
  */
-#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) (7596)
+#define BLE_EXT_ADV_BUFFER_SIZE(set_nbr, data_len) \
+          (2304 + ((892 + (DIVC(data_len, 207) * 244)) * (set_nbr)))
 
 /*
  * BLE_TOTAL_BUFFER_SIZE_GATT: this macro returns the amount of memory,

diff --git a/src/utility/STM32Cube_FW/shci.h b/src/utility/STM32Cube_FW/shci.h
@@ -526,7 +526,7 @@ extern "C" {
    * - bit 0:   1: LL only                          0: LL + host
    * - bit 1:   1: no service change desc.          0: with service change desc.
    * - bit 2:   1: device name Read-Only            0: device name R/W
-   * - bit 3:   1: extended advertizing supported   0: extended advertizing not supported   [NOT SUPPORTED]
+   * - bit 3:   1: extended advertizing supported   0: extended advertizing not supported
    * - bit 4:   1: CS Algo #2 supported             0: CS Algo #2 not supported
    * - bit 7:   1: LE Power Class 1                 0: LE Power Classe 2-3
    * - other bits: reserved ( shall be set to 0)
@@ -585,8 +585,8 @@ extern "C" {
 #define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RO                       (1<<2)
 #define SHCI_C2_BLE_INIT_OPTIONS_DEVICE_NAME_RW                       (0<<2)
 
-#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV                              (1<<3)   /*NOT SUPPORTED*/
-#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV                           (0<<3)   /*NOT SUPPORTED*/
+#define SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV                              (1<<3)
+#define SHCI_C2_BLE_INIT_OPTIONS_NO_EXT_ADV                           (0<<3)
 
 #define SHCI_C2_BLE_INIT_OPTIONS_CS_ALGO2                             (1<<4)
 #define SHCI_C2_BLE_INIT_OPTIONS_NO_CS_ALGO2                          (0<<4)
@@ -856,6 +856,9 @@ extern "C" {
 #define INFO_STACK_TYPE_BLE_HCI                     0x02
 #define INFO_STACK_TYPE_BLE_LIGHT                   0x03
 #define INFO_STACK_TYPE_BLE_BEACON                  0x04
+#define INFO_STACK_TYPE_BLE_BASIC                   0x05
+#define INFO_STACK_TYPE_BLE_FULL_EXT_ADV            0x06
+#define INFO_STACK_TYPE_BLE_HCI_EXT_ADV             0x07
 #define INFO_STACK_TYPE_THREAD_FTD                  0x10
 #define INFO_STACK_TYPE_THREAD_MTD                  0x11
 #define INFO_STACK_TYPE_BLE_THREAD_FTD_STATIC       0x50