From f2a43084973f7fd3e58029a654cf529ddf4d1ba9 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Thu, 17 Mar 2022 19:10:58 +0000 Subject: [PATCH 1/2] remove /prefs for nrf factory reset --- src/mesh/NodeDB.cpp | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 8c64c6f10..1d3367fd0 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -95,14 +95,16 @@ bool NodeDB::resetRadioConfig() nvs_flash_erase(); #endif #ifdef NRF52_SERIES - Bluefruit.begin(); + FS.rmdir_r("/prefs"); - DEBUG_MSG("Clearing bluetooth bonds!\n"); - bond_print_list(BLE_GAP_ROLE_PERIPH); - bond_print_list(BLE_GAP_ROLE_CENTRAL); + Bluefruit.begin(); - Bluefruit.Periph.clearBonds(); - Bluefruit.Central.clearBonds(); + DEBUG_MSG("Clearing bluetooth bonds!\n"); + bond_print_list(BLE_GAP_ROLE_PERIPH); + bond_print_list(BLE_GAP_ROLE_CENTRAL); + + Bluefruit.Periph.clearBonds(); + Bluefruit.Central.clearBonds(); #endif didFactoryReset = true; } From 94c12860103813615eb2ee16366d14ecbdf58198 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Thu, 17 Mar 2022 19:32:34 +0000 Subject: [PATCH 2/2] changed on 1.3 --- src/mesh/NodeDB.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesh/NodeDB.cpp b/src/mesh/NodeDB.cpp index 1d3367fd0..5bd7fe1f1 100644 --- a/src/mesh/NodeDB.cpp +++ b/src/mesh/NodeDB.cpp @@ -95,7 +95,7 @@ bool NodeDB::resetRadioConfig() nvs_flash_erase(); #endif #ifdef NRF52_SERIES - FS.rmdir_r("/prefs"); + FSCom.rmdir_r("/prefs"); Bluefruit.begin();