alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

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

Browse Source 
Nimble: Update example configuration to enable ext adv feature only for BLE5.0 supported chips (v5.0)

See merge request espressif/esp-idf!22780
This commit is contained in:
Jiang Jiang Jian 2023-03-17 13:56:22 +08:00
commit df0ec3f5e4
17 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/bt/host/nimble/Kconfig.in
View File

@ -503,7 +503,7 @@ config BT_NIMBLE_MAX_CONN_REATTEMPT
menuconfig BT_NIMBLE_50_FEATURE_SUPPORT menuconfig BT_NIMBLE_50_FEATURE_SUPPORT
bool "Enable BLE 5 feature" bool "Enable BLE 5 feature"
depends on BT_NIMBLE_ENABLED depends on BT_NIMBLE_ENABLED && (SOC_BLE_50_SUPPORTED || !BT_CONTROLLER_ENABLED)
default y default y
help help
Enable BLE 5 feature Enable BLE 5 feature

4
components/soc/esp32c2/include/soc/Kconfig.soc_caps.in
View File

@ -594,3 +594,7 @@ config SOC_BLE_MESH_SUPPORTED
config SOC_ESP_NIMBLE_CONTROLLER config SOC_ESP_NIMBLE_CONTROLLER
bool bool
default y default y
config SOC_BLE_50_SUPPORTED
bool
default y

1
components/soc/esp32c2/include/soc/soc_caps.h
View File

@ -288,3 +288,4 @@
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
#define SOC_BLE_MESH_SUPPORTED (0) /*!< Support BLE MESH */ #define SOC_BLE_MESH_SUPPORTED (0) /*!< Support BLE MESH */
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */ #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */

4
components/soc/esp32c3/include/soc/Kconfig.soc_caps.in
View File

@ -842,3 +842,7 @@ config SOC_BLE_SUPPORTED
config SOC_BLE_MESH_SUPPORTED config SOC_BLE_MESH_SUPPORTED
bool bool
default y default y
config SOC_BLE_50_SUPPORTED
bool
default y

1
components/soc/esp32c3/include/soc/soc_caps.h
View File

@ -387,3 +387,4 @@
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
#define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */

4
components/soc/esp32h2/include/soc/Kconfig.soc_caps.in
View File

@ -774,3 +774,7 @@ config SOC_BLE_MESH_SUPPORTED
config SOC_ESP_NIMBLE_CONTROLLER config SOC_ESP_NIMBLE_CONTROLLER
bool bool
default y default y
config SOC_BLE_50_SUPPORTED
bool
default y

1
components/soc/esp32h2/include/soc/soc_caps.h
View File

@ -372,3 +372,4 @@
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
#define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */ #define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */

4
components/soc/esp32s3/include/soc/Kconfig.soc_caps.in
View File

@ -1079,6 +1079,10 @@ config SOC_BLE_MESH_SUPPORTED
bool bool
default y default y
config SOC_BLE_50_SUPPORTED
bool
default y
config SOC_TWAI_BRP_MIN config SOC_TWAI_BRP_MIN
int int
default 2 default 2

1
components/soc/esp32s3/include/soc/soc_caps.h
View File

@ -455,3 +455,4 @@
/*---------------------------------- Bluetooth CAPS ----------------------------------*/ /*---------------------------------- Bluetooth CAPS ----------------------------------*/
#define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */ #define SOC_BLE_SUPPORTED (1) /*!< Support Bluetooth Low Energy hardware */
#define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */ #define SOC_BLE_MESH_SUPPORTED (1) /*!< Support BLE MESH */
#define SOC_BLE_50_SUPPORTED (1) /*!< Support Bluetooth 5.0 */

3
examples/bluetooth/nimble/ble_l2cap_coc/coc_blecent/main/Kconfig.projbuild
View File

@ -8,8 +8,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/ble_l2cap_coc/coc_bleprph/main/Kconfig.projbuild
View File

@ -50,8 +50,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/ble_periodic_adv/main/Kconfig.projbuild
View File

@ -2,8 +2,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/ble_periodic_sync/main/Kconfig.projbuild
View File

@ -1,8 +1,9 @@
menu "Example Configuration" menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/ble_phy/phy_cent/main/Kconfig.projbuild
View File

@ -8,8 +8,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/ble_phy/phy_prph/main/Kconfig.projbuild
View File

@ -47,8 +47,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/blecent/main/Kconfig.projbuild
View File

@ -8,8 +8,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example

3
examples/bluetooth/nimble/bleprph/main/Kconfig.projbuild
View File

@ -50,8 +50,9 @@ menu "Example Configuration"
config EXAMPLE_EXTENDED_ADV config EXAMPLE_EXTENDED_ADV
bool bool
depends on SOC_BLE_50_SUPPORTED
default y if SOC_ESP_NIMBLE_CONTROLLER default y if SOC_ESP_NIMBLE_CONTROLLER
select BT_NIMBLE_EXT_ADV if SOC_ESP_NIMBLE_CONTROLLER select BT_NIMBLE_EXT_ADV
prompt "Enable Extended Adv" prompt "Enable Extended Adv"
help help
Use this option to enable extended advertising in the example Use this option to enable extended advertising in the example