mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
Merge branch 'bugfix/fix_example_menuconfig_error_v5.3' into 'release/v5.3'
fix(nimble): Update menuconfig option to consider 5.0 support (v5.3) See merge request espressif/esp-idf!32035
This commit is contained in:
@ -15,7 +15,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -2,7 +2,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -15,7 +15,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -2,7 +2,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -8,7 +8,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -50,7 +50,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -2,7 +2,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -2,7 +2,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
menu "Example Configuration"
|
menu "Example Configuration"
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -15,7 +15,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -2,7 +2,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -8,7 +8,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -50,7 +50,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -110,7 +110,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
@ -129,7 +129,7 @@ menu "Example Configuration"
|
|||||||
|
|
||||||
config EXAMPLE_EXTENDED_ADV
|
config EXAMPLE_EXTENDED_ADV
|
||||||
bool
|
bool
|
||||||
depends on SOC_BLE_50_SUPPORTED
|
depends on SOC_BLE_50_SUPPORTED && BT_NIMBLE_50_FEATURE_SUPPORT
|
||||||
default y if SOC_ESP_NIMBLE_CONTROLLER
|
default y if SOC_ESP_NIMBLE_CONTROLLER
|
||||||
select BT_NIMBLE_EXT_ADV
|
select BT_NIMBLE_EXT_ADV
|
||||||
prompt "Enable Extended Adv"
|
prompt "Enable Extended Adv"
|
||||||
|
Reference in New Issue
Block a user