DigitalInfinity/ESP32-PaxCounter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configmanager: small fixes / rework

Browse Source
This commit is contained in:
cyberman54 2021-12-27 21:03:41 +01:00
parent 6f0678f3b1
commit f8777f99f9
2 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/configmanager.h
View File

@ -8,7 +8,7 @@
extern configData_t cfg; extern configData_t cfg;
void saveConfig(bool erase); void saveConfig(bool erase);
bool loadConfig(void); void loadConfig(void);
void eraseConfig(void); void eraseConfig(void);
int version_compare(const String v1, const String v2); int version_compare(const String v1, const String v2);

41
src/configmanager.cpp
View File

@ -98,30 +98,33 @@ void saveConfig(bool erase) {
} }
// load configuration from NVRAM into RAM and make it current // load configuration from NVRAM into RAM and make it current
bool loadConfig() { void loadConfig(void) {
int readBytes = 0;
ESP_LOGI(TAG, "Loading device configuration from NVRAM..."); ESP_LOGI(TAG, "Loading device configuration from NVRAM...");
if (!nvram.begin(DEVCONFIG, true)) { if (nvram.begin(DEVCONFIG, true)) {
// load device runtime config from nvram and copy it to byte array
readBytes = nvram.getBytes(DEVCONFIG, buffer, cfgLen + cfgLen2);
nvram.end();
// check that runtime config data length matches
if (readBytes != cfgLen + cfgLen2) {
ESP_LOGE(TAG, "No valid configuration found");
migrateConfig();
}
} else {
ESP_LOGI(TAG, "NVRAM initialized, device starts with factory settings"); ESP_LOGI(TAG, "NVRAM initialized, device starts with factory settings");
eraseConfig(); eraseConfig();
} }
// simple check that runtime config data matches
// if (nvram.getBytesLength(DEVCONFIG) != (cfgLen + cfgLen2)) {
// ESP_LOGE(TAG, "Configuration invalid");
// return false;
//}
// load device runtime config from nvram and copy it to byte array
nvram.getBytes(DEVCONFIG, buffer, cfgLen + cfgLen2);
nvram.end();
// validate loaded configuration by checking magic bytes at end of array // validate loaded configuration by checking magic bytes at end of array
// if (memcmp(buffer + cfgLen, &cfgMagicBytes, cfgLen2) != 0) { if (memcmp(buffer + cfgLen, &cfgMagicBytes, cfgLen2) != 0) {
// ESP_LOGW(TAG, "No configuration found"); ESP_LOGE(TAG, "Configuration data corrupt");
// return false; eraseConfig();
//} }
// copy loaded configuration into runtime cfg struct // copy loaded configuration into runtime cfg struct
memcpy(&cfg, buffer, cfgLen); memcpy(&cfg, buffer, cfgLen);
@ -132,13 +135,13 @@ bool loadConfig() {
case -1: // device configuration belongs to newer than current firmware case -1: // device configuration belongs to newer than current firmware
ESP_LOGE(TAG, "Incompatible device configuration"); ESP_LOGE(TAG, "Incompatible device configuration");
eraseConfig(); eraseConfig();
return true; break;
case 1: // device configuration belongs to older than current firmware case 1: // device configuration belongs to older than current firmware
ESP_LOGW(TAG, "Device was updated, attempt to migrate configuration"); ESP_LOGW(TAG, "Device was updated, attempt to migrate configuration");
migrateConfig(); migrateConfig();
return true; break;
default: // device configuration version matches current firmware version default: // device configuration version matches current firmware version
return true; break; // nothing to do here
} }
} }