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

Change pm25Compensated to compensated

Browse Source
This commit is contained in:
Phat Nguyen
2024-08-16 06:39:52 +07:00
parent 6cd587b008
commit f3a9c722b2
8 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/AgOledDisplay.cpp
View File

@ -306,7 +306,7 @@ void OledDisplay::showDashboard(const char *status) {
/** Draw PM2.5 value */
int pm25 = value.pm25_1;
if (config.hasSensorSHT) {
pm25 = ag->pms5003.pm25Compensated(pm25, value.Humidity);
pm25 = ag->pms5003.compensated(pm25, value.Humidity);
}
DISP()->setFont(u8g2_font_t0_22b_tf);
if (config.isPmStandardInUSAQI()) {
@ -366,7 +366,7 @@ void OledDisplay::showDashboard(const char *status) {
/** Set PM */
int pm25 = value.pm25_1;
if(config.hasSensorSHT) {
pm25 = (int)ag->pms5003.pm25Compensated(pm25, value.Humidity);
pm25 = (int)ag->pms5003.compensated(pm25, value.Humidity);
}
ag->display.setCursor(0, 12);
if (utils::isValidPMS(value.pm25_1)) {

18
src/AgValue.cpp
View File

@ -51,7 +51,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
if (config->hasSensorSHT && config->hasSensorPMS1) {
int pm25 = ag->pms5003.pm25Compensated(this->pm25_1, this->Humidity);
int pm25 = ag->pms5003.compensated(this->pm25_1, this->Humidity);
if (pm25 >= 0) {
root["pm02Compensated"] = pm25;
}
@ -92,8 +92,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
int pm25 = (ag->pms5003t_1.pm25Compensated(this->pm25_1, this->temp_1) +
ag->pms5003t_2.pm25Compensated(this->pm25_2, this->temp_2)) /
int pm25 = (ag->pms5003t_1.compensated(this->pm25_1, this->temp_1) +
ag->pms5003t_2.compensated(this->pm25_2, this->temp_2)) /
2;
root["pm02Compensated"] = pm25;
}
@ -133,7 +133,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["pm02Compensated"] = ag->pms5003t_1.pm25Compensated(this->pm25_1, this->temp_1);
root["pm02Compensated"] = ag->pms5003t_1.compensated(this->pm25_1, this->temp_1);
}
if (config->hasSensorPMS2) {
if(utils::isValidPMS(this->pm01_2)) {
@ -170,7 +170,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["pm02Compensated"] = ag->pms5003t_2.pm25Compensated(this->pm25_2, this->temp_2);
root["pm02Compensated"] = ag->pms5003t_2.compensated(this->pm25_2, this->temp_2);
}
} else {
if (fwMode == FW_MODE_O_1P) {
@ -207,7 +207,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["pm02Compensated"] = ag->pms5003t_1.pm25Compensated(this->pm25_1, this->temp_1);
root["pm02Compensated"] = ag->pms5003t_1.compensated(this->pm25_1, this->temp_1);
} else if (config->hasSensorPMS2) {
if(utils::isValidPMS(this->pm01_2)) {
root["pm01"] = this->pm01_2;
@ -241,7 +241,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["pm02Compensated"] = ag->pms5003t_1.pm25Compensated(this->pm25_1, this->temp_1);
root["pm02Compensated"] = ag->pms5003t_1.compensated(this->pm25_1, this->temp_1);
}
} else {
float val;
@ -278,7 +278,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["channels"]["1"]["pm02Compensated"] = ag->pms5003t_1.pm25Compensated(this->pm25_1, this->temp_1);
root["channels"]["1"]["pm02Compensated"] = ag->pms5003t_1.compensated(this->pm25_1, this->temp_1);
}
if (config->hasSensorPMS2) {
float val;
@ -314,7 +314,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
}
}
}
root["channels"]["2"]["pm02Compensated"] = ag->pms5003t_2.pm25Compensated(this->pm25_2, this->temp_2);
root["channels"]["2"]["pm02Compensated"] = ag->pms5003t_2.compensated(this->pm25_2, this->temp_2);
}
}
}

4
src/PMS/PMS.cpp
View File

@ -275,9 +275,9 @@ int PMSBase::pm25ToAQI(int pm02) {
*
* @param pm25 Raw PM2.5 value
* @param humidity Humidity value (%)
* @return float
* @return int
*/
int PMSBase::pm25Compensated(int pm25, float humidity) {
int PMSBase::compensated(int pm25, float humidity) {
float value;
if (humidity < 0) {
humidity = 0;

2
src/PMS/PMS.h
View File

@ -28,7 +28,7 @@ public:
uint16_t getHum(void);
int pm25ToAQI(int pm02);
int pm25Compensated(int pm25, float humidity);
int compensated(int pm25, float humidity);
private:
Stream *stream;

4
src/PMS/PMS5003.cpp
View File

@ -128,8 +128,8 @@ int PMS5003::convertPm25ToUsAqi(int pm25) { return pms.pm25ToAQI(pm25); }
* @param humidity Humidity value
* @return float
*/
int PMS5003::pm25Compensated(int pm25, float humidity) {
return pms.pm25Compensated(pm25, humidity);
int PMS5003::compensated(int pm25, float humidity) {
return pms.compensated(pm25, humidity);
}
/**

2
src/PMS/PMS5003.h
View File

@ -24,7 +24,7 @@ public:
int getPm10Ae(void);
int getPm03ParticleCount(void);
int convertPm25ToUsAqi(int pm25);
int pm25Compensated(int pm25, float humidity);
int compensated(int pm25, float humidity);
private:
bool _isBegin = false;

4
src/PMS/PMS5003T.cpp
View File

@ -171,8 +171,8 @@ float PMS5003T::getRelativeHumidity(void) {
* @param humidity Humidity value
* @return float
*/
float PMS5003T::pm25Compensated(int pm25, float humidity) {
return pms.pm25Compensated(pm25, humidity);
float PMS5003T::compensated(int pm25, float humidity) {
return pms.compensated(pm25, humidity);
}
/**

2
src/PMS/PMS5003T.h
View File

@ -29,7 +29,7 @@ public:
int convertPm25ToUsAqi(int pm25);
float getTemperature(void);
float getRelativeHumidity(void);
float pm25Compensated(int pm25, float humidity);
float compensated(int pm25, float humidity);
private:
bool _isBegin = false;