fix PM2.5 compensated on display, #221

airgradienthq · Aug 25, 2024 · 63f653d · 63f653d
1 parent 6c3259b
commit 63f653d
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 10 deletions.
diff --git a/src/AgOledDisplay.cpp b/src/AgOledDisplay.cpp
@@ -307,20 +307,21 @@ void OledDisplay::showDashboard(const char *status) {
       int pm25 = value.pm25_1;
       if (config.hasSensorSHT) {
         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);
       if (config.isPmStandardInUSAQI()) {
-        if (utils::isValidPMS(value.pm25_1)) {
-          sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(value.pm25_1));
+        if (utils::isValidPMS(pm25)) {
+          sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(pm25));
         } else {
           sprintf(strBuf, "%s", "-");
         }
         DISP()->drawStr(55, 48, strBuf);
         DISP()->setFont(u8g2_font_t0_12_tf);
         DISP()->drawUTF8(55, 61, "AQI");
       } else {
-        if (utils::isValidPMS(value.pm25_1)) {
-          sprintf(strBuf, "%d", value.pm25_1);
+        if (utils::isValidPMS(pm25)) {
+          sprintf(strBuf, "%d", pm25);
         } else {
           sprintf(strBuf, "%s", "-");
         }
@@ -369,8 +370,8 @@ void OledDisplay::showDashboard(const char *status) {
       pm25 = (int)ag->pms5003.compensated(pm25, value.Humidity);
     }
     ag->display.setCursor(0, 12);
-    if (utils::isValidPMS(value.pm25_1)) {
-      snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", value.pm25_1);
+    if (utils::isValidPMS(pm25)) {
+      snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", pm25);
     } else {
       snprintf(strBuf, sizeof(strBuf), "PM2.5:-");
     }

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

diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp
@@ -169,9 +169,9 @@ float PMS5003T::getRelativeHumidity(void) {
  * 
  * @param pm25 PM2.5 raw 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);
 }
 

diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h
@@ -29,7 +29,7 @@ class PMS5003T: public PMS5003TBase  {
   int convertPm25ToUsAqi(int pm25);
   float getTemperature(void);
   float getRelativeHumidity(void);
-  float compensated(int pm25, float humidity);
+  int compensated(int pm25, float humidity);
 
 private:
   bool _isBegin = false;