Mirrors/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2026-10-02 11:10:54 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/update_mesh_lib_to_supported_get_lib_ver_v5.3' into 'release/v5.3'

Browse Source 
Feat/update mesh lib to supported get lib ver (5.3)

See merge request espressif/esp-idf!51170
This commit is contained in:
Island
2026-08-03 11:30:38 +08:00
parent e0f8e5fcce eada85080b
commit b01be03a5a
4 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/bt/esp_ble_mesh/CMakeLists.txt
+7 -2
View File
@@ -4,8 +4,13 @@ function(register_ble_mesh_libs)
endif() endif()
if(CONFIG_BLE_MESH_V11_SUPPORT) if(CONFIG_BLE_MESH_V11_SUPPORT)
add_prebuilt_library(ble_mesh "esp_ble_mesh/lib/lib/${idf_target}/libble_mesh.a") if(NOT CONFIG_BLE_MESH_COMPRESSED_LOG_ENABLE)
target_link_libraries(${COMPONENT_LIB} PRIVATE ble_mesh) 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() endif()
endfunction() endfunction()
components/bt/esp_ble_mesh/lib/ext.c
+1
View File
@@ -5096,6 +5096,7 @@ void bt_mesh_lib_ext_func_dummy_call(void)
int bt_mesh_v11_ext_init(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), return bt_mesh_v11_init(&bt_mesh_ext_cfg, sizeof(bt_mesh_ext_cfg),
&bt_mesh_ext_func, sizeof(bt_mesh_ext_func)); &bt_mesh_ext_func, sizeof(bt_mesh_ext_func));
} }
components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h
+2
View File
@@ -26,6 +26,8 @@ int bt_mesh_v11_init(const void *cfg, size_t cfg_size,
int bt_mesh_v11_deinit(void); 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_SEND_SEGMENTED BIT(0)
#define BLE_MESH_TAG_IMMUTABLE_CRED BIT(1) #define BLE_MESH_TAG_IMMUTABLE_CRED BIT(1)
#define BLE_MESH_TAG_USE_DIRECTED BIT(2) #define BLE_MESH_TAG_USE_DIRECTED BIT(2)
components/bt/esp_ble_mesh/lib/lib
+1 -1
Submodule components/bt/esp_ble_mesh/lib/lib updated: 4ad1ccee76...d1861a6714