mirror of
https://github.com/espressif/esp-idf.git
synced 2025-08-10 04:43:33 +00:00
Merge branch 'bugfix/ble_update_lib_20231219' into 'master'
update lib on master Closes BLERP-371, BLERP-364, BLERP-363, BLERP-361, BLERP-349, BLERP-360, BLERP-350, BLERP-351, BLERP-352, BLERP-353, BLERP-354, BLERP-356, BLERP-357, BLERP-358, BLERP-359, BLERP-366, BLERP-376, and BLERP-378 See merge request espressif/esp-idf!27997
This commit is contained in:
@@ -464,3 +464,23 @@ config BT_CTRL_BLE_ADV_REPORT_DISCARD_THRSHOLD
|
||||
config BT_LE_RELEASE_IRAM_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
config BT_LE_TX_CCA_ENABLED
|
||||
bool "BLE enable TX CCA feature"
|
||||
default n
|
||||
help
|
||||
Enable the BLE (Bluetooth Low Energy) LBT (Listen Before Talk) function. Before transmitting a packet,
|
||||
monitor the in-band CCA (Clear Channel Assessment). If the airborne carrier energy is too high, abandon
|
||||
the packet transmission. Enabling this feature may potentially decrease BLE performance. In certain
|
||||
countries and regions, when the maximum transmission power exceeds a certain limit, support for LBT
|
||||
interference avoidance mechanisms is required. If the maximum transmission power does not reach the limit,
|
||||
it may not be necessary to enable this function.
|
||||
Please refer to the relevant certification regulations for details.
|
||||
|
||||
config BT_LE_CCA_RSSI_THRESH
|
||||
int "Power threshold to refrain packet transmission in unit of -1 dBm"
|
||||
depends on BT_LE_TX_CCA_ENABLED
|
||||
range 1 100
|
||||
default 75
|
||||
help
|
||||
If a carrier signal above the threshold is detected in the air, refrain from packet transmission.
|
||||
|
@@ -40,6 +40,11 @@ extern "C" {
|
||||
#define DEFAULT_BT_NIMBLE_WHITELIST_SIZE MYNEWT_VAL(BLE_LL_WHITELIST_SIZE)
|
||||
#define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_COUNT)
|
||||
#define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_DISCARDABLE_COUNT)
|
||||
#if defined(CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
|
||||
#else
|
||||
|
||||
@@ -114,6 +119,11 @@ extern "C" {
|
||||
#else
|
||||
#define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT (8)
|
||||
#endif
|
||||
#if defined(CONFIG_BT_LE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
||||
|
@@ -571,3 +571,23 @@ config BT_LE_SCAN_DUPL_CACHE_REFRESH_PERIOD
|
||||
config BT_LE_MSYS_INIT_IN_CONTROLLER
|
||||
bool "Msys Mbuf Init in Controller"
|
||||
default y
|
||||
|
||||
config BT_LE_TX_CCA_ENABLED
|
||||
bool "BLE enable TX CCA feature"
|
||||
default n
|
||||
help
|
||||
Enable the BLE (Bluetooth Low Energy) LBT (Listen Before Talk) function. Before transmitting a packet,
|
||||
monitor the in-band CCA (Clear Channel Assessment). If the airborne carrier energy is too high, abandon
|
||||
the packet transmission. Enabling this feature may potentially decrease BLE performance. In certain
|
||||
countries and regions, when the maximum transmission power exceeds a certain limit, support for LBT
|
||||
interference avoidance mechanisms is required. If the maximum transmission power does not reach the limit,
|
||||
it may not be necessary to enable this function.
|
||||
Please refer to the relevant certification regulations for details.
|
||||
|
||||
config BT_LE_CCA_RSSI_THRESH
|
||||
int "Power threshold to refrain packet transmission in unit of -1 dBm"
|
||||
depends on BT_LE_TX_CCA_ENABLED
|
||||
range 1 100
|
||||
default 75
|
||||
help
|
||||
If a carrier signal above the threshold is detected in the air, refrain from packet transmission.
|
||||
|
@@ -40,6 +40,11 @@ extern "C" {
|
||||
#define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_COUNT)
|
||||
#define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_DISCARDABLE_COUNT)
|
||||
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED MYNEWT_VAL(BLE_POWER_CONTROL)
|
||||
#if defined(CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
#else
|
||||
|
||||
#if CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY
|
||||
@@ -119,6 +124,11 @@ extern "C" {
|
||||
#else
|
||||
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED (0)
|
||||
#endif
|
||||
#if defined(CONFIG_BT_LE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
|
||||
|
@@ -564,3 +564,23 @@ config BT_LE_SCAN_DUPL_CACHE_REFRESH_PERIOD
|
||||
config BT_LE_MSYS_INIT_IN_CONTROLLER
|
||||
bool
|
||||
default y
|
||||
|
||||
config BT_LE_TX_CCA_ENABLED
|
||||
bool "BLE enable TX CCA feature"
|
||||
default n
|
||||
help
|
||||
Enable the BLE (Bluetooth Low Energy) LBT (Listen Before Talk) function. Before transmitting a packet,
|
||||
monitor the in-band CCA (Clear Channel Assessment). If the airborne carrier energy is too high, abandon
|
||||
the packet transmission. Enabling this feature may potentially decrease BLE performance. In certain
|
||||
countries and regions, when the maximum transmission power exceeds a certain limit, support for LBT
|
||||
interference avoidance mechanisms is required. If the maximum transmission power does not reach the limit,
|
||||
it may not be necessary to enable this function.
|
||||
Please refer to the relevant certification regulations for details.
|
||||
|
||||
config BT_LE_CCA_RSSI_THRESH
|
||||
int "Power threshold to refrain packet transmission in unit of -1 dBm"
|
||||
depends on BT_LE_TX_CCA_ENABLED
|
||||
range 1 100
|
||||
default 75
|
||||
help
|
||||
If a carrier signal above the threshold is detected in the air, refrain from packet transmission.
|
||||
|
@@ -40,6 +40,11 @@ extern "C" {
|
||||
#define DEFAULT_BT_LE_HCI_EVT_HI_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_COUNT)
|
||||
#define DEFAULT_BT_LE_HCI_EVT_LO_BUF_COUNT MYNEWT_VAL(BLE_TRANSPORT_EVT_DISCARDABLE_COUNT)
|
||||
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED MYNEWT_VAL(BLE_POWER_CONTROL)
|
||||
#if defined(CONFIG_BT_NIMBLE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
#else
|
||||
|
||||
#if CONFIG_BT_LE_LL_CFG_FEAT_LE_CODED_PHY
|
||||
@@ -119,6 +124,12 @@ extern "C" {
|
||||
#else
|
||||
#define DEFAULT_BT_LE_POWER_CONTROL_ENABLED (0)
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_BT_LE_50_FEATURE_SUPPORT)
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (1)
|
||||
#else
|
||||
#define DEFAULT_BT_LE_50_FEATURE_SUPPORT (0)
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#define DEFAULT_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF CONFIG_BT_LE_COEX_PHY_CODED_TX_RX_TLIM_EFF
|
||||
|
Submodule components/bt/controller/lib_esp32c2/esp32c2-bt-lib updated: d238d53d4a...909c8bca55
Submodule components/bt/controller/lib_esp32c6/esp32c6-bt-lib updated: 0f0f3ff7e5...8ad84d799a
Reference in New Issue
Block a user