espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 18:57:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

ble_mesh: fix postponing storage deadline indefinitely

Browse Source
This commit is contained in:
lly
2019-09-02 14:17:47 +08:00
parent 18b873b2e3
commit 6b7b9d1550
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
components/bt/esp_ble_mesh/mesh_core/settings.c
View File

@ -846,7 +846,7 @@ int settings_core_commit(void)
static void schedule_store(int flag) static void schedule_store(int flag)
{ {
s32_t timeout; s32_t timeout, remaining;
bt_mesh_atomic_set_bit(bt_mesh.flags, flag); bt_mesh_atomic_set_bit(bt_mesh.flags, flag);
@ -861,6 +861,12 @@ static void schedule_store(int flag)
timeout = K_SECONDS(CONFIG_BLE_MESH_STORE_TIMEOUT); timeout = K_SECONDS(CONFIG_BLE_MESH_STORE_TIMEOUT);
} }
remaining = k_delayed_work_remaining_get(&pending_store);
if (remaining && remaining < timeout) {
BT_DBG("Not rescheduling due to existing earlier deadline");
return;
}
BT_DBG("Waiting %d seconds", timeout / MSEC_PER_SEC); BT_DBG("Waiting %d seconds", timeout / MSEC_PER_SEC);
if (timeout) { if (timeout) {