Skip to content

Commit

Permalink
Merge branch 'bugfix/fix_example_menuconfig_error' into 'master'
Browse files Browse the repository at this point in the history
fix(nimble): Update menuconfig option to consider 5.0 support

Closes BLERP-855

See merge request espressif/esp-idf!32030
  • Loading branch information
rahult-github committed Jul 10, 2024
2 parents 3a7917f + d42fa84 commit 7f8fac5
Show file tree
Hide file tree
Showing 15 changed files with 15 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/blecent/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
2 changes: 1 addition & 1 deletion examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ menu "Example Configuration"

config EXAMPLE_EXTENDED_ADV
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
select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv"
Expand Down

0 comments on commit 7f8fac5

Please sign in to comment.