airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-04 11:46:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix issue EEPROM override after OTA perform by use spiffs

Browse Source
This commit is contained in:
Phat Nguyen
2024-04-30 20:51:08 +07:00
parent 88808a2ad2
commit d94d074abe
1 changed files with 53 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

72
src/AgConfigure.cpp
View File

@ -1,6 +1,14 @@
#include "AgConfigure.h" #include "AgConfigure.h"
#include "EEPROM.h"
#include "Libraries/Arduino_JSON/src/Arduino_JSON.h" #include "Libraries/Arduino_JSON/src/Arduino_JSON.h"
#if ESP32
#include "FS.h"
#include "SPIFFS.h"
#else
#include "EEPROM.h"
#endif
#define EEPROM_CONFIG_SIZE 512
#define CONFIG_FILE_NAME "/cfg.bin"
const char *CONFIGURATION_CONTROL_NAME[] = { const char *CONFIGURATION_CONTROL_NAME[] = {
[ConfigurationControlLocal] = "local", [ConfigurationControlLocal] = "local",
@ -54,10 +62,19 @@ void Configuration::saveConfig(void) {
for (int i = 0; i < sizeof(config); i++) { for (int i = 0; i < sizeof(config); i++) {
EEPROM.write(i, data[i]); EEPROM.write(i, data[i]);
} }
#else
EEPROM.writeBytes(0, &config, sizeof(config));
#endif
EEPROM.commit(); EEPROM.commit();
#else
File file = SPIFFS.open(CONFIG_FILE_NAME, "w", true);
if (file && !file.isDirectory()) {
if (file.write((const uint8_t *)&config, sizeof(config)) !=
sizeof(config)) {
logError("Write SPIFFS file failed");
}
file.close();
} else {
logError("Open SPIFFS file to write failed");
}
#endif
logInfo("Save Config"); logInfo("Save Config");
} }
@ -70,8 +87,12 @@ void Configuration::loadConfig(void) {
} }
readSuccess = true; readSuccess = true;
#else #else
if (EEPROM.readBytes(0, &config, sizeof(config)) == sizeof(config)) { File file = SPIFFS.open(CONFIG_FILE_NAME);
readSuccess = true; if (file && !file.isDirectory()) {
if (file.readBytes((char *)&config, sizeof(config)) == sizeof(config)) {
readSuccess = true;
}
file.close();
} }
#endif #endif
@ -162,7 +183,20 @@ Configuration::~Configuration() {}
* @return false Failure * @return false Failure
*/ */
bool Configuration::begin(void) { bool Configuration::begin(void) {
EEPROM.begin(512); if (sizeof(config) > EEPROM_CONFIG_SIZE) {
logError("Configuration over EEPROM_CONFIG_SIZE");
return false;
}
#ifdef ESP32
if (!SPIFFS.begin(true)) {
logError("Init SPIFFS failed");
return false;
}
#else
EEPROM.begin(EEPROM_CONFIG_SIZE);
#endif
loadConfig(); loadConfig();
printConfig(); printConfig();
@ -298,7 +332,8 @@ bool Configuration::parse(String data, bool isLocal) {
} }
if (inUSAQI != config.inUSAQI) { if (inUSAQI != config.inUSAQI) {
configLogInfo("pmStandard", getPMStandardString(config.inUSAQI), pmStandard); configLogInfo("pmStandard", getPMStandardString(config.inUSAQI),
pmStandard);
config.inUSAQI = inUSAQI; config.inUSAQI = inUSAQI;
changed = true; changed = true;
} }
@ -312,7 +347,7 @@ bool Configuration::parse(String data, bool isLocal) {
if (JSON.typeof_(root["co2CalibrationRequested"]) == "boolean") { if (JSON.typeof_(root["co2CalibrationRequested"]) == "boolean") {
co2CalibrationRequested = root["co2CalibrationRequested"]; co2CalibrationRequested = root["co2CalibrationRequested"];
if(co2CalibrationRequested) { if (co2CalibrationRequested) {
logInfo("co2CalibrationRequested: " + logInfo("co2CalibrationRequested: " +
String(co2CalibrationRequested ? "True" : "False")); String(co2CalibrationRequested ? "True" : "False"));
} }
@ -327,7 +362,7 @@ bool Configuration::parse(String data, bool isLocal) {
if (JSON.typeof_(root["ledBarTestRequested"]) == "boolean") { if (JSON.typeof_(root["ledBarTestRequested"]) == "boolean") {
ledBarTestRequested = root["ledBarTestRequested"]; ledBarTestRequested = root["ledBarTestRequested"];
if(ledBarTestRequested){ if (ledBarTestRequested) {
logInfo("ledBarTestRequested: " + logInfo("ledBarTestRequested: " +
String(ledBarTestRequested ? "True" : "False")); String(ledBarTestRequested ? "True" : "False"));
} }
@ -384,7 +419,8 @@ bool Configuration::parse(String data, bool isLocal) {
if (displayMode != config.displayMode) { if (displayMode != config.displayMode) {
changed = true; changed = true;
configLogInfo("displayMode", getDisplayModeString(config.displayMode), mode); configLogInfo("displayMode", getDisplayModeString(config.displayMode),
mode);
config.displayMode = displayMode; config.displayMode = displayMode;
} }
} else { } else {
@ -770,15 +806,15 @@ String Configuration::getPMStandardString(bool usaqi) {
return "ugm3"; return "ugm3";
} }
String Configuration::getDisplayModeString(bool dispMode) { String Configuration::getDisplayModeString(bool dispMode) {
if(dispMode){ if (dispMode) {
return String("on"); return String("on");
} }
return String("off"); return String("off");
} }
String Configuration::getAbcDayString(int value) { String Configuration::getAbcDayString(int value) {
if(value <= 0){ if (value <= 0) {
return String("off"); return String("off");
} }
return String(value); return String(value);
@ -816,10 +852,8 @@ int Configuration::getNoxLearningOffset(void) {
return config.noxLearningOffset; return config.noxLearningOffset;
} }
String Configuration::wifiSSID(void) { String Configuration::wifiSSID(void) { return "airgradient-" + ag->deviceId(); }
return "airgradient-" + ag->deviceId();
}
String Configuration::wifiPass(void) { return String("cleanair"); } String Configuration::wifiPass(void) { return String("cleanair"); }
void Configuration::setAirGradient(AirGradient *ag) { this->ag = ag;} void Configuration::setAirGradient(AirGradient *ag) { this->ag = ag; }