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

Resolve complex build failed

Browse Source
This commit is contained in:
Phat Nguyen
2024-05-09 14:56:40 +07:00
parent 0e1734b35d
commit c98d078d4c
1 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/AgConfigure.cpp
View File

@ -41,6 +41,7 @@ JSON_PROP_DEF(ledbarBrightness);
JSON_PROP_DEF(displayBrightness); JSON_PROP_DEF(displayBrightness);
JSON_PROP_DEF(co2CalibrationRequested); JSON_PROP_DEF(co2CalibrationRequested);
JSON_PROP_DEF(ledBarTestRequested); JSON_PROP_DEF(ledBarTestRequested);
JSON_PROP_DEF(lastOta);
JSONVar jconfig; JSONVar jconfig;
static bool jsonTypeInvalid(JSONVar root, String validType) { static bool jsonTypeInvalid(JSONVar root, String validType) {
@ -1090,6 +1091,17 @@ void Configuration::toConfig(const char *buf) {
logInfo("toConfig: displayBrightness changed"); logInfo("toConfig: displayBrightness changed");
} }
/** Last OTA */
if(JSON.typeof_(jconfig[jprop_lastOta]) != "number") {
isInvalid = true;
} else {
isInvalid = false;
}
if(isInvalid) {
jconfig[jprop_lastOta] = 0;
changed = true;
}
if (changed) { if (changed) {
saveConfig(); saveConfig();
} }
@ -1174,13 +1186,14 @@ int Configuration::getLastOta(void) {
logError("Current year " + String(curYear) + String(" invalid")); logError("Current year " + String(curYear) + String(" invalid"));
return -1; return -1;
} }
time_t lastOta = jconfig[jprop_lastOta];
time_t curTime = mktime(&timeInfo); time_t curTime = mktime(&timeInfo);
logInfo("Last ota time: " + String(config.lastOta)); logInfo("Last ota time: " + String(lastOta));
if (config.lastOta == 0) { if (lastOta == 0) {
return 0; return 0;
} }
int sec = curTime - config.lastOta; int sec = curTime - lastOta;
logInfo("Last ota secconds: " + String(sec)); logInfo("Last ota secconds: " + String(sec));
return sec; return sec;
} }
@ -1196,8 +1209,10 @@ void Configuration::updateLastOta(void) {
logError("updateLastOta: lolcal time invalid"); logError("updateLastOta: lolcal time invalid");
return; return;
} }
config.lastOta = mktime(&timeInfo);
logInfo("Last OTA: " + String(config.lastOta)); time_t lastOta = mktime(&timeInfo);
jconfig[jprop_lastOta] = lastOta;
logInfo("Last OTA: " + String(lastOta));
saveConfig(); saveConfig();
} }