From b70acfae65c800ef7816c524960792c2b6fb5c7a Mon Sep 17 00:00:00 2001 From: Luo Xu Date: Mon, 27 Jul 2026 10:03:14 +0800 Subject: [PATCH 1/2] feat(ble_mesh): supported get lib version (cherry picked from commit 56f78da32c6ad68cf4408e379adf4ed6e53418a6) Co-authored-by: luoxu --- components/bt/esp_ble_mesh/CMakeLists.txt | 9 +++++++-- components/bt/esp_ble_mesh/lib/ext.c | 1 + components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/bt/esp_ble_mesh/CMakeLists.txt b/components/bt/esp_ble_mesh/CMakeLists.txt index 648bd8e3451..28016f49516 100644 --- a/components/bt/esp_ble_mesh/CMakeLists.txt +++ b/components/bt/esp_ble_mesh/CMakeLists.txt @@ -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() diff --git a/components/bt/esp_ble_mesh/lib/ext.c b/components/bt/esp_ble_mesh/lib/ext.c index 923d6f7db0b..03ab2145089 100644 --- a/components/bt/esp_ble_mesh/lib/ext.c +++ b/components/bt/esp_ble_mesh/lib/ext.c @@ -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)); } diff --git a/components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h b/components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h index d8e80b196ff..39163e7817c 100644 --- a/components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h +++ b/components/bt/esp_ble_mesh/lib/include/mesh_v1.1/utils.h @@ -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) From 269588b7cb80c7a63dbcaa477b2dce3f7771f563 Mon Sep 17 00:00:00 2001 From: luoxu Date: Tue, 28 Jul 2026 12:11:38 +0800 Subject: [PATCH 2/2] feat(ble_mesh): update lib to 79e3fee04e --- components/bt/esp_ble_mesh/lib/lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/esp_ble_mesh/lib/lib b/components/bt/esp_ble_mesh/lib/lib index 099fdcd4be7..3840712e553 160000 --- a/components/bt/esp_ble_mesh/lib/lib +++ b/components/bt/esp_ble_mesh/lib/lib @@ -1 +1 @@ -Subproject commit 099fdcd4be7fdaa376ae0e3b4aaa674559c4a278 +Subproject commit 3840712e5533b10452acea7bf86a729f5bcc17d8