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

fix PM2.5 compensated on display, #221

Browse Source
This commit is contained in:
Phat Nguyen
2024-08-25 20:37:38 +07:00
parent 6c3259b94b
commit 63f653d5cd
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/AgOledDisplay.cpp
View File

@ -307,11 +307,12 @@ void OledDisplay::showDashboard(const char *status) {
int pm25 = value.pm25_1; int pm25 = value.pm25_1;
if (config.hasSensorSHT) { if (config.hasSensorSHT) {
pm25 = ag->pms5003.compensated(pm25, value.Humidity); pm25 = ag->pms5003.compensated(pm25, value.Humidity);
logInfo("PM2.5:" + String(value.pm25_1) + String("Compensated:") + String(pm25));
} }
DISP()->setFont(u8g2_font_t0_22b_tf); DISP()->setFont(u8g2_font_t0_22b_tf);
if (config.isPmStandardInUSAQI()) { if (config.isPmStandardInUSAQI()) {
if (utils::isValidPMS(value.pm25_1)) { if (utils::isValidPMS(pm25)) {
sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(value.pm25_1)); sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(pm25));
} else { } else {
sprintf(strBuf, "%s", "-"); sprintf(strBuf, "%s", "-");
} }
@ -319,8 +320,8 @@ 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(value.pm25_1)) { if (utils::isValidPMS(pm25)) {
sprintf(strBuf, "%d", value.pm25_1); sprintf(strBuf, "%d", pm25);
} else { } else {
sprintf(strBuf, "%s", "-"); sprintf(strBuf, "%s", "-");
} }
@ -369,8 +370,8 @@ void OledDisplay::showDashboard(const char *status) {
pm25 = (int)ag->pms5003.compensated(pm25, value.Humidity); pm25 = (int)ag->pms5003.compensated(pm25, value.Humidity);
} }
ag->display.setCursor(0, 12); ag->display.setCursor(0, 12);
if (utils::isValidPMS(value.pm25_1)) { if (utils::isValidPMS(pm25)) {
snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", value.pm25_1); snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", pm25);
} else { } else {
snprintf(strBuf, sizeof(strBuf), "PM2.5:-"); snprintf(strBuf, sizeof(strBuf), "PM2.5:-");
} }

2
src/PMS/PMS5003.cpp
View File

@ -126,7 +126,7 @@ int PMS5003::convertPm25ToUsAqi(int pm25) { return pms.pm25ToAQI(pm25); }
* *
* @param pm25 PM2.5 raw value * @param pm25 PM2.5 raw value
* @param humidity Humidity value * @param humidity Humidity value
* @return float * @return int
*/ */
int PMS5003::compensated(int pm25, float humidity) { int PMS5003::compensated(int pm25, float humidity) {
return pms.compensated(pm25, humidity); return pms.compensated(pm25, humidity);

4
src/PMS/PMS5003T.cpp
View File

@ -169,9 +169,9 @@ float PMS5003T::getRelativeHumidity(void) {
* *
* @param pm25 PM2.5 raw value * @param pm25 PM2.5 raw value
* @param humidity Humidity value * @param humidity Humidity value
* @return float * @return int
*/ */
float PMS5003T::compensated(int pm25, float humidity) { int PMS5003T::compensated(int pm25, float humidity) {
return pms.compensated(pm25, humidity); return pms.compensated(pm25, humidity);
} }

2
src/PMS/PMS5003T.h
View File

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