mirror of
https://github.com/espressif/esp-idf.git
synced 2026-09-22 13:01:16 +03:00
Merge branch 'feat/update_mesh_lib_to_supported_get_lib_ver_v5.3' into 'release/v5.3'
Feat/update mesh lib to supported get lib ver (5.3) See merge request espressif/esp-idf!51170
This commit is contained in:
@@ -4,8 +4,13 @@ function(register_ble_mesh_libs)
|
||||
endif()
|
||||
|
||||
if(CONFIG_BLE_MESH_V11_SUPPORT)
|
||||
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/${idf_target}/libble_mesh.a")
|
||||
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)
|
||||
if(NOT CONFIG_BLE_MESH_COMPRESSED_LOG_ENABLE)
|
||||
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/${idf_target}/libble_mesh.a")
|
||||
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)
|
||||
else()
|
||||
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/${idf_target}/log_compressed/libble_mesh.a")
|
||||
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh)
|
||||
endif()
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
|
||||
@@ -5096,6 +5096,7 @@ void bt_mesh_lib_ext_func_dummy_call(void)
|
||||
|
||||
int bt_mesh_v11_ext_init(void)
|
||||
{
|
||||
bt_mesh_lib_log_info("%s", bt_mesh_v11_commit_str);
|
||||
return bt_mesh_v11_init(&bt_mesh_ext_cfg, sizeof(bt_mesh_ext_cfg),
|
||||
&bt_mesh_ext_func, sizeof(bt_mesh_ext_func));
|
||||
}
|
||||
|
||||
@@ -26,6 +26,8 @@ int bt_mesh_v11_init(const void *cfg, size_t cfg_size,
|
||||
|
||||
int bt_mesh_v11_deinit(void);
|
||||
|
||||
extern const char bt_mesh_v11_commit_str[];
|
||||
|
||||
#define BLE_MESH_TAG_SEND_SEGMENTED BIT(0)
|
||||
#define BLE_MESH_TAG_IMMUTABLE_CRED BIT(1)
|
||||
#define BLE_MESH_TAG_USE_DIRECTED BIT(2)
|
||||
|
||||
Submodule components/bt/esp_ble_mesh/lib/lib updated: 4ad1ccee76...d1861a6714
Reference in New Issue
Block a user