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

fix(ble_mesh): Miscellaneous update

Browse Source 
(cherry picked from commit 589ebfc1d6189464fd5dfa8045fd4e3d88deec53)

Co-authored-by: luoxu <luoxu@espressif.com>
This commit is contained in:
Luo Xu 2024-12-04 16:23:35 +08:00 committed by BOT
parent e84fb07383
commit 2178c6a8f2
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) #define UNPROV_BEACON_INTERVAL K_SECONDS(5)
#endif #endif
#if CONFIG_BLE_MESH_BQB_TEST
#define SECURE_BEACON_INTERVAL K_SECONDS(3)
#else
#define SECURE_BEACON_INTERVAL K_SECONDS(10) #define SECURE_BEACON_INTERVAL K_SECONDS(10)
#endif
/* 3 transmissions, 20ms interval */ /* 3 transmissions, 20ms interval */
#define UNPROV_XMIT BLE_MESH_TRANSMIT(2, 20) #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; 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;
@ -1295,6 +1295,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;
} }
@ -1314,7 +1317,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;

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) 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) uint8_t node_next_xact_id(struct bt_mesh_prov_link *link)