From 355e56ba55e9c15d3736e4e2db2d1e20eb7c0e0c Mon Sep 17 00:00:00 2001 From: luoxu Date: Tue, 27 May 2025 14:26:48 +0800 Subject: [PATCH] fix(ble_mesh): update ble 50 macro on unsupported version --- components/bt/esp_ble_mesh/core/adv.h | 1 + components/bt/esp_ble_mesh/lib/ext.c | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/components/bt/esp_ble_mesh/core/adv.h b/components/bt/esp_ble_mesh/core/adv.h index 33224d78b1..369d3cef3d 100644 --- a/components/bt/esp_ble_mesh/core/adv.h +++ b/components/bt/esp_ble_mesh/core/adv.h @@ -44,6 +44,7 @@ enum bt_mesh_adv_type { BLE_MESH_ADV_URI, BLE_MESH_ADV_BLE, BLE_MESH_ADV_PROXY_SOLIC, + BLE_MESH_ADV_TYPES_NUM, }; struct bt_mesh_adv { diff --git a/components/bt/esp_ble_mesh/lib/ext.c b/components/bt/esp_ble_mesh/lib/ext.c index b09e152c13..a2f0680c0a 100644 --- a/components/bt/esp_ble_mesh/lib/ext.c +++ b/components/bt/esp_ble_mesh/lib/ext.c @@ -85,16 +85,19 @@ uint8_t __meshlib_var_BLE_MESH_ADV_PROV = BLE_MESH_ADV_PROV; uint8_t __meshlib_var_BLE_MESH_ADV_DATA = BLE_MESH_ADV_DATA; #if CONFIG_BLE_MESH_FRIEND -uint8_t __meshlib_var_BLE_MESH_ADV_FRIEND = BLE_MESH_ADV_FRIEND; +uint8_t __meshlib_var_BLE_MESH_ADV_FRIEND = BLE_MESH_ADV_DATA; #endif #if CONFIG_BLE_MESH_RELAY_ADV_BUF -uint8_t __meshlib_var_BLE_MESH_ADV_RELAY_DATA = BLE_MESH_ADV_RELAY_DATA; +uint8_t __meshlib_var_BLE_MESH_ADV_RELAY_DATA = BLE_MESH_ADV_DATA; #endif uint8_t __meshlib_var_BLE_MESH_ADV_BEACON = BLE_MESH_ADV_BEACON; uint8_t __meshlib_var_BLE_MESH_ADV_URI = BLE_MESH_ADV_URI; #if CONFIG_BLE_MESH_SUPPORT_BLE_ADV uint8_t __meshlib_var_BLE_MESH_ADV_BLE = BLE_MESH_ADV_BLE; #endif +#if CONFIG_BLE_MESH_PROXY_SOLIC_PDU_TX +uint8_t __meshlib_var_BLE_MESH_ADV_PROXY_SOLIC = BLE_MESH_ADV_PROXY_SOLIC; +#endif uint8_t __meshlib_var_BLE_MESH_ADV_TYPES_NUM = BLE_MESH_ADV_TYPES_NUM; /* Sys utilities */