feedc0de/espconfiglib
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Add configs.loadFromFlash to reinit

Browse Source
This commit is contained in:
0xFEEDC0DE64
2022-09-07 16:18:08 +02:00
parent 0c6c5c905f
commit 81356b5828
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/configmanager.h
View File

@ -22,6 +22,9 @@ public:
#endif #endif
esp_err_t init(const char *ns); esp_err_t init(const char *ns);
esp_err_t loadFromFlash();
//bool erase(); //bool erase();
ConfigStatusReturnType reset(); ConfigStatusReturnType reset();

11
src/configmanager_priv.h
View File

@ -12,6 +12,7 @@
#define INSTANTIATE_CONFIGMANAGER_TEMPLATES(Type) \ #define INSTANTIATE_CONFIGMANAGER_TEMPLATES(Type) \
namespace espconfig { \ namespace espconfig { \
template esp_err_t ConfigManager<Type>::init(const char *ns); \ template esp_err_t ConfigManager<Type>::init(const char *ns); \
template esp_err_t ConfigManager<Type>::loadFromFlash(); \
/* template bool ConfigManager<Type>::erase(); */ \ /* template bool ConfigManager<Type>::erase(); */ \
template ConfigStatusReturnType ConfigManager<Type>::reset(); \ template ConfigStatusReturnType ConfigManager<Type>::reset(); \
template ConfigWrapperInterface *ConfigManager<Type>::findConfigByKey(std::string_view key); \ template ConfigWrapperInterface *ConfigManager<Type>::findConfigByKey(std::string_view key); \
@ -108,7 +109,13 @@ esp_err_t ConfigManager<ConfigContainer>::init(const char *ns)
ESP_LOGI(TAG, "initializing NVS took %lldms", std::chrono::floor<std::chrono::milliseconds>(after-before).count()); ESP_LOGI(TAG, "initializing NVS took %lldms", std::chrono::floor<std::chrono::milliseconds>(after-before).count());
before = espchrono::millis_clock::now(); return loadFromFlash();
}
template<typename ConfigContainer>
esp_err_t ConfigManager<ConfigContainer>::loadFromFlash()
{
const auto before = espchrono::millis_clock::now();
bool success = true; bool success = true;
ConfigContainer::callForEveryConfig([&](ConfigWrapperInterface &config){ ConfigContainer::callForEveryConfig([&](ConfigWrapperInterface &config){
@ -120,7 +127,7 @@ esp_err_t ConfigManager<ConfigContainer>::init(const char *ns)
return false; // dont abort the loop return false; // dont abort the loop
}); });
after = espchrono::millis_clock::now(); const auto after = espchrono::millis_clock::now();
ESP_LOGI(TAG, "loading all config params took %lldms", std::chrono::floor<std::chrono::milliseconds>(after-before).count()); ESP_LOGI(TAG, "loading all config params took %lldms", std::chrono::floor<std::chrono::milliseconds>(after-before).count());