espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-03 12:44:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/ble_mesh_bugs_fixed_v5.0' into 'release/v5.0'

Browse Source 
fix(ble_mesh): Miscellaneous update (v5.0)

See merge request espressif/esp-idf!35423
This commit is contained in:
Island
2024-12-12 10:53:33 +08:00
parent f924f612cf 7e41682eb3
commit bdfc959da2
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
#define UNPROVISIONED_INTERVAL K_SECONDS(5)
#endif
#if CONFIG_BLE_MESH_BQB_TEST
#define PROVISIONED_INTERVAL K_SECONDS(3)
#else
#define PROVISIONED_INTERVAL K_SECONDS(10)
#endif
#define BEACON_TYPE_UNPROVISIONED 0x00
#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;
}
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;
@@ -1182,6 +1182,9 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
if (update) {
update->ref++;
va_store(update);
if (addr) {
*addr = update->addr;
}
return STATUS_SUCCESS;
}
@@ -1201,7 +1204,7 @@ static uint8_t va_add(uint8_t *label_uuid, uint16_t *addr)
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;