Merge branch 'bugfix/remove_52_feature_macro' into 'release/v5.0'

fix(nimble): Update Menuconfig option to remove separate 5.2 feature option

See merge request espressif/esp-idf!24954
This commit is contained in:
Rahul Tank
2023-08-01 21:42:47 +08:00

View File

@@ -591,18 +591,11 @@ config BT_NIMBLE_MAX_PERIODIC_ADVERTISER_LIST
help help
Set this option to set the upper limit for number of periodic advertiser list. Set this option to set the upper limit for number of periodic advertiser list.
menuconfig BT_NIMBLE_53_FEATURE_SUPPORT config BT_NIMBLE_BLE_POWER_CONTROL
bool "Enable BLE 5.3 feature" bool "Enable support for BLE Power Control"
depends on BT_NIMBLE_ENABLED && SOC_ESP_NIMBLE_CONTROLLER depends on BT_NIMBLE_50_FEATURE_SUPPORT && SOC_ESP_NIMBLE_CONTROLLER
help help
Enable BLE 5.3 feature Set this option to enable the Power Control feature
config BT_NIMBLE_SUBRATE
bool "Connection Subrate"
depends on BT_NIMBLE_53_FEATURE_SUPPORT
help
Enable support for Connection Subrate
choice BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM choice BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM
prompt "Coexistence: limit on MAX Tx/Rx time for coded-PHY connection" prompt "Coexistence: limit on MAX Tx/Rx time for coded-PHY connection"
@@ -623,17 +616,6 @@ choice BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM
Disable the limitation on max tx/rx time for Coded-PHY connection Disable the limitation on max tx/rx time for Coded-PHY connection
endchoice endchoice
menuconfig BT_NIMBLE_52_FEATURE_SUPPORT
bool "Enable BLE 5.2 Feature"
help
Enable this option to select 5.2 features
config BT_NIMBLE_BLE_POWER_CONTROL
bool "Enable support for BLE Power Control"
depends on BT_NIMBLE_52_FEATURE_SUPPORT && SOC_ESP_NIMBLE_CONTROLLER
help
Set this option to enable the Power Control feature
config BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF config BT_NIMBLE_COEX_PHY_CODED_TX_RX_TLIM_EFF
int int
default 0 if !(ESP32_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED) default 0 if !(ESP32_WIFI_SW_COEXIST_ENABLE && BT_NIMBLE_ENABLED)