mirror/btstack
1
0
Fork 0
mirror of https://github.com/bluekitchen/btstack.git synced 2025-03-29 22:20:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

mesh: update beacon interval based on number of observed beacons

Browse Source
This commit is contained in:
Matthias Ringwald 2019-06-25 15:11:50 +02:00
parent caad5b3981
commit 22c60b06d6
1 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/ble/mesh/beacon.c
View File

@ -57,8 +57,9 @@
#define UNPROVISIONED_BEACON_INTERVAL_MS 5000 #define UNPROVISIONED_BEACON_INTERVAL_MS 5000
#define UNPROVISIONED_BEACON_LEN 23 #define UNPROVISIONED_BEACON_LEN 23
#define SECURE_NETWORK_BEACON_INTERVAL_MIN_MS 10000 #define SECURE_NETWORK_BEACON_INTERVAL_MIN_MS 10000
#define SECURE_NETWORK_BEACON_LEN 22 #define SECURE_NETWORK_BEACON_INTERVAL_MAX_MS 600000
#define SECURE_NETWORK_BEACON_LEN 22
// beacon // beacon
static uint8_t mesh_beacon_data[29]; static uint8_t mesh_beacon_data[29];
@ -130,6 +131,29 @@ static void mesh_secure_network_beacon_setup(mesh_network_key_t * mesh_network_k
&mesh_beacon_data[1], mesh_secure_network_beacon_auth_value, &mesh_secure_network_beacon_auth_value_calculated, mesh_network_key); &mesh_beacon_data[1], mesh_secure_network_beacon_auth_value, &mesh_secure_network_beacon_auth_value_calculated, mesh_network_key);
} }
static void mesh_secure_network_beacon_update_interval(mesh_network_key_t * subnet){
uint32_t min_observation_period_ms = 2 * subnet->beacon_interval_ms;
uint32_t actual_observation_period = btstack_time_delta(btstack_run_loop_get_time_ms(), subnet->beacon_observation_start_ms);
// The Observation Period in seconds should typically be double the typical Beacon Interval.
if (actual_observation_period < min_observation_period_ms) return;
// Expected Number of Beacons (1 beacon per 10 seconds)
uint16_t expected_number_of_beacons = actual_observation_period / SECURE_NETWORK_BEACON_INTERVAL_MIN_MS;
// Beacon Interval = Observation Period * (Observed Number of Beacons + 1) / Expected Number of Beacons
uint32_t new_beacon_interval = actual_observation_period * (subnet->beacon_observation_counter + 1) / expected_number_of_beacons;
if (new_beacon_interval > SECURE_NETWORK_BEACON_INTERVAL_MAX_MS){
new_beacon_interval = SECURE_NETWORK_BEACON_INTERVAL_MAX_MS;
}
else if (new_beacon_interval < SECURE_NETWORK_BEACON_INTERVAL_MIN_MS){
new_beacon_interval = SECURE_NETWORK_BEACON_INTERVAL_MAX_MS;
}
subnet->beacon_interval_ms = new_beacon_interval;
log_info("New beacon interval %u seconds", (int) (subnet->beacon_interval_ms / 1000));
}
static void mesh_secure_network_beacon_run(btstack_timer_source_t * ts){ static void mesh_secure_network_beacon_run(btstack_timer_source_t * ts){
UNUSED(ts); UNUSED(ts);
@ -142,7 +166,8 @@ static void mesh_secure_network_beacon_run(btstack_timer_source_t * ts){
mesh_network_key_t * subnet = mesh_network_key_iterator_get_next(&it); mesh_network_key_t * subnet = mesh_network_key_iterator_get_next(&it);
switch (subnet->beacon_state){ switch (subnet->beacon_state){
case MESH_SECURE_NETWORK_BEACON_W4_INTERVAL: case MESH_SECURE_NETWORK_BEACON_W4_INTERVAL:
// TODO: calculate beacon interval // update beacon interval
mesh_secure_network_beacon_update_interval(subnet);
// send new beacon // send new beacon
subnet->beacon_state = MESH_SECURE_NETWORK_BEACON_W2_AUTH_VALUE; subnet->beacon_state = MESH_SECURE_NETWORK_BEACON_W2_AUTH_VALUE;