alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'feat/ble_mesh_make_unprov_beacon_interval_configurable_v3.3' into 'release/v3.3'

Browse Source 
Feat/ble mesh make unprov beacon interval configurable (v3.3)

See merge request espressif/esp-idf!14067
This commit is contained in:
Island 2021-06-21 11:39:57 +00:00
commit 708b72190f
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
components/bt/Kconfig
View File

@ -1931,6 +1931,19 @@ if BLE_MESH
advertising bearer. This option should be enabled if PB-ADV is advertising bearer. This option should be enabled if PB-ADV is
going to be used during provisioning procedure. going to be used during provisioning procedure.
config BLE_MESH_UNPROVISIONED_BEACON_INTERVAL
int "Interval between two consecutive Unprovisioned Device Beacon"
depends on BLE_MESH_NODE && BLE_MESH_PB_ADV
default 5
default 3 if BLE_MESH_FAST_PROV
range 1 100
help
This option specifies the interval of sending two consecutive unprovisioned
device beacon, users can use this option to change the frequency of sending
unprovisioned device beacon. For example, if the value is 5, it means the
unprovisioned device beacon will send every 5 seconds. When the option of
BLE_MESH_FAST_PROV is selected, the value is better to be 3 seconds, or less.
config BLE_MESH_PB_GATT config BLE_MESH_PB_GATT
bool "Provisioning support using GATT (PB-GATT)" bool "Provisioning support using GATT (PB-GATT)"
select BLE_MESH_PROXY select BLE_MESH_PROXY

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

@ -22,11 +22,11 @@
#include "provisioner_prov.h" #include "provisioner_prov.h"
#include "provisioner_main.h" #include "provisioner_main.h"
#if defined(CONFIG_BLE_MESH_FAST_PROV) #if defined(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL)
#define UNPROVISIONED_INTERVAL K_SECONDS(3) #define UNPROVISIONED_INTERVAL K_SECONDS(CONFIG_BLE_MESH_UNPROVISIONED_BEACON_INTERVAL)
#else #else
#define UNPROVISIONED_INTERVAL K_SECONDS(5) #define UNPROVISIONED_INTERVAL K_SECONDS(5)
#endif /* CONFIG_BLE_MESH_FAST_PROV */ #endif
#define PROVISIONED_INTERVAL K_SECONDS(10) #define PROVISIONED_INTERVAL K_SECONDS(10)
#define BEACON_TYPE_UNPROVISIONED 0x00 #define BEACON_TYPE_UNPROVISIONED 0x00

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

@ -2352,7 +2352,7 @@ send_status:
if (status == STATUS_SUCCESS) { if (status == STATUS_SUCCESS) {
bt_mesh_cfg_server_state_change_t change = {0}; bt_mesh_cfg_server_state_change_t change = {0};
change.cfg_netkey_delete.net_idx = sub->net_idx; change.cfg_netkey_delete.net_idx = sub ? sub->net_idx : BLE_MESH_KEY_UNUSED;
bt_mesh_config_server_cb_evt_to_btc(BTC_BLE_MESH_EVT_CONFIG_SERVER_STATE_CHANGE, bt_mesh_config_server_cb_evt_to_btc(BTC_BLE_MESH_EVT_CONFIG_SERVER_STATE_CHANGE,
model, ctx, (const uint8_t *)&change, sizeof(change)); model, ctx, (const uint8_t *)&change, sizeof(change));
} }