blackbeard420/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf synced 2025-03-09 17:19:09 -04:00
Code Issues Projects Releases Wiki Activity

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

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

See merge request espressif/esp-idf!35427
This commit is contained in:
Island 2025-01-06 15:08:31 +08:00
commit 3412026c77
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/esp_ble_mesh/core/beacon.c
View File

@ -35,7 +35,11 @@
#define UNPROV_BEACON_INTERVAL K_SECONDS(5)
#endif
#if CONFIG_BLE_MESH_BQB_TEST
#define SECURE_BEACON_INTERVAL K_SECONDS(3)
#else
#define SECURE_BEACON_INTERVAL K_SECONDS(10)
#endif
/* 3 transmissions, 20ms interval */
#define UNPROV_XMIT BLE_MESH_TRANSMIT(2, 20)

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

@ -1287,7 +1287,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;
@ -1295,6 +1295,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;
}
@ -1314,7 +1317,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;

2
components/bt/esp_ble_mesh/core/prov_common.c
View File

@ -143,7 +143,7 @@ bool bt_mesh_prov_pdu_check(uint8_t type, uint16_t length, uint8_t *reason)
static uint8_t bt_mesh_prov_buf_type_get(struct net_buf_simple *buf)
{
return buf->data[PROV_BUF_HEADROOM];
return buf->__buf[PROV_BUF_HEADROOM];
}
uint8_t node_next_xact_id(struct bt_mesh_prov_link *link)