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

Other related class use new AgValue structure

Browse Source
This commit is contained in:
samuelbles07
2024-10-19 01:35:36 +07:00
parent 2e4f4643fa
commit 399b4ca1dc
4 changed files with 69 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
examples/OneOpenAir/OpenMetrics.cpp
View File

@ -74,41 +74,50 @@ String OpenMetrics::getPayload(void) {
int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity();
if (config.hasSensorPMS1 && config.hasSensorPMS2) {
_temp = (measure.temp_1 + measure.temp_2) / 2.0f;
_hum = (measure.hum_1 + measure.hum_2) / 2.0f;
pm01 = (measure.pm01_1 + measure.pm01_2) / 2;
pm25 = (measure.pm25_1 + measure.pm25_2) / 2;
pm10 = (measure.pm10_1 + measure.pm10_2) / 2;
pm03PCount = (measure.pm03PCount_1 + measure.pm03PCount_2) / 2;
_temp = (measure.getFloat(Measurements::Temperature, false, 1) +
measure.getFloat(Measurements::Temperature, false, 2)) /
2.0f;
_hum = (measure.getFloat(Measurements::Humidity, false, 1) +
measure.getFloat(Measurements::Humidity, false, 2)) /
2.0f;
pm01 = (measure.get(Measurements::PM01, false, 1) + measure.get(Measurements::PM01, false, 2)) /
2.0f;
pm25 = (measure.get(Measurements::PM25, false, 1) + measure.get(Measurements::PM25, false, 2)) /
2.0f;
pm10 = (measure.get(Measurements::PM10, false, 1) + measure.get(Measurements::PM10, false, 2)) /
2.0f;
pm03PCount = (measure.get(Measurements::PM03_PC, false, 1) +
measure.get(Measurements::PM03_PC, false, 2)) /
2.0f;
} else {
if (ag->isOne()) {
if (config.hasSensorSHT) {
_temp = measure.Temperature;
_hum = measure.Humidity;
_temp = measure.getFloat(Measurements::Temperature, false);
_hum = measure.getFloat(Measurements::Humidity, false);
}
if (config.hasSensorPMS1) {
pm01 = measure.pm01_1;
pm25 = measure.pm25_1;
pm10 = measure.pm10_1;
pm03PCount = measure.pm03PCount_1;
pm01 = measure.get(Measurements::PM01, false);
pm25 = measure.get(Measurements::PM25, false);
pm10 = measure.get(Measurements::PM10, false);
pm03PCount = measure.get(Measurements::PM03_PC, false);
}
} else {
if (config.hasSensorPMS1) {
_temp = measure.temp_1;
_hum = measure.hum_1;
pm01 = measure.pm01_1;
pm25 = measure.pm25_1;
pm10 = measure.pm10_1;
pm03PCount = measure.pm03PCount_1;
_temp = measure.getFloat(Measurements::Temperature, false);
_hum = measure.getFloat(Measurements::Humidity, false);
pm01 = measure.get(Measurements::PM01, false);
pm25 = measure.get(Measurements::PM25, false);
pm10 = measure.get(Measurements::PM10, false);
pm03PCount = measure.get(Measurements::PM03_PC, false);
}
if (config.hasSensorPMS2) {
_temp = measure.temp_2;
_hum = measure.hum_2;
pm01 = measure.pm01_2;
pm25 = measure.pm25_2;
pm10 = measure.pm10_2;
pm03PCount = measure.pm03PCount_2;
_temp = measure.getFloat(Measurements::Temperature, false, 2);
_hum = measure.getFloat(Measurements::Humidity, false, 2);
pm01 = measure.get(Measurements::PM01, false, 2);
pm25 = measure.get(Measurements::PM25, false, 2);
pm10 = measure.get(Measurements::PM10, false, 2);
pm03PCount = measure.get(Measurements::PM03_PC, false, 2);
}
}
}