PM2.5 correction

This commit is contained in:
samuelbles07
2024-12-06 20:00:43 +07:00
parent a9f7f72871
commit 391186dd59
3 changed files with 9 additions and 8 deletions

View File

@ -1194,7 +1194,7 @@ int calculateMaxPeriod(int updateInterval) {
} }
void offlineStorageUpdate() { void offlineStorageUpdate() {
if (measurements.saveLocalStorage(*ag)) { if (measurements.saveLocalStorage(*ag, configuration)) {
// blue // blue
ag->ledBar.setColor(0, 0, 255, 0); ag->ledBar.setColor(0, 0, 255, 0);
ag->ledBar.show(); ag->ledBar.show();

View File

@ -1077,7 +1077,7 @@ bool Measurements::resetLocalStorage() {
return true; return true;
} }
bool Measurements::saveLocalStorage(AirGradient &ag) { bool Measurements::saveLocalStorage(AirGradient &ag, Configuration &config) {
int spiffUsed = ((float)SPIFFS.usedBytes() / (float)SPIFFS.totalBytes()) * 100.0; int spiffUsed = ((float)SPIFFS.usedBytes() / (float)SPIFFS.totalBytes()) * 100.0;
Serial.printf("%d | %d\n", SPIFFS.totalBytes(), SPIFFS.usedBytes()); Serial.printf("%d | %d\n", SPIFFS.totalBytes(), SPIFFS.usedBytes());
Serial.printf("SPIFF used %d%%\n", spiffUsed); Serial.printf("SPIFF used %d%%\n", spiffUsed);
@ -1100,13 +1100,14 @@ bool Measurements::saveLocalStorage(AirGradient &ag) {
return false; return false;
} }
float pm25 = getCorrectedPM25(ag, config, true);
// Save new measurements // Save new measurements
file.printf("%s,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%d,%d,%d\n", ag.getCurrentTime().c_str(), file.printf("%s,%.2f,%.2f,%.2f,%.2f,%.2f,%.2f,%d,%d,%d\n", ag.getCurrentTime().c_str(),
ag.round2(_pm_03_pc[0].update.avg), ag.round2(_pm_01[0].update.avg), ag.round2(_pm_03_pc[0].update.avg), ag.round2(_pm_01[0].update.avg), ag.round2(pm25),
ag.round2(_pm_25[0].update.avg), ag.round2(_pm_10[0].update.avg), ag.round2(_pm_10[0].update.avg), ag.round2(_temperature[0].update.avg),
ag.round2(_temperature[0].update.avg), ag.round2(_humidity[0].update.avg), ag.round2(_humidity[0].update.avg), (int)round(_co2.update.avg),
(int)round(_co2.update.avg), (int)round(_tvoc.update.avg), (int)round(_tvoc.update.avg), (int)round(_nox.update.avg));
(int)round(_nox.update.avg));
Serial.println("Success save measurements to local storage"); Serial.println("Success save measurements to local storage");
return true; return true;

View File

@ -143,7 +143,7 @@ public:
Configuration &config); Configuration &config);
bool resetLocalStorage(); bool resetLocalStorage();
bool saveLocalStorage(AirGradient &ag); bool saveLocalStorage(AirGradient &ag, Configuration &config);
char *getLocalStorage(); char *getLocalStorage();
/** /**