2024-04-07 16:39:01 +07:00
|
|
|
#include "AgValue.h"
|
|
|
|
|
#include "AgConfigure.h"
|
|
|
|
|
#include "AirGradient.h"
|
2024-11-02 14:44:32 +07:00
|
|
|
#include "App/AppDef.h"
|
2025-03-21 04:40:27 +07:00
|
|
|
#include <cmath>
|
2025-03-26 16:18:48 +07:00
|
|
|
#include <sstream>
|
2024-04-07 16:39:01 +07:00
|
|
|
|
2024-08-15 08:04:30 +07:00
|
|
|
#define json_prop_pmFirmware "firmware"
|
2024-11-01 17:26:18 +07:00
|
|
|
#define json_prop_pm01Ae "pm01"
|
|
|
|
|
#define json_prop_pm25Ae "pm02"
|
|
|
|
|
#define json_prop_pm10Ae "pm10"
|
|
|
|
|
#define json_prop_pm01Sp "pm01Standard"
|
|
|
|
|
#define json_prop_pm25Sp "pm02Standard"
|
|
|
|
|
#define json_prop_pm10Sp "pm10Standard"
|
|
|
|
|
#define json_prop_pm25Compensated "pm02Compensated"
|
|
|
|
|
#define json_prop_pm03Count "pm003Count"
|
|
|
|
|
#define json_prop_pm05Count "pm005Count"
|
|
|
|
|
#define json_prop_pm1Count "pm01Count"
|
2024-11-01 17:46:58 +07:00
|
|
|
#define json_prop_pm25Count "pm02Count"
|
|
|
|
|
#define json_prop_pm5Count "pm50Count"
|
2024-11-01 17:26:18 +07:00
|
|
|
#define json_prop_pm10Count "pm10Count"
|
|
|
|
|
#define json_prop_temp "atmp"
|
|
|
|
|
#define json_prop_tempCompensated "atmpCompensated"
|
|
|
|
|
#define json_prop_rhum "rhum"
|
|
|
|
|
#define json_prop_rhumCompensated "rhumCompensated"
|
2024-11-01 17:44:11 +07:00
|
|
|
#define json_prop_tvoc "tvocIndex"
|
|
|
|
|
#define json_prop_tvocRaw "tvocRaw"
|
|
|
|
|
#define json_prop_nox "noxIndex"
|
|
|
|
|
#define json_prop_noxRaw "noxRaw"
|
|
|
|
|
#define json_prop_co2 "rco2"
|
2024-08-07 08:50:43 +07:00
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
Measurements::Measurements(Configuration &config) : config(config) {
|
2024-11-30 00:45:46 +07:00
|
|
|
#ifndef ESP8266
|
|
|
|
|
_resetReason = (int)ESP_RST_UNKNOWN;
|
|
|
|
|
#endif
|
2025-02-03 01:28:42 +07:00
|
|
|
|
|
|
|
|
/* Set invalid value for each measurements as default value when initialized*/
|
|
|
|
|
_temperature[0].update.avg = utils::getInvalidTemperature();
|
|
|
|
|
_temperature[1].update.avg = utils::getInvalidTemperature();
|
|
|
|
|
_humidity[0].update.avg = utils::getInvalidHumidity();
|
|
|
|
|
_humidity[1].update.avg = utils::getInvalidHumidity();
|
|
|
|
|
_co2.update.avg = utils::getInvalidCO2();
|
|
|
|
|
_tvoc.update.avg = utils::getInvalidVOC();
|
|
|
|
|
_tvoc_raw.update.avg = utils::getInvalidVOC();
|
|
|
|
|
_nox.update.avg = utils::getInvalidNOx();
|
|
|
|
|
_nox_raw.update.avg = utils::getInvalidNOx();
|
|
|
|
|
|
|
|
|
|
_pm_03_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_03_pc[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_05_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_05_pc[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_5_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_5_pc[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
|
|
|
|
|
_pm_01[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_01_sp[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_01_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_01[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_01_sp[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_01_pc[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
|
|
|
|
|
_pm_25[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_25_sp[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_25_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_25[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_25_sp[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_25_pc[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
|
|
|
|
|
_pm_10[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_10_sp[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_10_pc[0].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_10[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_10_sp[1].update.avg = utils::getInvalidPmValue();
|
|
|
|
|
_pm_10_pc[1].update.avg = utils::getInvalidPmValue();
|
2024-11-30 00:45:46 +07:00
|
|
|
}
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
void Measurements::setAirGradient(AirGradient *ag) { this->ag = ag; }
|
|
|
|
|
|
2024-10-21 00:22:50 +07:00
|
|
|
void Measurements::maxPeriod(MeasurementType type, int max) {
|
2024-10-11 22:47:43 +07:00
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case Temperature:
|
2024-10-13 23:30:03 +07:00
|
|
|
_temperature[0].update.max = max;
|
|
|
|
|
_temperature[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case Humidity:
|
2024-10-13 23:30:03 +07:00
|
|
|
_humidity[0].update.max = max;
|
|
|
|
|
_humidity[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case CO2:
|
2024-10-11 22:47:43 +07:00
|
|
|
_co2.update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOC:
|
2024-10-11 22:47:43 +07:00
|
|
|
_tvoc.update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOCRaw:
|
2024-10-11 22:47:43 +07:00
|
|
|
_tvoc_raw.update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOx:
|
2024-10-11 22:47:43 +07:00
|
|
|
_nox.update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOxRaw:
|
2024-10-11 22:47:43 +07:00
|
|
|
_nox_raw.update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM25:
|
2024-10-13 23:30:03 +07:00
|
|
|
_pm_25[0].update.max = max;
|
|
|
|
|
_pm_25[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM01:
|
2024-10-13 23:30:03 +07:00
|
|
|
_pm_01[0].update.max = max;
|
|
|
|
|
_pm_01[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM10:
|
2024-10-13 23:30:03 +07:00
|
|
|
_pm_10[0].update.max = max;
|
|
|
|
|
_pm_10[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM01_SP:
|
|
|
|
|
_pm_01_sp[0].update.max = max;
|
|
|
|
|
_pm_01_sp[1].update.max = max;
|
|
|
|
|
break;
|
|
|
|
|
case PM25_SP:
|
|
|
|
|
_pm_25_sp[0].update.max = max;
|
|
|
|
|
_pm_25_sp[1].update.max = max;
|
|
|
|
|
break;
|
|
|
|
|
case PM10_SP:
|
|
|
|
|
_pm_10_sp[0].update.max = max;
|
|
|
|
|
_pm_10_sp[1].update.max = max;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM03_PC:
|
2024-10-13 23:30:03 +07:00
|
|
|
_pm_03_pc[0].update.max = max;
|
|
|
|
|
_pm_03_pc[1].update.max = max;
|
2024-10-11 22:47:43 +07:00
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM05_PC:
|
|
|
|
|
_pm_05_pc[0].update.max = max;
|
|
|
|
|
_pm_05_pc[1].update.max = max;
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM01_PC:
|
|
|
|
|
_pm_01_pc[0].update.max = max;
|
|
|
|
|
_pm_01_pc[1].update.max = max;
|
|
|
|
|
break;
|
|
|
|
|
case PM25_PC:
|
|
|
|
|
_pm_25_pc[0].update.max = max;
|
|
|
|
|
_pm_25_pc[1].update.max = max;
|
|
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM5_PC:
|
|
|
|
|
_pm_5_pc[0].update.max = max;
|
|
|
|
|
_pm_5_pc[1].update.max = max;
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM10_PC:
|
|
|
|
|
_pm_10_pc[0].update.max = max;
|
|
|
|
|
_pm_10_pc[1].update.max = max;
|
|
|
|
|
break;
|
2024-10-11 22:47:43 +07:00
|
|
|
};
|
|
|
|
|
}
|
2024-10-11 20:54:05 +07:00
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
bool Measurements::update(MeasurementType type, int val, int ch) {
|
2024-10-14 01:25:35 +07:00
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
2024-10-13 23:30:03 +07:00
|
|
|
|
|
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
|
2024-10-11 20:54:05 +07:00
|
|
|
// Define data point source
|
|
|
|
|
IntegerValue *temporary = nullptr;
|
2024-10-23 20:55:45 +07:00
|
|
|
// Act as reference invalid value respective to target measurements
|
2024-10-22 12:50:43 +07:00
|
|
|
int invalidValue = 0;
|
2024-10-11 20:54:05 +07:00
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case CO2:
|
2024-10-11 20:54:05 +07:00
|
|
|
temporary = &_co2;
|
|
|
|
|
invalidValue = utils::getInvalidCO2();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOC:
|
2024-10-11 20:54:05 +07:00
|
|
|
temporary = &_tvoc;
|
|
|
|
|
invalidValue = utils::getInvalidVOC();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOCRaw:
|
2024-10-11 20:54:05 +07:00
|
|
|
temporary = &_tvoc_raw;
|
|
|
|
|
invalidValue = utils::getInvalidVOC();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOx:
|
2024-10-11 20:54:05 +07:00
|
|
|
temporary = &_nox;
|
|
|
|
|
invalidValue = utils::getInvalidNOx();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOxRaw:
|
2024-10-11 20:54:05 +07:00
|
|
|
temporary = &_nox_raw;
|
|
|
|
|
invalidValue = utils::getInvalidNOx();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM25:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_pm_25[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM01:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_pm_01[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM10:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_pm_10[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM01_SP:
|
|
|
|
|
temporary = &_pm_01_sp[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
|
|
|
|
case PM25_SP:
|
|
|
|
|
temporary = &_pm_25_sp[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
|
|
|
|
case PM10_SP:
|
|
|
|
|
temporary = &_pm_10_sp[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM03_PC:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_pm_03_pc[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM05_PC:
|
|
|
|
|
temporary = &_pm_05_pc[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM01_PC:
|
|
|
|
|
temporary = &_pm_01_pc[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
|
|
|
|
case PM25_PC:
|
|
|
|
|
temporary = &_pm_25_pc[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM5_PC:
|
|
|
|
|
temporary = &_pm_5_pc[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM10_PC:
|
|
|
|
|
temporary = &_pm_10_pc[ch];
|
|
|
|
|
invalidValue = utils::getInvalidPmValue();
|
|
|
|
|
break;
|
2024-10-11 20:54:05 +07:00
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
// Sanity check if measurement type is defined for integer data type or not
|
2024-10-11 20:54:05 +07:00
|
|
|
if (temporary == nullptr) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type).c_str());
|
2024-10-11 20:54:05 +07:00
|
|
|
// TODO: Just assert?
|
2024-10-13 23:30:03 +07:00
|
|
|
return false;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-13 23:30:03 +07:00
|
|
|
// Restore channel value for debugging purpose
|
|
|
|
|
ch = ch + 1;
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
if (val == invalidValue) {
|
|
|
|
|
temporary->update.invalidCounter++;
|
2024-10-21 22:37:44 +07:00
|
|
|
if (temporary->update.invalidCounter >= temporary->update.max) {
|
|
|
|
|
Serial.printf("%s{%d} invalid value update counter reached (%dx)! Setting its average value "
|
2024-10-29 23:51:19 +07:00
|
|
|
"to invalid!\n",
|
|
|
|
|
measurementTypeStr(type).c_str(), ch, temporary->update.max);
|
2024-10-21 22:37:44 +07:00
|
|
|
temporary->update.avg = invalidValue;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Still consider updating value to valid
|
|
|
|
|
return true;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Reset invalid counter when update new valid value
|
|
|
|
|
temporary->update.invalidCounter = 0;
|
2024-10-11 20:54:05 +07:00
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Add new value to the end of the list
|
|
|
|
|
temporary->listValues.push_back(val);
|
|
|
|
|
// Sum the new value
|
|
|
|
|
temporary->sumValues = temporary->sumValues + val;
|
|
|
|
|
// Remove the oldest value on the list when the list exceed max elements
|
|
|
|
|
if (temporary->listValues.size() > temporary->update.max) {
|
|
|
|
|
auto it = temporary->listValues.begin();
|
|
|
|
|
temporary->sumValues = temporary->sumValues - *it; // subtract the oldest value from sum
|
|
|
|
|
temporary->listValues.erase(it); // And remove it from the list
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
2024-10-11 22:05:03 +07:00
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Calculate average based on how many elements on the list
|
2024-10-20 19:20:17 +07:00
|
|
|
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
|
2024-10-21 00:43:04 +07:00
|
|
|
if (_debug) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type).c_str(), ch, temporary->update.avg);
|
2024-10-21 00:43:04 +07:00
|
|
|
}
|
2024-10-20 19:01:41 +07:00
|
|
|
|
|
|
|
|
return true;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
bool Measurements::update(MeasurementType type, float val, int ch) {
|
2024-10-14 01:25:35 +07:00
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
2024-10-13 23:30:03 +07:00
|
|
|
|
|
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
|
2024-10-11 20:54:05 +07:00
|
|
|
// Define data point source
|
|
|
|
|
FloatValue *temporary = nullptr;
|
2024-10-23 20:55:45 +07:00
|
|
|
// Act as reference invalid value respective to target measurements
|
2024-10-11 20:54:05 +07:00
|
|
|
float invalidValue = 0;
|
|
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case Temperature:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_temperature[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidTemperature();
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case Humidity:
|
2024-10-13 23:30:03 +07:00
|
|
|
temporary = &_humidity[ch];
|
2024-10-11 20:54:05 +07:00
|
|
|
invalidValue = utils::getInvalidHumidity();
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
// Sanity check if measurement type is defined for float data type or not
|
2024-10-11 20:54:05 +07:00
|
|
|
if (temporary == nullptr) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type).c_str());
|
2024-10-11 20:54:05 +07:00
|
|
|
// TODO: Just assert?
|
2024-10-13 23:30:03 +07:00
|
|
|
return false;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-13 23:30:03 +07:00
|
|
|
// Restore channel value for debugging purpose
|
|
|
|
|
ch = ch + 1;
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
if (val == invalidValue) {
|
|
|
|
|
temporary->update.invalidCounter++;
|
2024-10-21 22:37:44 +07:00
|
|
|
if (temporary->update.invalidCounter >= temporary->update.max) {
|
|
|
|
|
Serial.printf("%s{%d} invalid value update counter reached (%dx)! Setting its average value "
|
2024-10-29 23:51:19 +07:00
|
|
|
"to invalid!\n",
|
|
|
|
|
measurementTypeStr(type).c_str(), ch, temporary->update.max);
|
2024-10-21 22:37:44 +07:00
|
|
|
temporary->update.avg = invalidValue;
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Still consider updating value to valid
|
|
|
|
|
return true;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Reset invalid counter when update new valid value
|
|
|
|
|
temporary->update.invalidCounter = 0;
|
2024-10-11 20:54:05 +07:00
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Add new value to the end of the list
|
|
|
|
|
temporary->listValues.push_back(val);
|
|
|
|
|
// Sum the new value
|
|
|
|
|
temporary->sumValues = temporary->sumValues + val;
|
|
|
|
|
// Remove the oldest value on the list when the list exceed max elements
|
|
|
|
|
if (temporary->listValues.size() > temporary->update.max) {
|
|
|
|
|
auto it = temporary->listValues.begin();
|
|
|
|
|
temporary->sumValues = temporary->sumValues - *it; // subtract the oldest value from sum
|
|
|
|
|
temporary->listValues.erase(it); // And remove it from the list
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
2024-10-11 22:05:03 +07:00
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
// Calculate average based on how many elements on the list
|
2024-10-20 19:20:17 +07:00
|
|
|
temporary->update.avg = temporary->sumValues / (float)temporary->listValues.size();
|
2024-10-21 00:43:04 +07:00
|
|
|
if (_debug) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s{%d}: %.2f\n", measurementTypeStr(type).c_str(), ch, temporary->update.avg);
|
2024-10-21 00:43:04 +07:00
|
|
|
}
|
2024-10-20 19:01:41 +07:00
|
|
|
|
|
|
|
|
return true;
|
2024-10-11 20:54:05 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 20:04:07 +07:00
|
|
|
int Measurements::get(MeasurementType type, int ch) {
|
2024-10-14 01:25:35 +07:00
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
|
|
|
|
|
2024-10-14 01:22:44 +07:00
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
|
|
|
|
|
// Define data point source
|
|
|
|
|
IntegerValue *temporary = nullptr;
|
|
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case CO2:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_co2;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOC:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_tvoc;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOCRaw:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_tvoc_raw;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOx:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_nox;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOxRaw:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_nox_raw;
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM25:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_pm_25[ch];
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM01:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_pm_01[ch];
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM10:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_pm_10[ch];
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM03_PC:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_pm_03_pc[ch];
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
// Sanity check if measurement type is defined for integer data type or not
|
2024-10-14 01:22:44 +07:00
|
|
|
if (temporary == nullptr) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s is not defined for integer data type\n", measurementTypeStr(type).c_str());
|
2024-10-14 01:22:44 +07:00
|
|
|
// TODO: Just assert?
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
if (temporary->listValues.empty()) {
|
|
|
|
|
// Values still empty, return 0
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return temporary->listValues.back();
|
2024-10-14 01:22:44 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 20:04:07 +07:00
|
|
|
float Measurements::getFloat(MeasurementType type, int ch) {
|
2024-10-14 01:25:35 +07:00
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
|
2024-10-14 01:22:44 +07:00
|
|
|
// Define data point source
|
|
|
|
|
FloatValue *temporary = nullptr;
|
|
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case Temperature:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_temperature[ch];
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case Humidity:
|
2024-10-14 01:22:44 +07:00
|
|
|
temporary = &_humidity[ch];
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
// Sanity check if measurement type is defined for float data type or not
|
2024-10-14 01:22:44 +07:00
|
|
|
if (temporary == nullptr) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("%s is not defined for float data type\n", measurementTypeStr(type).c_str());
|
2024-10-14 01:22:44 +07:00
|
|
|
// TODO: Just assert?
|
|
|
|
|
return false;
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:01:41 +07:00
|
|
|
if (temporary->listValues.empty()) {
|
|
|
|
|
// Values still empty, return 0
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return temporary->listValues.back();
|
2024-10-14 01:22:44 +07:00
|
|
|
}
|
|
|
|
|
|
2024-11-09 23:27:29 +07:00
|
|
|
float Measurements::getAverage(MeasurementType type, int ch) {
|
|
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
|
|
|
|
|
2025-01-19 15:45:09 +07:00
|
|
|
bool undefined = false;
|
|
|
|
|
|
2024-11-09 23:27:29 +07:00
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
|
|
|
|
|
// Define data point source. Data type doesn't matter because only to get the average value
|
|
|
|
|
float measurementAverage;
|
|
|
|
|
switch (type) {
|
|
|
|
|
case CO2:
|
|
|
|
|
measurementAverage = _co2.update.avg;
|
|
|
|
|
break;
|
|
|
|
|
case TVOC:
|
|
|
|
|
measurementAverage = _tvoc.update.avg;
|
|
|
|
|
break;
|
|
|
|
|
case NOx:
|
|
|
|
|
measurementAverage = _nox.update.avg;
|
|
|
|
|
break;
|
|
|
|
|
case PM25:
|
|
|
|
|
measurementAverage = _pm_25[ch].update.avg;
|
|
|
|
|
break;
|
|
|
|
|
case Temperature:
|
|
|
|
|
measurementAverage = _temperature[ch].update.avg;
|
|
|
|
|
break;
|
|
|
|
|
case Humidity:
|
|
|
|
|
measurementAverage = _humidity[ch].update.avg;
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
// Invalidate, measurements type not handled
|
2025-01-19 15:45:09 +07:00
|
|
|
undefined = true;
|
2024-11-09 23:27:29 +07:00
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
2025-01-19 15:45:09 +07:00
|
|
|
// Sanity check if measurement type is not defined
|
|
|
|
|
if (undefined) {
|
2024-11-27 17:18:43 +01:00
|
|
|
Serial.printf("ERROR! %s is not defined on get average value function\n", measurementTypeStr(type).c_str());
|
2024-11-09 23:27:29 +07:00
|
|
|
delay(1000);
|
|
|
|
|
assert(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return measurementAverage;
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-11 22:11:26 +07:00
|
|
|
String Measurements::pms5003FirmwareVersion(int fwCode) {
|
|
|
|
|
return pms5003FirmwareVersionBase("PMS5003x", fwCode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String Measurements::pms5003TFirmwareVersion(int fwCode) {
|
|
|
|
|
return pms5003FirmwareVersionBase("PMS5003x", fwCode);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String Measurements::pms5003FirmwareVersionBase(String prefix, int fwCode) {
|
|
|
|
|
return prefix + String("-") + String(fwCode);
|
|
|
|
|
}
|
|
|
|
|
|
2024-10-19 01:32:41 +07:00
|
|
|
String Measurements::measurementTypeStr(MeasurementType type) {
|
2024-10-11 22:11:26 +07:00
|
|
|
String str;
|
|
|
|
|
switch (type) {
|
2024-10-19 01:32:41 +07:00
|
|
|
case Temperature:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "Temperature";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case Humidity:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "Humidity";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case CO2:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "CO2";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOC:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "TVOC";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case TVOCRaw:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "TVOCRaw";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOx:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "NOx";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case NOxRaw:
|
2024-10-11 22:11:26 +07:00
|
|
|
str = "NOxRaw";
|
|
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM25:
|
2024-10-22 17:13:15 +07:00
|
|
|
str = "PM25_AE";
|
2024-10-11 22:11:26 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM01:
|
2024-10-22 17:13:15 +07:00
|
|
|
str = "PM1_AE";
|
2024-10-11 22:11:26 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM10:
|
2024-10-22 17:13:15 +07:00
|
|
|
str = "PM10_AE";
|
|
|
|
|
break;
|
|
|
|
|
case PM25_SP:
|
|
|
|
|
str = "PM25_SP";
|
|
|
|
|
break;
|
|
|
|
|
case PM01_SP:
|
|
|
|
|
str = "PM1_SP";
|
|
|
|
|
break;
|
|
|
|
|
case PM10_SP:
|
|
|
|
|
str = "PM10_SP";
|
2024-10-11 22:11:26 +07:00
|
|
|
break;
|
2024-10-19 01:32:41 +07:00
|
|
|
case PM03_PC:
|
2024-10-22 17:13:15 +07:00
|
|
|
str = "PM003_PC";
|
|
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM05_PC:
|
|
|
|
|
str = "PM005_PC";
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM01_PC:
|
|
|
|
|
str = "PM01_PC";
|
|
|
|
|
break;
|
|
|
|
|
case PM25_PC:
|
|
|
|
|
str = "PM25_PC";
|
|
|
|
|
break;
|
2024-10-29 23:51:19 +07:00
|
|
|
case PM5_PC:
|
|
|
|
|
str = "PM05_PC";
|
|
|
|
|
break;
|
2024-10-22 17:13:15 +07:00
|
|
|
case PM10_PC:
|
|
|
|
|
str = "PM10_PC";
|
2024-10-11 22:11:26 +07:00
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
break;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
return str;
|
2024-10-14 01:54:55 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void Measurements::validateChannel(int ch) {
|
|
|
|
|
if (ch != 1 && ch != 2) {
|
|
|
|
|
Serial.printf("ERROR! Channel %d is undefined. Only channel 1 or 2 is the optional value!", ch);
|
|
|
|
|
delay(1000);
|
|
|
|
|
assert(0);
|
|
|
|
|
}
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
float Measurements::getCorrectedTempHum(MeasurementType type, int ch, bool forceCorrection) {
|
2025-01-23 01:21:27 +07:00
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
|
|
|
|
|
|
|
|
|
// Follow array indexing just for get address of the value type
|
|
|
|
|
ch = ch - 1;
|
|
|
|
|
bool undefined = false;
|
|
|
|
|
|
|
|
|
|
float rawValue;
|
|
|
|
|
Configuration::TempHumCorrection correction;
|
|
|
|
|
|
|
|
|
|
switch (type) {
|
|
|
|
|
case Temperature: {
|
|
|
|
|
rawValue = _temperature[ch].update.avg;
|
|
|
|
|
Configuration::TempHumCorrection tmp = config.getTempCorrection();
|
2025-01-24 09:56:01 +07:00
|
|
|
|
|
|
|
|
// Apply 'standard' correction if its defined or correction forced
|
2025-02-05 11:05:36 +07:00
|
|
|
if (tmp.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_AG_PMS5003T_2024) {
|
2025-01-24 09:56:01 +07:00
|
|
|
return ag->pms5003t_1.compensateTemp(rawValue);
|
2025-02-05 11:05:36 +07:00
|
|
|
} else if (tmp.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_NONE && forceCorrection) {
|
2025-01-23 03:33:47 +07:00
|
|
|
return ag->pms5003t_1.compensateTemp(rawValue);
|
2025-01-23 01:21:27 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
correction.algorithm = tmp.algorithm;
|
|
|
|
|
correction.intercept = tmp.intercept;
|
|
|
|
|
correction.scalingFactor = tmp.scalingFactor;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
case Humidity: {
|
|
|
|
|
rawValue = _humidity[ch].update.avg;
|
|
|
|
|
Configuration::TempHumCorrection tmp = config.getHumCorrection();
|
2025-01-24 09:56:01 +07:00
|
|
|
|
|
|
|
|
// Apply 'standard' correction if its defined or correction forced
|
2025-02-05 11:05:36 +07:00
|
|
|
if (tmp.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_AG_PMS5003T_2024) {
|
2025-01-24 09:56:01 +07:00
|
|
|
return ag->pms5003t_1.compensateHum(rawValue);
|
2025-02-05 11:05:36 +07:00
|
|
|
} else if (tmp.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_NONE && forceCorrection) {
|
2025-01-23 03:33:47 +07:00
|
|
|
return ag->pms5003t_1.compensateHum(rawValue);
|
2025-01-23 01:21:27 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
correction.algorithm = tmp.algorithm;
|
|
|
|
|
correction.intercept = tmp.intercept;
|
|
|
|
|
correction.scalingFactor = tmp.scalingFactor;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
default:
|
|
|
|
|
// Should not be called for other measurements
|
|
|
|
|
delay(1000);
|
|
|
|
|
assert(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Use raw if correction not defined
|
2025-02-05 11:05:36 +07:00
|
|
|
if (correction.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_NONE ||
|
|
|
|
|
correction.algorithm == TempHumCorrectionAlgorithm::COR_ALGO_TEMP_HUM_UNKNOWN) {
|
2025-01-23 01:21:27 +07:00
|
|
|
return rawValue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Custom correction constants
|
|
|
|
|
float corrected = (rawValue * correction.scalingFactor) + correction.intercept;
|
2025-01-24 09:56:01 +07:00
|
|
|
Serial.println("Custom correction applied");
|
2025-01-23 01:21:27 +07:00
|
|
|
|
|
|
|
|
return corrected;
|
|
|
|
|
}
|
|
|
|
|
|
2025-02-06 15:58:15 +07:00
|
|
|
float Measurements::getCorrectedPM25(bool useAvg, int ch, bool forceCorrection) {
|
2024-11-02 14:44:32 +07:00
|
|
|
float pm25;
|
2024-11-09 21:28:33 +07:00
|
|
|
float corrected;
|
2024-11-02 14:44:32 +07:00
|
|
|
float humidity;
|
|
|
|
|
float pm003Count;
|
|
|
|
|
if (useAvg) {
|
|
|
|
|
// Directly call from the index
|
2024-11-09 23:27:29 +07:00
|
|
|
int channel = ch - 1; // Array index
|
2024-11-02 14:44:32 +07:00
|
|
|
pm25 = _pm_25[channel].update.avg;
|
|
|
|
|
humidity = _humidity[channel].update.avg;
|
|
|
|
|
pm003Count = _pm_03_pc[channel].update.avg;
|
|
|
|
|
} else {
|
|
|
|
|
pm25 = get(PM25, ch);
|
|
|
|
|
humidity = getFloat(Humidity, ch);
|
|
|
|
|
pm003Count = get(PM03_PC, ch);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
Configuration::PMCorrection pmCorrection = config.getPMCorrection();
|
2024-11-09 21:28:33 +07:00
|
|
|
switch (pmCorrection.algorithm) {
|
2025-02-06 12:49:41 +07:00
|
|
|
case PMCorrectionAlgorithm::COR_ALGO_PM_UNKNOWN:
|
2025-02-06 15:58:15 +07:00
|
|
|
case PMCorrectionAlgorithm::COR_ALGO_PM_NONE: {
|
|
|
|
|
// If correction is Unknown or None, then default is None
|
|
|
|
|
// Unless forceCorrection enabled
|
|
|
|
|
if (forceCorrection) {
|
|
|
|
|
corrected = ag->pms5003.compensate(pm25, humidity);
|
|
|
|
|
} else {
|
|
|
|
|
corrected = pm25;
|
|
|
|
|
}
|
2024-11-09 21:28:33 +07:00
|
|
|
break;
|
2025-02-06 15:58:15 +07:00
|
|
|
}
|
2025-02-06 12:49:41 +07:00
|
|
|
case PMCorrectionAlgorithm::COR_ALGO_PM_EPA_2021:
|
2025-01-23 03:33:47 +07:00
|
|
|
corrected = ag->pms5003.compensate(pm25, humidity);
|
2024-11-09 21:28:33 +07:00
|
|
|
break;
|
|
|
|
|
default: {
|
2024-11-09 23:27:29 +07:00
|
|
|
// All SLR correction using the same flow, hence default condition
|
2025-01-23 03:33:47 +07:00
|
|
|
corrected = ag->pms5003.slrCorrection(pm25, pm003Count, pmCorrection.scalingFactor,
|
|
|
|
|
pmCorrection.intercept);
|
2024-11-02 14:44:32 +07:00
|
|
|
if (pmCorrection.useEPA) {
|
|
|
|
|
// Add EPA compensation on top of SLR
|
2025-01-23 03:33:47 +07:00
|
|
|
corrected = ag->pms5003.compensate(corrected, humidity);
|
2024-11-02 14:44:32 +07:00
|
|
|
}
|
|
|
|
|
}
|
2024-11-09 21:28:33 +07:00
|
|
|
}
|
2024-11-02 14:44:32 +07:00
|
|
|
|
2024-11-09 21:28:33 +07:00
|
|
|
return corrected;
|
2024-11-02 14:44:32 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-28 13:45:07 +07:00
|
|
|
Measurements::Measures Measurements::getMeasures() {
|
|
|
|
|
Measures mc;
|
2025-03-16 02:19:22 +07:00
|
|
|
mc.bootCount = _bootCount;
|
|
|
|
|
mc.freeHeap = ESP.getFreeHeap();
|
|
|
|
|
// co2, tvoc, nox
|
|
|
|
|
mc.co2 = _co2.update.avg;
|
|
|
|
|
mc.tvoc = _tvoc.update.avg;
|
|
|
|
|
mc.tvoc_raw = _tvoc_raw.update.avg;
|
|
|
|
|
mc.nox = _nox.update.avg;
|
|
|
|
|
mc.nox_raw = _nox_raw.update.avg;
|
|
|
|
|
// Temperature & Humidity
|
|
|
|
|
mc.temperature[0] = _temperature[0].update.avg;
|
|
|
|
|
mc.humidity[0] = _humidity[0].update.avg;
|
|
|
|
|
mc.temperature[1] = _temperature[1].update.avg;
|
|
|
|
|
mc.humidity[1] = _humidity[1].update.avg;
|
|
|
|
|
// PM atmospheric
|
|
|
|
|
mc.pm_01[0] = _pm_01[0].update.avg;
|
|
|
|
|
mc.pm_25[0] = _pm_25[0].update.avg;
|
|
|
|
|
mc.pm_10[0] = _pm_10[0].update.avg;
|
|
|
|
|
mc.pm_01[1] = _pm_01[1].update.avg;
|
|
|
|
|
mc.pm_25[1] = _pm_25[1].update.avg;
|
|
|
|
|
mc.pm_10[1] = _pm_10[1].update.avg;
|
|
|
|
|
// PM standard particle
|
|
|
|
|
mc.pm_01_sp[0] = _pm_01_sp[0].update.avg;
|
|
|
|
|
mc.pm_25_sp[0] = _pm_25_sp[0].update.avg;
|
|
|
|
|
mc.pm_10_sp[0] = _pm_10_sp[0].update.avg;
|
|
|
|
|
mc.pm_01_sp[1] = _pm_01_sp[1].update.avg;
|
|
|
|
|
mc.pm_25_sp[1] = _pm_25_sp[1].update.avg;
|
|
|
|
|
mc.pm_10_sp[1] = _pm_10_sp[1].update.avg;
|
|
|
|
|
// Particle Count
|
|
|
|
|
mc.pm_03_pc[0] = _pm_03_pc[0].update.avg;
|
|
|
|
|
mc.pm_05_pc[0] = _pm_05_pc[0].update.avg;
|
|
|
|
|
mc.pm_01_pc[0] = _pm_01_pc[0].update.avg;
|
|
|
|
|
mc.pm_25_pc[0] = _pm_25_pc[0].update.avg;
|
|
|
|
|
mc.pm_5_pc[0] = _pm_5_pc[0].update.avg;
|
|
|
|
|
mc.pm_10_pc[0] = _pm_10_pc[0].update.avg;
|
|
|
|
|
mc.pm_03_pc[1] = _pm_03_pc[1].update.avg;
|
|
|
|
|
mc.pm_05_pc[1] = _pm_05_pc[1].update.avg;
|
|
|
|
|
mc.pm_01_pc[1] = _pm_01_pc[1].update.avg;
|
|
|
|
|
mc.pm_25_pc[1] = _pm_25_pc[1].update.avg;
|
|
|
|
|
mc.pm_5_pc[1] = _pm_5_pc[1].update.avg;
|
|
|
|
|
mc.pm_10_pc[1] = _pm_10_pc[1].update.avg;
|
|
|
|
|
|
|
|
|
|
return mc;
|
|
|
|
|
}
|
|
|
|
|
|
2025-03-28 13:45:07 +07:00
|
|
|
std::string Measurements::buildMeasuresPayload(Measures &mc) {
|
2025-03-26 16:18:48 +07:00
|
|
|
std::ostringstream oss;
|
2025-03-16 02:19:22 +07:00
|
|
|
|
|
|
|
|
// CO2
|
|
|
|
|
if (utils::isValidCO2(mc.co2)) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.co2);
|
2025-03-16 02:19:22 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
2025-03-16 02:19:22 +07:00
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
// Temperature
|
2025-03-21 04:40:27 +07:00
|
|
|
if (utils::isValidTemperature(mc.temperature[0]) && utils::isValidTemperature(mc.temperature[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
float temp = (mc.temperature[0] + mc.temperature[1]) / 2.0f;
|
|
|
|
|
oss << std::round(temp * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidTemperature(mc.temperature[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.temperature[0] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidTemperature(mc.temperature[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.temperature[1] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
2025-03-16 02:19:22 +07:00
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-21 04:40:27 +07:00
|
|
|
// Humidity
|
|
|
|
|
if (utils::isValidHumidity(mc.humidity[0]) && utils::isValidHumidity(mc.humidity[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
float hum = (mc.humidity[0] + mc.humidity[1]) / 2.0f;
|
|
|
|
|
oss << std::round(hum * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidHumidity(mc.humidity[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.humidity[0] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidHumidity(mc.humidity[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.humidity[1] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-21 04:40:27 +07:00
|
|
|
/// PM1.0 atmospheric environment
|
|
|
|
|
if (utils::isValidPm(mc.pm_01[0]) && utils::isValidPm(mc.pm_01[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
float pm01 = (mc.pm_01[0] + mc.pm_01[1]) / 2.0f;
|
|
|
|
|
oss << std::round(pm01 * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_01[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_01[0] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_01[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_01[1] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-21 04:40:27 +07:00
|
|
|
/// PM2.5 atmospheric environment
|
|
|
|
|
if (utils::isValidPm(mc.pm_25[0]) && utils::isValidPm(mc.pm_25[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
float pm25 = (mc.pm_25[0] + mc.pm_25[1]) / 2.0f;
|
|
|
|
|
oss << std::round(pm25 * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_25[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_25[0] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_25[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_25[1] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-21 04:40:27 +07:00
|
|
|
/// PM10 atmospheric environment
|
|
|
|
|
if (utils::isValidPm(mc.pm_10[0]) && utils::isValidPm(mc.pm_10[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
float pm10 = (mc.pm_10[0] + mc.pm_10[1]) / 2.0f;
|
|
|
|
|
oss << std::round(pm10 * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_10[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_10[0] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
} else if (utils::isValidPm(mc.pm_10[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_10[1] * 10);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-31 15:26:34 +07:00
|
|
|
// TVOC
|
|
|
|
|
if (utils::isValidVOC(mc.tvoc)) {
|
|
|
|
|
oss << std::round(mc.tvoc);
|
2025-03-26 16:18:48 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-31 15:26:34 +07:00
|
|
|
// NOx
|
|
|
|
|
if (utils::isValidNOx(mc.nox)) {
|
|
|
|
|
oss << std::round(mc.nox);
|
2025-03-26 16:18:48 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
oss << ",";
|
|
|
|
|
|
2025-03-21 04:40:27 +07:00
|
|
|
/// PM 0.3 particle count
|
2025-03-21 08:46:14 +07:00
|
|
|
if (utils::isValidPm03Count(mc.pm_03_pc[0]) && utils::isValidPm03Count(mc.pm_03_pc[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round((mc.pm_03_pc[0] + mc.pm_03_pc[1]) / 2.0f);
|
2025-03-21 08:46:14 +07:00
|
|
|
} else if (utils::isValidPm03Count(mc.pm_03_pc[0])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_03_pc[0]);
|
2025-03-21 08:46:14 +07:00
|
|
|
} else if (utils::isValidPm03Count(mc.pm_03_pc[1])) {
|
2025-03-26 16:18:48 +07:00
|
|
|
oss << std::round(mc.pm_03_pc[1]);
|
2025-03-21 04:40:27 +07:00
|
|
|
}
|
|
|
|
|
|
2025-04-07 16:29:15 +07:00
|
|
|
oss << ",";
|
|
|
|
|
|
|
|
|
|
if (mc.signal < 0) {
|
|
|
|
|
oss << mc.signal;
|
|
|
|
|
}
|
|
|
|
|
|
2025-03-26 16:18:48 +07:00
|
|
|
return oss.str();
|
2025-03-16 02:19:22 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi) {
|
2024-10-17 00:53:49 +07:00
|
|
|
JSONVar root;
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
|
|
|
|
|
root = buildIndoor(localServer);
|
2024-10-17 00:53:49 +07:00
|
|
|
} else {
|
2025-01-23 03:33:47 +07:00
|
|
|
root = buildOutdoor(localServer, fwMode);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// CO2
|
2024-10-20 19:20:17 +07:00
|
|
|
if (config.hasSensorS8 && utils::isValidCO2(_co2.update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
root[json_prop_co2] = ag->round2(_co2.update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// TVOx and NOx
|
|
|
|
|
if (config.hasSensorSGP) {
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidVOC(_tvoc.update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
root[json_prop_tvoc] = ag->round2(_tvoc.update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidVOC(_tvoc_raw.update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
root[json_prop_tvocRaw] = ag->round2(_tvoc_raw.update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidNOx(_nox.update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
root[json_prop_nox] = ag->round2(_nox.update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidNOx(_nox_raw.update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
root[json_prop_noxRaw] = ag->round2(_nox_raw.update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2024-11-21 02:30:03 +07:00
|
|
|
root["boot"] = _bootCount;
|
|
|
|
|
root["bootCount"] = _bootCount;
|
2024-10-17 00:53:49 +07:00
|
|
|
root["wifi"] = rssi;
|
|
|
|
|
|
|
|
|
|
if (localServer) {
|
2025-01-23 03:33:47 +07:00
|
|
|
if (ag->isOne()) {
|
2024-10-17 00:53:49 +07:00
|
|
|
root["ledMode"] = config.getLedBarModeName();
|
|
|
|
|
}
|
2025-01-23 03:33:47 +07:00
|
|
|
root["serialno"] = ag->deviceId();
|
|
|
|
|
root["firmware"] = ag->getVersion();
|
2024-10-17 00:53:49 +07:00
|
|
|
root["model"] = AgFirmwareModeName(fwMode);
|
2024-11-30 00:45:46 +07:00
|
|
|
} else {
|
|
|
|
|
#ifndef ESP8266
|
|
|
|
|
root["resetReason"] = _resetReason;
|
|
|
|
|
root["freeHeap"] = ESP.getFreeHeap();
|
|
|
|
|
#endif
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
String result = JSON.stringify(root);
|
2024-10-21 00:43:04 +07:00
|
|
|
Serial.printf("\n---- PAYLOAD\n %s \n-----\n", result.c_str());
|
2024-10-17 00:53:49 +07:00
|
|
|
return result;
|
|
|
|
|
}
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
JSONVar Measurements::buildOutdoor(bool localServer, AgFirmwareMode fwMode) {
|
2024-10-17 00:53:49 +07:00
|
|
|
JSONVar outdoor;
|
|
|
|
|
if (fwMode == FW_MODE_O_1P || fwMode == FW_MODE_O_1PS || fwMode == FW_MODE_O_1PST) {
|
|
|
|
|
// buildPMS params:
|
|
|
|
|
/// Because only have 1 PMS, allCh is set to false
|
|
|
|
|
/// But enable temp hum from PMS
|
|
|
|
|
/// compensated values if requested by local server
|
|
|
|
|
/// Set ch based on hasSensorPMSx
|
|
|
|
|
if (config.hasSensorPMS1) {
|
2025-01-23 03:33:47 +07:00
|
|
|
outdoor = buildPMS(1, false, true, localServer);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (!localServer) {
|
2025-01-23 03:33:47 +07:00
|
|
|
outdoor[json_prop_pmFirmware] =
|
|
|
|
|
pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
} else {
|
2025-01-23 03:33:47 +07:00
|
|
|
outdoor = buildPMS(2, false, true, localServer);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (!localServer) {
|
2025-01-23 03:33:47 +07:00
|
|
|
outdoor[json_prop_pmFirmware] =
|
|
|
|
|
pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion());
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
// FW_MODE_O_1PPT && FW_MODE_O_1PP: Outdoor monitor that have 2 PMS sensor
|
|
|
|
|
// buildPMS params:
|
|
|
|
|
/// Have 2 PMS sensor, allCh is set to true (ch params ignored)
|
|
|
|
|
/// Enable temp hum from PMS
|
|
|
|
|
/// compensated values if requested by local server
|
2025-01-23 03:33:47 +07:00
|
|
|
outdoor = buildPMS(1, true, true, localServer);
|
2024-10-17 00:53:49 +07:00
|
|
|
// PMS5003T version
|
|
|
|
|
if (!localServer) {
|
|
|
|
|
outdoor["channels"]["1"][json_prop_pmFirmware] =
|
2025-01-23 03:33:47 +07:00
|
|
|
pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
|
2024-10-17 00:53:49 +07:00
|
|
|
outdoor["channels"]["2"][json_prop_pmFirmware] =
|
2025-01-23 03:33:47 +07:00
|
|
|
pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion());
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return outdoor;
|
|
|
|
|
}
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
JSONVar Measurements::buildIndoor(bool localServer) {
|
2024-10-17 00:53:49 +07:00
|
|
|
JSONVar indoor;
|
|
|
|
|
|
|
|
|
|
if (config.hasSensorPMS1) {
|
|
|
|
|
// buildPMS params:
|
|
|
|
|
/// PMS channel 1 (indoor only have 1 PMS; hence allCh false)
|
|
|
|
|
/// Not include temperature and humidity from PMS sensor
|
2025-02-06 15:58:15 +07:00
|
|
|
/// Include compensated calculation
|
|
|
|
|
indoor = buildPMS(1, false, false, true);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (!localServer) {
|
|
|
|
|
// Indoor is using PMS5003
|
2025-01-23 03:33:47 +07:00
|
|
|
indoor[json_prop_pmFirmware] = this->pms5003FirmwareVersion(ag->pms5003.getFirmwareVersion());
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (config.hasSensorSHT) {
|
|
|
|
|
// Add temperature
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidTemperature(_temperature[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
indoor[json_prop_temp] = ag->round2(_temperature[0].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (localServer) {
|
2025-01-24 09:56:01 +07:00
|
|
|
indoor[json_prop_tempCompensated] = ag->round2(getCorrectedTempHum(Temperature));
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Add humidity
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidHumidity(_humidity[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
indoor[json_prop_rhum] = ag->round2(_humidity[0].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (localServer) {
|
2025-01-24 09:56:01 +07:00
|
|
|
indoor[json_prop_rhumCompensated] = ag->round2(getCorrectedTempHum(Humidity));
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return indoor;
|
|
|
|
|
}
|
|
|
|
|
|
2025-01-23 03:33:47 +07:00
|
|
|
JSONVar Measurements::buildPMS(int ch, bool allCh, bool withTempHum, bool compensate) {
|
2024-10-17 00:53:49 +07:00
|
|
|
JSONVar pms;
|
|
|
|
|
|
|
|
|
|
// When only one of the channel
|
|
|
|
|
if (allCh == false) {
|
|
|
|
|
// Sanity check to validate channel, assert if invalid
|
|
|
|
|
validateChannel(ch);
|
|
|
|
|
|
|
|
|
|
// Follow array indexing just for get address of the value type
|
2025-02-06 15:58:15 +07:00
|
|
|
int chIndex = ch - 1;
|
2024-10-17 00:53:49 +07:00
|
|
|
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_01[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm01Ae] = ag->round2(_pm_01[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_25[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm25Ae] = ag->round2(_pm_25[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_10[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm10Ae] = ag->round2(_pm_10[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_01_sp[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm01Sp] = ag->round2(_pm_01_sp[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_25_sp[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm25Sp] = ag->round2(_pm_25_sp[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm(_pm_10_sp[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm10Sp] = ag->round2(_pm_10_sp[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_03_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm03Count] = ag->round2(_pm_03_pc[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_05_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm05Count] = ag->round2(_pm_05_pc[chIndex].update.avg);
|
2024-10-29 23:51:19 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_01_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm1Count] = ag->round2(_pm_01_pc[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_25_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm25Count] = ag->round2(_pm_25_pc[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (_pm_5_pc[chIndex].listValues.empty() == false) {
|
2024-10-29 23:51:19 +07:00
|
|
|
// Only include pm5.0 count when values available on its list
|
|
|
|
|
// If not, means no pm5_pc available from the sensor
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_5_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm5Count] = ag->round2(_pm_5_pc[chIndex].update.avg);
|
2024-10-29 23:51:19 +07:00
|
|
|
}
|
|
|
|
|
}
|
2025-02-06 15:58:15 +07:00
|
|
|
if (_pm_10_pc[chIndex].listValues.empty() == false) {
|
2024-10-22 18:28:56 +07:00
|
|
|
// Only include pm10 count when values available on its list
|
|
|
|
|
// If not, means no pm10_pc available from the sensor
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_10_pc[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_pm10Count] = ag->round2(_pm_10_pc[chIndex].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
}
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (withTempHum) {
|
|
|
|
|
float _vc;
|
|
|
|
|
// Set temperature if valid
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidTemperature(_temperature[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_temp] = ag->round2(_temperature[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
// Compensate temperature when flag is set
|
|
|
|
|
if (compensate) {
|
2025-01-24 09:56:01 +07:00
|
|
|
_vc = getCorrectedTempHum(Temperature, ch, true);
|
2024-10-17 00:53:49 +07:00
|
|
|
if (utils::isValidTemperature(_vc)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_tempCompensated] = ag->round2(_vc);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
// Set humidity if valid
|
2025-02-06 15:58:15 +07:00
|
|
|
if (utils::isValidHumidity(_humidity[chIndex].update.avg)) {
|
|
|
|
|
pms[json_prop_rhum] = ag->round2(_humidity[chIndex].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
// Compensate relative humidity when flag is set
|
|
|
|
|
if (compensate) {
|
2025-01-24 09:56:01 +07:00
|
|
|
_vc = getCorrectedTempHum(Humidity, ch, true);
|
|
|
|
|
if (utils::isValidHumidity(_vc)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhumCompensated] = ag->round2(_vc);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2025-02-06 15:58:15 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Add pm25 compensated value only if PM2.5 and humidity value is valid
|
|
|
|
|
if (compensate) {
|
|
|
|
|
if (utils::isValidPm(_pm_25[chIndex].update.avg) &&
|
|
|
|
|
utils::isValidHumidity(_humidity[chIndex].update.avg)) {
|
|
|
|
|
float pm25 = getCorrectedPM25(true, ch, true);
|
|
|
|
|
pms[json_prop_pm25Compensated] = ag->round2(pm25);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// Directly return the json object
|
|
|
|
|
return pms;
|
|
|
|
|
};
|
|
|
|
|
|
2024-10-23 11:18:18 +07:00
|
|
|
/** Handle both channels by averaging their values; if one channel's value is not valid, skip
|
|
|
|
|
* averaging and use the valid value from the other channel */
|
2024-10-22 18:28:56 +07:00
|
|
|
|
|
|
|
|
/// PM1.0 atmospheric environment
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm(_pm_01[0].update.avg) && utils::isValidPm(_pm_01[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_01[0].update.avg + _pm_01[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Ae] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm01Ae] = ag->round2(_pm_01[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm01Ae] = ag->round2(_pm_01[1].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_01[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Ae] = ag->round2(_pm_01[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm01Ae] = ag->round2(_pm_01[0].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_01[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Ae] = ag->round2(_pm_01[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm01Ae] = ag->round2(_pm_01[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-22 18:28:56 +07:00
|
|
|
/// PM2.5 atmospheric environment
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm(_pm_25[0].update.avg) && utils::isValidPm(_pm_25[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_25[0].update.avg + _pm_25[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Ae] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Ae] = ag->round2(_pm_25[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Ae] = ag->round2(_pm_25[1].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_25[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Ae] = ag->round2(_pm_25[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Ae] = ag->round2(_pm_25[0].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_25[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Ae] = ag->round2(_pm_25[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Ae] = ag->round2(_pm_25[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-22 18:28:56 +07:00
|
|
|
/// PM10 atmospheric environment
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm(_pm_10[0].update.avg) && utils::isValidPm(_pm_10[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_10[0].update.avg + _pm_10[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Ae] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm10Ae] = ag->round2(_pm_10[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm10Ae] = ag->round2(_pm_10[1].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_10[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Ae] = ag->round2(_pm_10[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm10Ae] = ag->round2(_pm_10[0].update.avg);
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidPm(_pm_10[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Ae] = ag->round2(_pm_10[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm10Ae] = ag->round2(_pm_10[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-22 18:28:56 +07:00
|
|
|
/// PM1.0 standard particle
|
|
|
|
|
if (utils::isValidPm(_pm_01_sp[0].update.avg) && utils::isValidPm(_pm_01_sp[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_01_sp[0].update.avg + _pm_01_sp[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Sp] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm01Sp] = ag->round2(_pm_01_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm01Sp] = ag->round2(_pm_01_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_01_sp[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Sp] = ag->round2(_pm_01_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm01Sp] = ag->round2(_pm_01_sp[0].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_01_sp[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm01Sp] = ag->round2(_pm_01_sp[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm01Sp] = ag->round2(_pm_01_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// PM2.5 standard particle
|
|
|
|
|
if (utils::isValidPm(_pm_25_sp[0].update.avg) && utils::isValidPm(_pm_25_sp[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_25_sp[0].update.avg + _pm_25_sp[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Sp] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Sp] = ag->round2(_pm_25_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Sp] = ag->round2(_pm_25_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_25_sp[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Sp] = ag->round2(_pm_25_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Sp] = ag->round2(_pm_25_sp[0].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_25_sp[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Sp] = ag->round2(_pm_25_sp[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Sp] = ag->round2(_pm_25_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// PM10 standard particle
|
|
|
|
|
if (utils::isValidPm(_pm_10_sp[0].update.avg) && utils::isValidPm(_pm_10_sp[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_10_sp[0].update.avg + _pm_10_sp[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Sp] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm10Sp] = ag->round2(_pm_10_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm10Sp] = ag->round2(_pm_10_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_10_sp[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Sp] = ag->round2(_pm_10_sp[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm10Sp] = ag->round2(_pm_10_sp[0].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
} else if (utils::isValidPm(_pm_10_sp[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm10Sp] = ag->round2(_pm_10_sp[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm10Sp] = ag->round2(_pm_10_sp[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// PM003 particle count
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm03Count(_pm_03_pc[0].update.avg) &&
|
|
|
|
|
utils::isValidPm03Count(_pm_03_pc[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_03_pc[0].update.avg + _pm_03_pc[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm03Count] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm03Count] = ag->round2(_pm_03_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm03Count] = ag->round2(_pm_03_pc[1].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_03_pc[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm03Count] = ag->round2(_pm_03_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm03Count] = ag->round2(_pm_03_pc[0].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_03_pc[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm03Count] = ag->round2(_pm_03_pc[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm03Count] = ag->round2(_pm_03_pc[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-29 23:51:19 +07:00
|
|
|
/// PM0.5 particle count
|
|
|
|
|
if (utils::isValidPm03Count(_pm_05_pc[0].update.avg) &&
|
|
|
|
|
utils::isValidPm03Count(_pm_05_pc[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_05_pc[0].update.avg + _pm_05_pc[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm05Count] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm05Count] = ag->round2(_pm_05_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm05Count] = ag->round2(_pm_05_pc[1].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_05_pc[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm05Count] = ag->round2(_pm_05_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm05Count] = ag->round2(_pm_05_pc[0].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_05_pc[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm05Count] = ag->round2(_pm_05_pc[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm05Count] = ag->round2(_pm_05_pc[1].update.avg);
|
2024-10-29 23:51:19 +07:00
|
|
|
}
|
2024-10-22 18:28:56 +07:00
|
|
|
/// PM1.0 particle count
|
|
|
|
|
if (utils::isValidPm03Count(_pm_01_pc[0].update.avg) &&
|
|
|
|
|
utils::isValidPm03Count(_pm_01_pc[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_01_pc[0].update.avg + _pm_01_pc[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm1Count] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm1Count] = ag->round2(_pm_01_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm1Count] = ag->round2(_pm_01_pc[1].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_01_pc[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm1Count] = ag->round2(_pm_01_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm1Count] = ag->round2(_pm_01_pc[0].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_01_pc[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm1Count] = ag->round2(_pm_01_pc[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm1Count] = ag->round2(_pm_01_pc[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// PM2.5 particle count
|
|
|
|
|
if (utils::isValidPm03Count(_pm_25_pc[0].update.avg) &&
|
|
|
|
|
utils::isValidPm03Count(_pm_25_pc[1].update.avg)) {
|
|
|
|
|
float avg = (_pm_25_pc[0].update.avg + _pm_25_pc[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Count] = ag->round2(avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Count] = ag->round2(_pm_25_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Count] = ag->round2(_pm_25_pc[1].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_25_pc[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Count] = ag->round2(_pm_25_pc[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_pm25Count] = ag->round2(_pm_25_pc[0].update.avg);
|
2024-11-18 22:42:43 +07:00
|
|
|
} else if (utils::isValidPm03Count(_pm_25_pc[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Count] = ag->round2(_pm_25_pc[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_pm25Count] = ag->round2(_pm_25_pc[1].update.avg);
|
2024-10-22 18:28:56 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-29 23:51:19 +07:00
|
|
|
// NOTE: No need for particle count 5.0 and 10. When allCh is true, basically monitor using
|
|
|
|
|
// PM5003T, which don't have PC 5.0 and 10
|
2024-10-22 18:28:56 +07:00
|
|
|
|
2024-10-17 00:53:49 +07:00
|
|
|
if (withTempHum) {
|
|
|
|
|
/// Temperature
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidTemperature(_temperature[0].update.avg) &&
|
|
|
|
|
utils::isValidTemperature(_temperature[1].update.avg)) {
|
2024-10-17 00:53:49 +07:00
|
|
|
|
2024-10-20 19:20:17 +07:00
|
|
|
float temperature = (_temperature[0].update.avg + _temperature[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_temp] = ag->round2(temperature);
|
|
|
|
|
pms["channels"]["1"][json_prop_temp] = ag->round2(_temperature[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_temp] = ag->round2(_temperature[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate both temperature channel
|
2025-01-24 09:56:01 +07:00
|
|
|
float temp1 = getCorrectedTempHum(Temperature, 1, true);
|
|
|
|
|
float temp2 = getCorrectedTempHum(Temperature, 2, true);
|
|
|
|
|
float tempAverage = (temp1 + temp2) / 2.0f;
|
|
|
|
|
pms[json_prop_tempCompensated] = ag->round2(tempAverage);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms["channels"]["1"][json_prop_tempCompensated] = ag->round2(temp1);
|
|
|
|
|
pms["channels"]["2"][json_prop_tempCompensated] = ag->round2(temp2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidTemperature(_temperature[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_temp] = ag->round2(_temperature[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_temp] = ag->round2(_temperature[0].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate channel 1
|
2025-01-24 09:56:01 +07:00
|
|
|
float temp1 = getCorrectedTempHum(Temperature, 1, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_tempCompensated] = ag->round2(temp1);
|
|
|
|
|
pms["channels"]["1"][json_prop_tempCompensated] = ag->round2(temp1);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidTemperature(_temperature[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_temp] = ag->round2(_temperature[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_temp] = ag->round2(_temperature[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate channel 2
|
2025-01-24 09:56:01 +07:00
|
|
|
float temp2 = getCorrectedTempHum(Temperature, 2, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_tempCompensated] = ag->round2(temp2);
|
|
|
|
|
pms["channels"]["2"][json_prop_tempCompensated] = ag->round2(temp2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Relative humidity
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidHumidity(_humidity[0].update.avg) &&
|
|
|
|
|
utils::isValidHumidity(_humidity[1].update.avg)) {
|
|
|
|
|
float humidity = (_humidity[0].update.avg + _humidity[1].update.avg) / 2.0f;
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhum] = ag->round2(humidity);
|
|
|
|
|
pms["channels"]["1"][json_prop_rhum] = ag->round2(_humidity[0].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_rhum] = ag->round2(_humidity[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate both humidity channel
|
2025-01-24 09:56:01 +07:00
|
|
|
float hum1 = getCorrectedTempHum(Humidity, 1, true);
|
|
|
|
|
float hum2 = getCorrectedTempHum(Humidity, 2, true);
|
|
|
|
|
float humAverage = (hum1 + hum2) / 2.0f;
|
|
|
|
|
pms[json_prop_rhumCompensated] = ag->round2(humAverage);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms["channels"]["1"][json_prop_rhumCompensated] = ag->round2(hum1);
|
|
|
|
|
pms["channels"]["2"][json_prop_rhumCompensated] = ag->round2(hum2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidHumidity(_humidity[0].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhum] = ag->round2(_humidity[0].update.avg);
|
|
|
|
|
pms["channels"]["1"][json_prop_rhum] = ag->round2(_humidity[0].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate humidity channel 1
|
2025-01-24 09:56:01 +07:00
|
|
|
float hum1 = getCorrectedTempHum(Humidity, 1, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhumCompensated] = ag->round2(hum1);
|
|
|
|
|
pms["channels"]["1"][json_prop_rhumCompensated] = ag->round2(hum1);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
2024-10-20 19:20:17 +07:00
|
|
|
} else if (utils::isValidHumidity(_humidity[1].update.avg)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhum] = ag->round2(_humidity[1].update.avg);
|
|
|
|
|
pms["channels"]["2"][json_prop_rhum] = ag->round2(_humidity[1].update.avg);
|
2024-10-17 00:53:49 +07:00
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Compensate humidity channel 2
|
2025-01-24 09:56:01 +07:00
|
|
|
float hum2 = getCorrectedTempHum(Humidity, 2, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_rhumCompensated] = ag->round2(hum2);
|
|
|
|
|
pms["channels"]["2"][json_prop_rhumCompensated] = ag->round2(hum2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (compensate) {
|
|
|
|
|
// Add pm25 compensated value
|
|
|
|
|
/// First get both channel compensated value
|
2024-10-21 01:49:01 +07:00
|
|
|
float pm25_comp1 = utils::getInvalidPmValue();
|
|
|
|
|
float pm25_comp2 = utils::getInvalidPmValue();
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm(_pm_25[0].update.avg) &&
|
|
|
|
|
utils::isValidHumidity(_humidity[0].update.avg)) {
|
2025-02-06 15:58:15 +07:00
|
|
|
pm25_comp1 = getCorrectedPM25(true, 1, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms["channels"]["1"][json_prop_pm25Compensated] = ag->round2(pm25_comp1);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
2024-10-20 19:20:17 +07:00
|
|
|
if (utils::isValidPm(_pm_25[1].update.avg) &&
|
|
|
|
|
utils::isValidHumidity(_humidity[1].update.avg)) {
|
2025-02-06 15:58:15 +07:00
|
|
|
pm25_comp2 = getCorrectedPM25(true, 2, true);
|
2025-01-23 03:33:47 +07:00
|
|
|
pms["channels"]["2"][json_prop_pm25Compensated] = ag->round2(pm25_comp2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/// Get average or one of the channel compensated value if only one channel is valid
|
|
|
|
|
if (utils::isValidPm(pm25_comp1) && utils::isValidPm(pm25_comp2)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Compensated] = ag->round2((pm25_comp1 + pm25_comp2) / 2.0f);
|
2024-10-17 00:53:49 +07:00
|
|
|
} else if (utils::isValidPm(pm25_comp1)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Compensated] = ag->round2(pm25_comp1);
|
2024-10-17 00:53:49 +07:00
|
|
|
} else if (utils::isValidPm(pm25_comp2)) {
|
2025-01-23 03:33:47 +07:00
|
|
|
pms[json_prop_pm25Compensated] = ag->round2(pm25_comp2);
|
2024-10-17 00:53:49 +07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
return pms;
|
2024-10-21 00:43:04 +07:00
|
|
|
}
|
|
|
|
|
|
2024-11-21 02:30:03 +07:00
|
|
|
void Measurements::setDebug(bool debug) { _debug = debug; }
|
|
|
|
|
|
|
|
|
|
int Measurements::bootCount() { return _bootCount; }
|
|
|
|
|
|
2024-11-29 18:01:34 +07:00
|
|
|
void Measurements::setBootCount(int bootCount) { _bootCount = bootCount; }
|
|
|
|
|
|
2024-11-30 00:45:46 +07:00
|
|
|
#ifndef ESP8266
|
2024-11-29 18:01:34 +07:00
|
|
|
void Measurements::setResetReason(esp_reset_reason_t reason) {
|
|
|
|
|
switch (reason) {
|
|
|
|
|
case ESP_RST_UNKNOWN:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_UNKNOWN");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_POWERON:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_POWERON");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_EXT:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_EXT");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_SW:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_SW");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_PANIC:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_PANIC");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_INT_WDT:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_INT_WDT");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_TASK_WDT:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_TASK_WDT");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_WDT:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_WDT");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_BROWNOUT:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_BROWNOUT");
|
|
|
|
|
break;
|
|
|
|
|
case ESP_RST_SDIO:
|
|
|
|
|
Serial.println("Reset reason: ESP_RST_SDIO");
|
|
|
|
|
break;
|
|
|
|
|
default:
|
|
|
|
|
Serial.println("Reset reason: unknown");
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
_resetReason = (int)reason;
|
2024-11-30 00:45:46 +07:00
|
|
|
}
|
2025-03-16 02:19:22 +07:00
|
|
|
#endif
|