diff --git a/main/settingsutils.cpp b/main/settingsutils.cpp index e69de29..1960411 100644 --- a/main/settingsutils.cpp +++ b/main/settingsutils.cpp @@ -0,0 +1,45 @@ +#include "settingsutils.h" + +// esp-idf includes +#include + +// local includes +#include "globals.h" +#include "presets.h" + +namespace { +void switchProfile(uint8_t index) +{ +#ifdef SIMPLIFIED_TRIGGER_TRIGGERONPRESET + if (index == SIMPLIFIED_TRIGGER_TRIGGERONPRESET) + { + simplified = true; +#ifdef SETTINGSUTILS_PLUGIN +#include SETTINGSUTILS_PLUGIN +#endif + return; + } +#endif + + settings = presets::defaultSettings; + stringSettings = presets::makeDefaultStringSettings(); + + if (!settingsPersister.openProfile(index)) + { + ESP_LOGE("BOBBY", "openProfile() failed"); + return; + } + + if (!settingsPersister.load(settings)) + { + ESP_LOGE("BOBBY", "load() for settings failed"); + return; + } + + if (!settingsPersister.load(stringSettings)) + { + ESP_LOGE("BOBBY", "load() for stringSettings failed"); + return; + } +} +} // namespace diff --git a/main/settingsutils.h b/main/settingsutils.h index a72191e..84c5b79 100644 --- a/main/settingsutils.h +++ b/main/settingsutils.h @@ -1,45 +1,7 @@ #pragma once -// esp-idf includes -#include - -// local includes -#include "globals.h" -#include "presets.h" +#include namespace { -void switchProfile(uint8_t index) -{ -#ifdef SIMPLIFIED_TRIGGER_TRIGGERONPRESET - if (index == SIMPLIFIED_TRIGGER_TRIGGERONPRESET) - { - simplified = true; -#ifdef SETTINGSUTILS_PLUGIN -#include SETTINGSUTILS_PLUGIN -#endif - return; - } -#endif - - settings = presets::defaultSettings; - stringSettings = presets::makeDefaultStringSettings(); - - if (!settingsPersister.openProfile(index)) - { - ESP_LOGE("BOBBY", "openProfile() failed"); - return; - } - - if (!settingsPersister.load(settings)) - { - ESP_LOGE("BOBBY", "load() for settings failed"); - return; - } - - if (!settingsPersister.load(stringSettings)) - { - ESP_LOGE("BOBBY", "load() for stringSettings failed"); - return; - } -} +void switchProfile(uint8_t index); }