mirror of
https://github.com/espressif/esp-idf.git
synced 2026-10-03 03:31:41 +03:00
Merge branch 'feat/support_esp32h4_for_ble_mesh' into 'master'
Feat/support esp32h4/esp32s31 for esp ble mesh Closes BLERP-2742, BLERP-2691, IDF-12247, and IDF-14609 See merge request espressif/esp-idf!47243
This commit is contained in:
@@ -36,7 +36,7 @@ if BLE_MESH
|
||||
select BT_NIMBLE_50_FEATURE_SUPPORT if BT_NIMBLE_ENABLED
|
||||
select BT_NIMBLE_EXT_ADV if BT_NIMBLE_ENABLED
|
||||
select BT_BLE_50_FEATURES_SUPPORTED if BT_BLUEDROID_ENABLED
|
||||
select BT_LE_50_FEATURE_SUPPORT if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32H2
|
||||
select BT_LE_50_FEATURE_SUPPORT if SOC_ESP_NIMBLE_CONTROLLER
|
||||
default n
|
||||
help
|
||||
This option to enable BLE Mesh using some BLE 5.0 APIs.
|
||||
@@ -184,7 +184,7 @@ if BLE_MESH
|
||||
select BTDM_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32
|
||||
select BT_CTRL_BLE_SCAN_DUPL if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
|
||||
select BT_CTRL_BLE_MESH_SCAN_DUPL_EN if IDF_TARGET_ESP32C3 || IDF_TARGET_ESP32S3
|
||||
select BT_LE_SCAN_DUPL if IDF_TARGET_ESP32C6 || IDF_TARGET_ESP32H2 || IDF_TARGET_ESP32C61 || IDF_TARGET_ESP32C5
|
||||
select BT_LE_SCAN_DUPL if SOC_ESP_NIMBLE_CONTROLLER
|
||||
select BT_NIMBLE_VS_SUPPORT if BT_NIMBLE_ENABLED
|
||||
default y
|
||||
help
|
||||
|
||||
Submodule components/bt/esp_ble_mesh/lib/lib updated: e44762384e...f6c62bfa32
@@ -1227,6 +1227,10 @@ config SOC_BLE_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
config SOC_BLE_MESH_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
config SOC_BLE_ISO_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -531,7 +531,7 @@
|
||||
|
||||
/*---------------------------------- Bluetooth CAPS ----------------------------------*/
|
||||
#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_ISO_SUPPORTED (1) /*!< Support BLE ISO */
|
||||
#define SOC_BLE_AUDIO_SUPPORTED (1) /*!< Support BLE Audio */
|
||||
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
|
||||
|
||||
@@ -1231,6 +1231,10 @@ config SOC_BLE_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
config SOC_BLE_MESH_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
config SOC_BLE_ISO_SUPPORTED
|
||||
bool
|
||||
default y
|
||||
|
||||
@@ -508,7 +508,7 @@
|
||||
/*---------------------------------- Bluetooth CAPS ----------------------------------*/
|
||||
#define SOC_BT_CLASSIC_SUPPORTED (1) /*!< Support Bluetooth Classic 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_ISO_SUPPORTED (1) /*!< Support BLE ISO */
|
||||
#define SOC_BLE_AUDIO_SUPPORTED (1) /*!< Support BLE Audio */
|
||||
#define SOC_ESP_NIMBLE_CONTROLLER (1) /*!< Support BLE EMBEDDED controller V1 */
|
||||
|
||||
Reference in New Issue
Block a user