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

rename isValidPMS to isValidPm

Browse Source
This commit is contained in:
Phat Nguyen
2024-08-30 19:07:31 +07:00
parent c45901706f
commit 753f22923c
8 changed files with 55 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/BASIC/OpenMetrics.cpp
View File

@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
if (utils::isValidPMS(pm01)) { if (utils::isValidPm(pm01)) {
add_metric("pm1", add_metric("pm1",
"PM1.0 concentration as measured by the AirGradient PMS " "PM1.0 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm01)); add_metric_point("", String(pm01));
} }
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
add_metric("pm2d5", add_metric("pm2d5",
"PM2.5 concentration as measured by the AirGradient PMS " "PM2.5 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm25)); add_metric_point("", String(pm25));
} }
if (utils::isValidPMS(pm10)) { if (utils::isValidPm(pm10)) {
add_metric("pm10", add_metric("pm10",
"PM10 concentration as measured by the AirGradient PMS " "PM10 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm10)); add_metric_point("", String(pm10));
} }
if (utils::isValidPMS03Count(pm03PCount)) { if (utils::isValidPm03Count(pm03PCount)) {
add_metric("pm0d3", add_metric("pm0d3",
"PM0.3 concentration as measured by the AirGradient PMS " "PM0.3 concentration as measured by the AirGradient PMS "
"sensor, in number of particules per 100 milliliters", "sensor, in number of particules per 100 milliliters",

8
examples/DiyProIndoorV3_3/OpenMetrics.cpp
View File

@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
if (utils::isValidPMS(pm01)) { if (utils::isValidPm(pm01)) {
add_metric("pm1", add_metric("pm1",
"PM1.0 concentration as measured by the AirGradient PMS " "PM1.0 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm01)); add_metric_point("", String(pm01));
} }
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
add_metric("pm2d5", add_metric("pm2d5",
"PM2.5 concentration as measured by the AirGradient PMS " "PM2.5 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm25)); add_metric_point("", String(pm25));
} }
if (utils::isValidPMS(pm10)) { if (utils::isValidPm(pm10)) {
add_metric("pm10", add_metric("pm10",
"PM10 concentration as measured by the AirGradient PMS " "PM10 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm10)); add_metric_point("", String(pm10));
} }
if (utils::isValidPMS03Count(pm03PCount)) { if (utils::isValidPm03Count(pm03PCount)) {
add_metric("pm0d3", add_metric("pm0d3",
"PM0.3 concentration as measured by the AirGradient PMS " "PM0.3 concentration as measured by the AirGradient PMS "
"sensor, in number of particules per 100 milliliters", "sensor, in number of particules per 100 milliliters",

8
examples/DiyProIndoorV4_2/OpenMetrics.cpp
View File

@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
} }
if (config.hasSensorPMS1) { if (config.hasSensorPMS1) {
if (utils::isValidPMS(pm01)) { if (utils::isValidPm(pm01)) {
add_metric("pm1", add_metric("pm1",
"PM1.0 concentration as measured by the AirGradient PMS " "PM1.0 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm01)); add_metric_point("", String(pm01));
} }
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
add_metric("pm2d5", add_metric("pm2d5",
"PM2.5 concentration as measured by the AirGradient PMS " "PM2.5 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm25)); add_metric_point("", String(pm25));
} }
if (utils::isValidPMS(pm10)) { if (utils::isValidPm(pm10)) {
add_metric("pm10", add_metric("pm10",
"PM10 concentration as measured by the AirGradient PMS " "PM10 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm10)); add_metric_point("", String(pm10));
} }
if (utils::isValidPMS03Count(pm03PCount)) { if (utils::isValidPm03Count(pm03PCount)) {
add_metric("pm0d3", add_metric("pm0d3",
"PM0.3 concentration as measured by the AirGradient PMS " "PM0.3 concentration as measured by the AirGradient PMS "
"sensor, in number of particules per 100 milliliters", "sensor, in number of particules per 100 milliliters",

8
examples/OneOpenAir/OpenMetrics.cpp
View File

@ -123,28 +123,28 @@ String OpenMetrics::getPayload(void) {
} }
if (config.hasSensorPMS1 || config.hasSensorPMS2) { if (config.hasSensorPMS1 || config.hasSensorPMS2) {
if (utils::isValidPMS(pm01)) { if (utils::isValidPm(pm01)) {
add_metric("pm1", add_metric("pm1",
"PM1.0 concentration as measured by the AirGradient PMS " "PM1.0 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm01)); add_metric_point("", String(pm01));
} }
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
add_metric("pm2d5", add_metric("pm2d5",
"PM2.5 concentration as measured by the AirGradient PMS " "PM2.5 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm25)); add_metric_point("", String(pm25));
} }
if (utils::isValidPMS(pm10)) { if (utils::isValidPm(pm10)) {
add_metric("pm10", add_metric("pm10",
"PM10 concentration as measured by the AirGradient PMS " "PM10 concentration as measured by the AirGradient PMS "
"sensor, in micrograms per cubic meter", "sensor, in micrograms per cubic meter",
"gauge", "ugm3"); "gauge", "ugm3");
add_metric_point("", String(pm10)); add_metric_point("", String(pm10));
} }
if (utils::isValidPMS03Count(pm03PCount)) { if (utils::isValidPm03Count(pm03PCount)) {
add_metric("pm0d3", add_metric("pm0d3",
"PM0.3 concentration as measured by the AirGradient PMS " "PM0.3 concentration as measured by the AirGradient PMS "
"sensor, in number of particules per 100 milliliters", "sensor, in number of particules per 100 milliliters",

6
src/AgOledDisplay.cpp
View File

@ -311,7 +311,7 @@ void OledDisplay::showDashboard(const char *status) {
} }
DISP()->setFont(u8g2_font_t0_22b_tf); DISP()->setFont(u8g2_font_t0_22b_tf);
if (config.isPmStandardInUSAQI()) { if (config.isPmStandardInUSAQI()) {
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(pm25)); sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(pm25));
} else { } else {
sprintf(strBuf, "%s", "-"); sprintf(strBuf, "%s", "-");
@ -320,7 +320,7 @@ void OledDisplay::showDashboard(const char *status) {
DISP()->setFont(u8g2_font_t0_12_tf); DISP()->setFont(u8g2_font_t0_12_tf);
DISP()->drawUTF8(55, 61, "AQI"); DISP()->drawUTF8(55, 61, "AQI");
} else { } else {
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
sprintf(strBuf, "%d", pm25); sprintf(strBuf, "%d", pm25);
} else { } else {
sprintf(strBuf, "%s", "-"); sprintf(strBuf, "%s", "-");
@ -370,7 +370,7 @@ void OledDisplay::showDashboard(const char *status) {
pm25 = (int)ag->pms5003.compensate(pm25, value.Humidity); pm25 = (int)ag->pms5003.compensate(pm25, value.Humidity);
} }
ag->display.setCursor(0, 12); ag->display.setCursor(0, 12);
if (utils::isValidPMS(pm25)) { if (utils::isValidPm(pm25)) {
snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", pm25); snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", pm25);
} else { } else {
snprintf(strBuf, sizeof(strBuf), "PM2.5:-"); snprintf(strBuf, sizeof(strBuf), "PM2.5:-");

64
src/AgValue.cpp
View File

@ -54,16 +54,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) { if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
if (config->hasSensorPMS1) { if (config->hasSensorPMS1) {
if (utils::isValidPMS(this->pm01_1)) { if (utils::isValidPm(this->pm01_1)) {
root["pm01"] = this->pm01_1; root["pm01"] = this->pm01_1;
} }
if (utils::isValidPMS(this->pm25_1)) { if (utils::isValidPm(this->pm25_1)) {
root["pm02"] = this->pm25_1; root["pm02"] = this->pm25_1;
} }
if (utils::isValidPMS(this->pm10_1)) { if (utils::isValidPm(this->pm10_1)) {
root["pm10"] = this->pm10_1; root["pm10"] = this->pm10_1;
} }
if (utils::isValidPMS03Count(this->pm03PCount_1)) { if (utils::isValidPm03Count(this->pm03PCount_1)) {
root["pm003Count"] = this->pm03PCount_1; root["pm003Count"] = this->pm03PCount_1;
} }
if (!localServer) { if (!localServer) {
@ -97,16 +97,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
} else { } else {
if (config->hasSensorPMS1 && config->hasSensorPMS2) { if (config->hasSensorPMS1 && config->hasSensorPMS2) {
if (utils::isValidPMS(this->pm01_1) && utils::isValidPMS(this->pm01_2)) { if (utils::isValidPm(this->pm01_1) && utils::isValidPm(this->pm01_2)) {
root["pm01"] = ag->round2((this->pm01_1 + this->pm01_2) / 2.0f); root["pm01"] = ag->round2((this->pm01_1 + this->pm01_2) / 2.0f);
} }
if (utils::isValidPMS(this->pm25_1) && utils::isValidPMS(this->pm25_2)) { if (utils::isValidPm(this->pm25_1) && utils::isValidPm(this->pm25_2)) {
root["pm02"] = ag->round2((this->pm25_1 + this->pm25_2) / 2.0f); root["pm02"] = ag->round2((this->pm25_1 + this->pm25_2) / 2.0f);
} }
if (utils::isValidPMS(this->pm10_1) && utils::isValidPMS(this->pm10_2)) { if (utils::isValidPm(this->pm10_1) && utils::isValidPm(this->pm10_2)) {
root["pm10"] = ag->round2((this->pm10_1 + this->pm10_2) / 2.0f); root["pm10"] = ag->round2((this->pm10_1 + this->pm10_2) / 2.0f);
} }
if (utils::isValidPMS(this->pm03PCount_1) && utils::isValidPMS(this->pm03PCount_2)) { if (utils::isValidPm(this->pm03PCount_1) && utils::isValidPm(this->pm03PCount_2)) {
root["pm003Count"] = ag->round2((this->pm03PCount_1 + this->pm03PCount_2) / 2.0f); root["pm003Count"] = ag->round2((this->pm03PCount_1 + this->pm03PCount_2) / 2.0f);
} }
@ -139,16 +139,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
if (fwMode == FW_MODE_O_1PS || fwMode == FW_MODE_O_1PST) { if (fwMode == FW_MODE_O_1PS || fwMode == FW_MODE_O_1PST) {
float val; float val;
if (config->hasSensorPMS1) { if (config->hasSensorPMS1) {
if (utils::isValidPMS(this->pm01_1)) { if (utils::isValidPm(this->pm01_1)) {
root["pm01"] = this->pm01_1; root["pm01"] = this->pm01_1;
} }
if (utils::isValidPMS(this->pm25_1)) { if (utils::isValidPm(this->pm25_1)) {
root["pm02"] = this->pm25_1; root["pm02"] = this->pm25_1;
} }
if (utils::isValidPMS(this->pm10_1)) { if (utils::isValidPm(this->pm10_1)) {
root["pm10"] = this->pm10_1; root["pm10"] = this->pm10_1;
} }
if (utils::isValidPMS03Count(this->pm03PCount_1)) { if (utils::isValidPm03Count(this->pm03PCount_1)) {
root["pm003Count"] = this->pm03PCount_1; root["pm003Count"] = this->pm03PCount_1;
} }
if (utils::isValidTemperature(this->temp_1)) { if (utils::isValidTemperature(this->temp_1)) {
@ -178,16 +178,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
} }
} }
if (config->hasSensorPMS2) { if (config->hasSensorPMS2) {
if(utils::isValidPMS(this->pm01_2)) { if(utils::isValidPm(this->pm01_2)) {
root["pm01"] = this->pm01_2; root["pm01"] = this->pm01_2;
} }
if(utils::isValidPMS(this->pm25_2)) { if(utils::isValidPm(this->pm25_2)) {
root["pm02"] = this->pm25_2; root["pm02"] = this->pm25_2;
} }
if(utils::isValidPMS(this->pm10_2)) { if(utils::isValidPm(this->pm10_2)) {
root["pm10"] = this->pm10_2; root["pm10"] = this->pm10_2;
} }
if(utils::isValidPMS03Count(this->pm03PCount_2)) { if(utils::isValidPm03Count(this->pm03PCount_2)) {
root["pm003Count"] = this->pm03PCount_2; root["pm003Count"] = this->pm03PCount_2;
} }
@ -222,16 +222,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
if (fwMode == FW_MODE_O_1P) { if (fwMode == FW_MODE_O_1P) {
float val; float val;
if (config->hasSensorPMS1) { if (config->hasSensorPMS1) {
if (utils::isValidPMS(this->pm01_1)) { if (utils::isValidPm(this->pm01_1)) {
root["pm01"] = this->pm01_1; root["pm01"] = this->pm01_1;
} }
if (utils::isValidPMS(this->pm25_1)) { if (utils::isValidPm(this->pm25_1)) {
root["pm02"] = this->pm25_1; root["pm02"] = this->pm25_1;
} }
if (utils::isValidPMS(this->pm10_1)) { if (utils::isValidPm(this->pm10_1)) {
root["pm10"] = this->pm10_1; root["pm10"] = this->pm10_1;
} }
if (utils::isValidPMS03Count(this->pm03PCount_1)) { if (utils::isValidPm03Count(this->pm03PCount_1)) {
root["pm003Count"] = this->pm03PCount_1; root["pm003Count"] = this->pm03PCount_1;
} }
if (utils::isValidTemperature(this->temp_1)) { if (utils::isValidTemperature(this->temp_1)) {
@ -259,16 +259,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
} }
} else if (config->hasSensorPMS2) { } else if (config->hasSensorPMS2) {
if(utils::isValidPMS(this->pm01_2)) { if(utils::isValidPm(this->pm01_2)) {
root["pm01"] = this->pm01_2; root["pm01"] = this->pm01_2;
} }
if(utils::isValidPMS(this->pm25_2)) { if(utils::isValidPm(this->pm25_2)) {
root["pm02"] = this->pm25_2; root["pm02"] = this->pm25_2;
} }
if(utils::isValidPMS(this->pm10_2)) { if(utils::isValidPm(this->pm10_2)) {
root["pm10"] = this->pm10_2; root["pm10"] = this->pm10_2;
} }
if(utils::isValidPMS03Count(this->pm03PCount_2)) { if(utils::isValidPm03Count(this->pm03PCount_2)) {
root["pm003Count"] = this->pm03PCount_2; root["pm003Count"] = this->pm03PCount_2;
} }
if (utils::isValidTemperature(this->temp_2)) { if (utils::isValidTemperature(this->temp_2)) {
@ -300,16 +300,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
} else { } else {
float val; float val;
if (config->hasSensorPMS1) { if (config->hasSensorPMS1) {
if(utils::isValidPMS(this->pm01_1)) { if(utils::isValidPm(this->pm01_1)) {
root["channels"]["1"]["pm01"] = this->pm01_1; root["channels"]["1"]["pm01"] = this->pm01_1;
} }
if(utils::isValidPMS(this->pm25_1)) { if(utils::isValidPm(this->pm25_1)) {
root["channels"]["1"]["pm02"] = this->pm25_1; root["channels"]["1"]["pm02"] = this->pm25_1;
} }
if(utils::isValidPMS(this->pm10_1)) { if(utils::isValidPm(this->pm10_1)) {
root["channels"]["1"]["pm10"] = this->pm10_1; root["channels"]["1"]["pm10"] = this->pm10_1;
} }
if (utils::isValidPMS03Count(this->pm03PCount_1)) { if (utils::isValidPm03Count(this->pm03PCount_1)) {
root["channels"]["1"]["pm003Count"] = this->pm03PCount_1; root["channels"]["1"]["pm003Count"] = this->pm03PCount_1;
} }
if(utils::isValidTemperature(this->temp_1)) { if(utils::isValidTemperature(this->temp_1)) {
@ -342,16 +342,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
} }
if (config->hasSensorPMS2) { if (config->hasSensorPMS2) {
float val; float val;
if (utils::isValidPMS(this->pm01_2)) { if (utils::isValidPm(this->pm01_2)) {
root["channels"]["2"]["pm01"] = this->pm01_2; root["channels"]["2"]["pm01"] = this->pm01_2;
} }
if (utils::isValidPMS(this->pm25_2)) { if (utils::isValidPm(this->pm25_2)) {
root["channels"]["2"]["pm02"] = this->pm25_2; root["channels"]["2"]["pm02"] = this->pm25_2;
} }
if (utils::isValidPMS(this->pm10_2)) { if (utils::isValidPm(this->pm10_2)) {
root["channels"]["2"]["pm10"] = this->pm10_2; root["channels"]["2"]["pm10"] = this->pm10_2;
} }
if (utils::isValidPMS03Count(this->pm03PCount_2)) { if (utils::isValidPm03Count(this->pm03PCount_2)) {
root["channels"]["2"]["pm003Count"] = this->pm03PCount_2; root["channels"]["2"]["pm003Count"] = this->pm03PCount_2;
} }
if (utils::isValidTemperature(this->temp_2)) { if (utils::isValidTemperature(this->temp_2)) {

4
src/Main/utils.cpp
View File

@ -48,14 +48,14 @@ bool utils::isValidCO2(int16_t value) {
return false; return false;
} }
bool utils::isValidPMS(int value) { bool utils::isValidPm(int value) {
if ((value >= VALID_PMS_MIN) && (value <= VALID_PMS_MAX)) { if ((value >= VALID_PMS_MIN) && (value <= VALID_PMS_MAX)) {
return true; return true;
} }
return false; return false;
} }
bool utils::isValidPMS03Count(int value) { bool utils::isValidPm03Count(int value) {
if (value >= VALID_PMS03COUNT_MIN) { if (value >= VALID_PMS03COUNT_MIN) {
return true; return true;
} }

4
src/Main/utils.h
View File

@ -14,8 +14,8 @@ public:
static bool isValidTemperature(float value); static bool isValidTemperature(float value);
static bool isValidHumidity(float value); static bool isValidHumidity(float value);
static bool isValidCO2(int16_t value); static bool isValidCO2(int16_t value);
static bool isValidPMS(int value); static bool isValidPm(int value);
static bool isValidPMS03Count(int value); static bool isValidPm03Count(int value);
static bool isValidNOx(int value); static bool isValidNOx(int value);
static bool isValidVOC(int value); static bool isValidVOC(int value);
static float getInvalidTemperature(void); static float getInvalidTemperature(void);