feedc0de/bobbycar-boardcomputer-firmware
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored settingsutils

Browse Source
This commit is contained in:
CommanderRedYT
2021-12-14 10:06:01 +01:00
parent 02999bcde1
commit aabae8b8b6
2 changed files with 47 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
main/settingsutils.cpp
View File

@ -0,0 +1,45 @@
#include "settingsutils.h"
// esp-idf includes
#include <esp_log.h>
// 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

42
main/settingsutils.h
View File

@ -1,45 +1,7 @@
#pragma once #pragma once
// esp-idf includes #include <cstdint>
#include <esp_log.h>
// local includes
#include "globals.h"
#include "presets.h"
namespace { namespace {
void switchProfile(uint8_t index) 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;
}
}
} }