diff --git a/main/actions/resetnvsaction.cpp b/main/actions/resetnvsaction.cpp index d8b4c90..cb5f703 100644 --- a/main/actions/resetnvsaction.cpp +++ b/main/actions/resetnvsaction.cpp @@ -1,11 +1,9 @@ #include "resetnvsaction.h" -// system includes -#include -#include +// local includes +#include "newsettings.h" void ResetNVSAction::triggered() { - nvs_flash_erase(); - esp_restart(); + configs.reset(); } diff --git a/main/displays/menus/debugmenu.cpp b/main/displays/menus/debugmenu.cpp index 55871cd..c3d1ce2 100644 --- a/main/displays/menus/debugmenu.cpp +++ b/main/displays/menus/debugmenu.cpp @@ -13,8 +13,10 @@ #include "actions/loadsettingsaction.h" #include "actions/savesettingsaction.h" #include "actions/erasenvsaction.h" +#include "actions/resetnvsaction.h" #include "icons/lock.h" #include "icons/battery.h" +#include "icons/info.h" #include "debugcolorhelpers.h" #include "esptexthelpers.h" #include "accessors/settingsaccessors.h" @@ -57,6 +59,7 @@ constexpr char TEXT_TOGGLECLOUDDEBUG[] = "Cloud Debug"; constexpr char TEXT_LOADSETTINGS[] = "Load settings (old)"; constexpr char TEXT_SAVESETTINGS[] = "Save settings (old)"; constexpr char TEXT_ERASENVS[] = "Erase NVS (old)"; +constexpr char TEXT_RESET_NVS_NEW[] = "Reset NVS (new)"; constexpr char TEXT_DYNAMICMENU[] = "GUI experiments"; constexpr char TEXT_BACK[] = "Back"; } // namespace @@ -99,6 +102,8 @@ DebugMenu::DebugMenu() constructMenuItem, LoadSettingsAction>>(); constructMenuItem, SaveSettingsAction>>(); constructMenuItem, EraseNvsAction>>(); + constructMenuItem>(); + constructMenuItem, ResetNVSAction, StaticMenuItemIcon<&bobbyicons::info>>>(); constructMenuItem, PushScreenAction>>(); constructMenuItem, PopScreenAction, StaticMenuItemIcon<&espgui::icons::back>>>(); }