Skip to content

Commit 2c444f7

Browse files
authored
Merge pull request #80 from fpistm/update_WPAN
chore: update to STM32_WPAN v1.23.0
2 parents 4a1bf81 + bc5be38 commit 2c444f7

File tree

6 files changed

+224
-173
lines changed

6 files changed

+224
-173
lines changed

src/utility/STM32_WPAN/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
## Source
33

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

src/utility/STM32_WPAN/app_conf_default.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -328,6 +328,13 @@
328328

329329
#define CFG_BLE_MAX_TX_POWER (6)
330330

331+
/**
332+
* BLE stack Maximum number of created Enhanced ATT bearers to be configured
333+
* in addition to the number of links
334+
* - Range: 0 .. 4
335+
*/
336+
#define CFG_BLE_MAX_ADD_EATT_BEARERS (4)
337+
331338
/**
332339
* BLE Rx model configuration flags to be configured with:
333340
* - SHCI_C2_BLE_INIT_RX_MODEL_AGC_RSSI_LEGACY

src/utility/STM32_WPAN/ble_bufsize.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
#if (BEACON_ONLY != 0)
100100
#define BLE_FIXED_BUFFER_SIZE_BYTES 4200 /* Beacon only */
101101
#elif (LL_ONLY_BASIC != 0)
102-
#define BLE_FIXED_BUFFER_SIZE_BYTES 6040 /* LL only Basic*/
102+
#define BLE_FIXED_BUFFER_SIZE_BYTES 5960 /* LL only Basic*/
103103
#elif (LL_ONLY != 0)
104104
#define BLE_FIXED_BUFFER_SIZE_BYTES 6288 /* LL only Full */
105105
#elif (SLAVE_ONLY != 0)

src/utility/STM32_WPAN/shci.h

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -565,53 +565,62 @@ extern "C" {
565565
*/
566566
int8_t max_tx_power;
567567

568-
/**
569-
* RX model configuration
570-
* - bit 0: 1: agc_rssi model improved vs RF blockers 0: Legacy agc_rssi model
571-
* - other bits: reserved ( shall be set to 0)
572-
*/
568+
/**
569+
* RX model configuration
570+
* - bit 0: 1: agc_rssi model improved vs RF blockers 0: Legacy agc_rssi model
571+
* - other bits: reserved ( shall be set to 0)
572+
*/
573573
uint8_t rx_model_config;
574574

575-
/* Maximum number of advertising sets.
576-
* Range: 1 .. 8 with limitation:
577-
* This parameter is linked to max_adv_data_len such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
578-
* on Max Extended advertising configuration supported.
579-
* This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
580-
*/
575+
/** Maximum number of advertising sets.
576+
* Range: 1 .. 8 with limitation:
577+
* This parameter is linked to max_adv_data_len such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
578+
* on Max Extended advertising configuration supported.
579+
* This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
580+
*/
581581
uint8_t max_adv_set_nbr;
582582

583-
/* Maximum advertising data length (in bytes)
584-
* Range: 31 .. 1650 with limitation:
585-
* This parameter is linked to max_adv_set_nbr such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
586-
* on Max Extended advertising configuration supported.
587-
* This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
588-
*/
583+
/** Maximum advertising data length (in bytes)
584+
* Range: 31 .. 1650 with limitation:
585+
* This parameter is linked to max_adv_set_nbr such as both compliant with allocated Total memory computed with BLE_EXT_ADV_BUFFER_SIZE based
586+
* on Max Extended advertising configuration supported.
587+
* This parameter is considered by the CPU2 when Options has SHCI_C2_BLE_INIT_OPTIONS_EXT_ADV flag set
588+
*/
589589
uint16_t max_adv_data_len;
590590

591-
/* RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
592-
* Range: -1280 .. 1280
593-
*/
591+
/** RF TX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
592+
* Range: -1280 .. 1280
593+
*/
594594
int16_t tx_path_compens;
595595

596-
/* RF RX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
597-
* Range: -1280 .. 1280
598-
*/
596+
/** RF RX Path Compensation Value (16-bit signed integer). Units: 0.1 dB.
597+
* Range: -1280 .. 1280
598+
*/
599599
int16_t rx_path_compens;
600600

601-
/* BLE core specification version (8-bit unsigned integer).
602-
* values as: 11(5.2), 12(5.3), 13(5.4)
603-
*/
601+
/** BLE core specification version (8-bit unsigned integer).
602+
* values as: 11(5.2), 12(5.3), 13(5.4)
603+
*/
604604
uint8_t ble_core_version;
605605

606-
/**
607-
* Options flags extension
608-
* - bit 0: 1: appearance Writable 0: appearance Read-Only
609-
* - bit 1: 1: Enhanced ATT supported 0: Enhanced ATT not supported
610-
* - other bits: reserved ( shall be set to 0)
611-
*/
606+
/**
607+
* Options flags extension
608+
* - bit 0: 1: appearance Writable 0: appearance Read-Only
609+
* - bit 1: 1: Enhanced ATT supported 0: Enhanced ATT not supported
610+
* - other bits: reserved ( shall be set to 0)
611+
*/
612612
uint8_t Options_extension;
613613

614-
} SHCI_C2_Ble_Init_Cmd_Param_t;
614+
/**
615+
* MaxAddEattBearers
616+
*
617+
* Maximum number of bearers that can be created for Enhanced ATT
618+
* in addition to the number of links
619+
* - Range: 0 .. 4
620+
*/
621+
uint8_t MaxAddEattBearers;
622+
623+
} SHCI_C2_Ble_Init_Cmd_Param_t;
615624

616625
typedef PACKED_STRUCT{
617626
SHCI_Header_t Header; /** Does not need to be initialized by the user */

src/utility/STM32_WPAN/stm_list.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
#ifndef _STM_LIST_H_
2121
#define _STM_LIST_H_
2222

23+
#ifdef __cplusplus
24+
extern "C" {
25+
#endif
26+
2327
/* Includes ------------------------------------------------------------------*/
2428
#include "stm32_wpan_common.h"
2529

@@ -52,4 +56,8 @@ void LST_get_next_node (tListNode * ref_node, tListNode ** node);
5256

5357
void LST_get_prev_node (tListNode * ref_node, tListNode ** node);
5458

59+
#ifdef __cplusplus
60+
}
61+
#endif
62+
5563
#endif /* _STM_LIST_H_ */

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy