feedc0de/esp-idf
1
0
Fork 0
forked from espressif/esp-idf
Code Pull Requests Activity

fix(ble_mesh): Miscellaneous update

Browse Source
This commit is contained in:
luoxu
2024-12-09 16:29:14 +08:00
parent 8059b611c3
commit 7e41682eb3
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/esp_ble_mesh/mesh_core/beacon.c
View File

@@ -27,7 +27,12 @@
#else #else
#define UNPROVISIONED_INTERVAL K_SECONDS(5) #define UNPROVISIONED_INTERVAL K_SECONDS(5)
#endif #endif
#if CONFIG_BLE_MESH_BQB_TEST
#define PROVISIONED_INTERVAL K_SECONDS(3)
#else
#define PROVISIONED_INTERVAL K_SECONDS(10) #define PROVISIONED_INTERVAL K_SECONDS(10)
#endif
#define BEACON_TYPE_UNPROVISIONED 0x00 #define BEACON_TYPE_UNPROVISIONED 0x00
#define BEACON_TYPE_SECURE 0x01 #define BEACON_TYPE_SECURE 0x01

7
components/bt/esp_ble_mesh/mesh_core/cfg_srv.c
View File

@@ -1174,7 +1174,7 @@ static struct label *va_find(const uint8_t *label_uuid,
return match; return match;
} }
static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr) uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
{ {
struct label *update = NULL, *free_slot = NULL; struct label *update = NULL, *free_slot = NULL;
@@ -1182,6 +1182,9 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
if (update) { if (update) {
update->ref++; update->ref++;
va_store(update); va_store(update);
if (addr) {
*addr = update->addr;
}
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
@@ -1201,7 +1204,7 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
return STATUS_SUCCESS; return STATUS_SUCCESS;
} }
static uint8_t va_del(uint8_t *label_uuid, uint16_t *addr) uint8_t va_del(uint8_t *label_uuid, uint16_t *addr)
{ {
struct label *update = NULL; struct label *update = NULL;