Merge pull request #239 from airgradienthq/hotfix/led-bar-show-pm-status

Fix: Correct LED bar show PM status

docs/local-server.md

@@ -47,27 +47,27 @@ You get the following response:
 
 | Properties       | Type   | Explanation                                                        |
 |------------------|--------|--------------------------------------------------------------------|
-| serialno         | String | Serial Number of the monitor                                       |
+| `serialno`         | String | Serial Number of the monitor                                       |
-| wifi             | Number | WiFi signal strength                                               |
+| `wifi`             | Number | WiFi signal strength                                               |
-| pm01 | Number | PM1 in ug/m3                                       |
+| `pm01` | Number | PM1 in ug/m3                                       |
-| pm02 | Number | PM2.5 in ug/m3                                       |
+| `pm02` | Number | PM2.5 in ug/m3                                       |
-| pm10 | Number | PM10 in ug/m3                                       |
+| `pm10` | Number | PM10 in ug/m3                                       |
-| pm02Compensated | Number | PM2.5 in ug/m3 with correction applied (from fw version 3.1.4 onwards)                                       |
+| `pm02Compensated` | Number | PM2.5 in ug/m3 with correction applied (from fw version 3.1.4 onwards)                                       |
-| rco2             | Number | CO2 in ppm                                                         |
+| `rco2`             | Number | CO2 in ppm                                                         |
-| pm003Count       | Number | Particle count per dL                                              |
+| `pm003Count`       | Number | Particle count per dL                                              |
-| atmp             | Number | Temperature in Degrees Celsius                                     |
+| `atmp`             | Number | Temperature in Degrees Celsius                                     |
-| atmpCompensated             | Number | Temperature in Degrees Celsius with correction applied                                      |
+| `atmpCompensated`             | Number | Temperature in Degrees Celsius with correction applied                                      |
-| rhum             | Number | Relative Humidity                                                  |
+| `rhum`             | Number | Relative Humidity                                                  |
-| rhumCompensated        | Number | Relative Humidity with correction applied                                                  |
+| `rhumCompensated`        | Number | Relative Humidity with correction applied                                                  |
-| tvocIndex        | Number | Senisiron VOC Index                                                |
+| `tvocIndex`        | Number | Senisiron VOC Index                                                |
-| tvocRaw         | Number | VOC raw value                                                      |
+| `tvocRaw`         | Number | VOC raw value                                                      |
-| noxIndex         | Number | Senisirion NOx Index                                               |
+| `noxIndex`         | Number | Senisirion NOx Index                                               |
-| noxRaw          | Number | NOx raw value                                                      |
+| `noxRaw`          | Number | NOx raw value                                                      |
-| boot             | Number | Counts every measurement cycle. Low boot counts indicate restarts. |
+| `boot`             | Number | Counts every measurement cycle. Low boot counts indicate restarts. |
-| bootCount             | Number | Same as boot property. Required for Home Assistant compatability. Will be depreciated. |
+| `bootCount`             | Number | Same as boot property. Required for Home Assistant compatability. Will be depreciated. |
-| ledMode          | String | Current configuration of the LED mode                              |
+| `ledMode`          | String | Current configuration of the LED mode                              |
-| firmware  | String | Current firmware version                                           |
+| `firmware`  | String | Current firmware version                                           |
-| model           | String | Current model name                                                 |
+| `model`           | String | Current model name                                                 |
 
 Compensated values apply correction algorithms to make the sensor values more accurate. Temperature and relative humidity correction is only applied on the outdoor monitor Open Air but the properties _compensated will still be send also for the indoor monitor AirGradient ONE.
 
@@ -101,6 +101,10 @@ Example to set monitor to Celsius
 
  ```curl -X PUT -H "Content-Type: application/json" -d '{"temperatureUnit":"c"}' http://airgradient_84fce612eff4.local/config ```
 
+ If you use command prompt on Windows, you need to escape the quotes:
+ 
+  ``` -d "{\"param\":\"value\"}" ```
+
 #### Avoiding Conflicts with Configuration on AirGradient Server
 If the monitor is set up on the AirGradient dashboard, it will also receive configurations from there. In case you do not want this, please set `configurationControl` to `local`. In case you set it to `cloud` and want to change it to `local`, you need to make a factory reset. 
 
@@ -108,19 +112,19 @@ If the monitor is set up on the AirGradient dashboard, it will also receive conf
 
 | Properties              | Description                                            | Type    | Accepted Values                                                                                                                         | Example                                       |
 |-------------------------|:-------------------------------------------------------|---------|-----------------------------------------------------------------------------------------------------------------------------------------|-----------------------------------------------|
-| country                 | Country where the device is.                           | String  | Country code as [ALPHA-2 notation](https://www.iban.com/country-codes)                                                                  | {"country": "TH"}                             |
+| `country`                 | Country where the device is.                           | String  | Country code as [ALPHA-2 notation](https://www.iban.com/country-codes)                                                                  | {"country": "TH"}                             |
-| model                   | Hardware identifier (only GET).                        | String  | I-9PSL-DE                                                                                                                               | {"model": "I-9PSL-DE"}                        |
+| `model`                   | Hardware identifier (only GET).                        | String  | I-9PSL-DE                                                                                                                               | {"model": "I-9PSL-DE"}                        |
-| pmStandard              | Particle matter standard used on the display.          | String  | `ugm3`: ug/m3 <br> `us-aqi`: USAQI                                                                                                      | {"pmStandard": "ugm3"}                        |
+| `pmStandard`              | Particle matter standard used on the display.          | String  | `ugm3`: ug/m3 <br> `us-aqi`: USAQI                                                                                                      | {"pmStandard": "ugm3"}                        |
-| ledBarMode              | Mode in which the led bar can be set.                  | String  | `co2`: LED bar displays CO2 <br>`pm`: LED bar displays PM <br>`off`: Turn off LED bar                                                   | {"ledBarMode": "off"}                         |
+| `ledBarMode`              | Mode in which the led bar can be set.                  | String  | `co2`: LED bar displays CO2 <br>`pm`: LED bar displays PM <br>`off`: Turn off LED bar                                                   | {"ledBarMode": "off"}                         |
-| displayBrightness       | Brightness of the Display.                             | Number  | 0-100                                                                                                                                   | {"displayBrightness": 50}                     |
+| `displayBrightness`       | Brightness of the Display.                             | Number  | 0-100                                                                                                                                   | {"displayBrightness": 50}                     |
-| ledBarBrightness        | Brightness of the LEDBar.                              | Number  | 0-100                                                                                                                                   | {"ledBarBrightness": 40}                      |
+| `ledBarBrightness`        | Brightness of the LEDBar.                              | Number  | 0-100                                                                                                                                   | {"ledBarBrightness": 40}                      |
-| abcDays                 | Number of days for CO2 automatic baseline calibration. | Number  | Maximum 200 days. Default 8 days.                                                                                                       | {"abcDays": 8}                                |
+| `abcDays`                 | Number of days for CO2 automatic baseline calibration. | Number  | Maximum 200 days. Default 8 days.                                                                                                       | {"abcDays": 8}                                |
-| mqttBrokerUrl           | MQTT broker URL.                                       | String  |                                                                                                                                         | {"mqttBrokerUrl": "mqtt://192.168.0.18:1883"} |
+| `mqttBrokerUrl`           | MQTT broker URL.                                       | String  |                                                                                                                                         | {"mqttBrokerUrl": "mqtt://192.168.0.18:1883"} |
-| temperatureUnit         | Temperature unit shown on the display.                 | String  | `c` or `C`: Degree Celsius °C <br>`f` or `F`: Degree Fahrenheit °F                                                                      | {"temperatureUnit": "c"}                      |
+| `temperatureUnit`         | Temperature unit shown on the display.                 | String  | `c` or `C`: Degree Celsius °C <br>`f` or `F`: Degree Fahrenheit °F                                                                      | {"temperatureUnit": "c"}                      |
-| configurationControl    | The configuration source of the device.                | String  | `both`: Accept local and cloud configuration <br>`local`: Accept only local configuration  <br>`cloud`: Accept only cloud configuration | {"configurationControl": "both"}              |
+| `configurationControl`    | The configuration source of the device.                | String  | `both`: Accept local and cloud configuration <br>`local`: Accept only local configuration  <br>`cloud`: Accept only cloud configuration | {"configurationControl": "both"}              |
-| postDataToAirGradient   | Send data to AirGradient cloud.                        | Boolean | `true`: Enabled <br>`false`: Disabled                                                                                                   | {"postDataToAirGradient": true}               |
+| `postDataToAirGradient`   | Send data to AirGradient cloud.                        | Boolean | `true`: Enabled <br>`false`: Disabled                                                                                                   | {"postDataToAirGradient": true}               |
-| co2CalibrationRequested | Can be set to trigger a calibration.                   | Boolean | `true`: CO2 calibration (400ppm) will be triggered                                                                                      | {"co2CalibrationRequested": true}             |
+| `co2CalibrationRequested` | Can be set to trigger a calibration.                   | Boolean | `true`: CO2 calibration (400ppm) will be triggered                                                                                      | {"co2CalibrationRequested": true}             |
-| ledBarTestRequested     | Can be set to trigger a test.                          | Boolean | `true` : LEDs will run test sequence                                                                                                    | {"ledBarTestRequested": true}                 |
+| `ledBarTestRequested`     | Can be set to trigger a test.                          | Boolean | `true` : LEDs will run test sequence                                                                                                    | {"ledBarTestRequested": true}                 |
-| noxLearningOffset       | Set NOx learning gain offset.                          | Number  | 0-720 (default 12)                                                                                                                      | {"noxLearningOffset": 12}                     |
+| `noxLearningOffset`       | Set NOx learning gain offset.                          | Number  | 0-720 (default 12)                                                                                                                      | {"noxLearningOffset": 12}                     |
-| tvocLearningOffset      | Set VOC learning gain offset.                          | Number  | 0-720 (default 12)                                                                                                                      | {"tvocLearningOffset": 12}                    |
+| `tvocLearningOffset`      | Set VOC learning gain offset.                          | Number  | 0-720 (default 12)                                                                                                                      | {"tvocLearningOffset": 12}                    |
-| offlineMode             | Set monitor to run without WiFi.                       | Boolean |  `false`: Disabled (default) <br> `true`: Enabled                                                                                                              | {"offlineMode": true}                         |
+| `offlineMode`             | Set monitor to run without WiFi.                       | Boolean |  `false`: Disabled (default) <br> `true`: Enabled                                                                                                              | {"offlineMode": true}                         |

examples/BASIC/BASIC.ino

@@ -68,7 +68,6 @@ static LocalServer localServer(Serial, openMetrics, measurements, configuration,
                                wifiConnector);
 static MqttClient mqttClient(Serial);
 
-static int pmFailCount = 0;
 static int getCO2FailCount = 0;
 static AgFirmwareMode fwMode = FW_MODE_I_BASIC_40PS;
 
@@ -126,6 +125,9 @@ void setup() {
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
 
+  /** Example set custom API root URL */
+  // apiClient.setApiRoot("https://example.custom.api");
+
   /** Init sensor */
   boardInit();
 
@@ -233,7 +235,7 @@ void loop() {
 
 static void co2Update(void) {
   int value = ag.s8.getCo2();
-  if (value >= 0) {
+  if (utils::isValidCO2(value)) {
     measurements.CO2 = value;
     getCO2FailCount = 0;
     Serial.printf("CO2 (ppm): %d\r\n", measurements.CO2);
@@ -241,7 +243,7 @@ static void co2Update(void) {
     getCO2FailCount++;
     Serial.printf("Get CO2 failed: %d\r\n", getCO2FailCount);
     if (getCO2FailCount >= 3) {
-      measurements.CO2 = -1;
+      measurements.CO2 = utils::getInvalidCO2();
     }
   }
 }
@@ -511,15 +513,21 @@ static void updatePm(void) {
     Serial.printf("PM2.5 ug/m3: %d\r\n", measurements.pm25_1);
     Serial.printf("PM10 ug/m3: %d\r\n", measurements.pm10_1);
     Serial.printf("PM0.3 Count: %d\r\n", measurements.pm03PCount_1);
-    pmFailCount = 0;
+    Serial.printf("PM firmware version: %d\r\n", ag.pms5003.getFirmwareVersion());
+    ag.pms5003.resetFailCount();
   } else {
-    pmFailCount++;
+    ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", pmFailCount);
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
-    if (pmFailCount >= 3) {
+    if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = -1;
+      measurements.pm01_1 = utils::getInvalidPmValue();
-      measurements.pm25_1 = -1;
+      measurements.pm25_1 = utils::getInvalidPmValue();
-      measurements.pm10_1 = -1;
+      measurements.pm10_1 = utils::getInvalidPmValue();
-      measurements.pm03PCount_1 = -1;
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
+    }
+
+    if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax());
+      ESP.restart();
     }
   }
 }
@@ -564,5 +572,7 @@ static void tempHumUpdate(void) {
     }
   } else {
     Serial.println("SHT read failed");
+    measurements.Temperature = utils::getInvalidTemperature();
+    measurements.Humidity = utils::getInvalidHumidity();
   }
 }

examples/BASIC/OpenMetrics.cpp

@@ -65,14 +65,14 @@ String OpenMetrics::getPayload(void) {
     add_metric_point("", String(measure.CO2));
   }
 
-  float _temp = -1001;
+  float _temp = utils::getInvalidTemperature();
-  float _hum = -1;
+  float _hum = utils::getInvalidHumidity();
-  int pm01 = -1;
+  int pm01 = utils::getInvalidPmValue();
-  int pm25 = -1;
+  int pm25 = utils::getInvalidPmValue();
-  int pm10 = -1;
+  int pm10 = utils::getInvalidPmValue();
-  int pm03PCount = -1;
+  int pm03PCount = utils::getInvalidPmValue();
-  int atmpCompensated = -1;
+  int atmpCompensated = utils::getInvalidTemperature();
-  int ahumCompensated = -1;
+  int ahumCompensated = utils::getInvalidHumidity();
 
   if (config.hasSensorSHT) {
     _temp = measure.Temperature;
@@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorPMS1) {
-    if (pm01 >= 0) {
+    if (utils::isValidPm(pm01)) {
       add_metric("pm1",
                  "PM1.0 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm01));
     }
-    if (pm25 >= 0) {
+    if (utils::isValidPm(pm25)) {
       add_metric("pm2d5",
                  "PM2.5 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm25));
     }
-    if (pm10 >= 0) {
+    if (utils::isValidPm(pm10)) {
       add_metric("pm10",
                  "PM10 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm10));
     }
-    if (pm03PCount >= 0) {
+    if (utils::isValidPm03Count(pm03PCount)) {
       add_metric("pm0d3",
                  "PM0.3 concentration as measured by the AirGradient PMS "
                  "sensor, in number of particules per 100 milliliters",
@@ -120,28 +120,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorSGP) {
-    if (measure.TVOC >= 0) {
+    if (utils::isValidVOC(measure.TVOC)) {
       add_metric("tvoc_index",
                  "The processed Total Volatile Organic Compounds (TVOC) index "
                  "as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOC));
     }
-    if (measure.TVOCRaw >= 0) {
+    if (utils::isValidVOC(measure.TVOCRaw)) {
       add_metric("tvoc_raw",
                  "The raw input value to the Total Volatile Organic Compounds "
                  "(TVOC) index as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOCRaw));
     }
-    if (measure.NOx >= 0) {
+    if (utils::isValidNOx(measure.NOx)) {
       add_metric("nox_index",
                  "The processed Nitrous Oxide (NOx) index as measured by the "
                  "AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.NOx));
     }
-    if (measure.NOxRaw >= 0) {
+    if (utils::isValidNOx(measure.NOxRaw)) {
       add_metric("nox_raw",
                  "The raw input value to the Nitrous Oxide (NOx) index as "
                  "measured by the AirGradient SGP sensor",
@@ -150,7 +150,7 @@ String OpenMetrics::getPayload(void) {
     }
   }
 
-  if (_temp > -1001) {
+  if (utils::isValidTemperature(_temp)) {
     add_metric(
         "temperature",
         "The ambient temperature as measured by the AirGradient SHT / PMS "
@@ -158,7 +158,7 @@ String OpenMetrics::getPayload(void) {
         "gauge", "celsius");
     add_metric_point("", String(_temp));
   }
-  if (atmpCompensated > -1001) {
+  if (utils::isValidTemperature(atmpCompensated)) {
     add_metric("temperature_compensated",
                "The compensated ambient temperature as measured by the "
                "AirGradient SHT / PMS "
@@ -166,14 +166,14 @@ String OpenMetrics::getPayload(void) {
                "gauge", "celsius");
     add_metric_point("", String(atmpCompensated));
   }
-  if (_hum >= 0) {
+  if (utils::isValidHumidity(_hum)) {
     add_metric(
         "humidity",
         "The relative humidity as measured by the AirGradient SHT sensor",
         "gauge", "percent");
     add_metric_point("", String(_hum));
   }
-  if (ahumCompensated >= 0) {
+  if (utils::isValidHumidity(ahumCompensated)) {
     add_metric("humidity_compensated",
                "The compensated relative humidity as measured by the "
                "AirGradient SHT / PMS sensor",

examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino

@@ -68,7 +68,6 @@ static LocalServer localServer(Serial, openMetrics, measurements, configuration,
                                wifiConnector);
 static MqttClient mqttClient(Serial);
 
-static int pmFailCount = 0;
 static int getCO2FailCount = 0;
 static AgFirmwareMode fwMode = FW_MODE_I_33PS;
 
@@ -126,6 +125,9 @@ void setup() {
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
 
+  /** Example set custom API root URL */
+  // apiClient.setApiRoot("https://example.custom.api");
+
   /** Init sensor */
   boardInit();
 
@@ -231,7 +233,7 @@ void loop() {
 
 static void co2Update(void) {
   int value = ag.s8.getCo2();
-  if (value >= 0) {
+  if (utils::isValidCO2(value)) {
     measurements.CO2 = value;
     getCO2FailCount = 0;
     Serial.printf("CO2 (ppm): %d\r\n", measurements.CO2);
@@ -239,7 +241,7 @@ static void co2Update(void) {
     getCO2FailCount++;
     Serial.printf("Get CO2 failed: %d\r\n", getCO2FailCount);
     if (getCO2FailCount >= 3) {
-      measurements.CO2 = -1;
+      measurements.CO2 = utils::getInvalidCO2();
     }
   }
 }
@@ -563,15 +565,21 @@ static void updatePm(void) {
     Serial.printf("PM2.5 ug/m3: %d\r\n", measurements.pm25_1);
     Serial.printf("PM10 ug/m3: %d\r\n", measurements.pm10_1);
     Serial.printf("PM0.3 Count: %d\r\n", measurements.pm03PCount_1);
-    pmFailCount = 0;
+    Serial.printf("PM firmware version: %d\r\n", ag.pms5003.getFirmwareVersion());
+    ag.pms5003.resetFailCount();
   } else {
-    pmFailCount++;
+    ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", pmFailCount);
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
-    if (pmFailCount >= 3) {
+    if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = -1;
+      measurements.pm01_1 = utils::getInvalidPmValue();
-      measurements.pm25_1 = -1;
+      measurements.pm25_1 = utils::getInvalidPmValue();
-      measurements.pm10_1 = -1;
+      measurements.pm10_1 = utils::getInvalidPmValue();
-      measurements.pm03PCount_1 = -1;
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
+    }
+
+    if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax());
+      ESP.restart();
     }
   }
 }
@@ -616,5 +624,7 @@ static void tempHumUpdate(void) {
     }
   } else {
     Serial.println("SHT read failed");
+    measurements.Temperature = utils::getInvalidTemperature();
+    measurements.Humidity = utils::getInvalidHumidity();
   }
 }

examples/DiyProIndoorV3_3/OpenMetrics.cpp

@@ -65,14 +65,14 @@ String OpenMetrics::getPayload(void) {
     add_metric_point("", String(measure.CO2));
   }
 
-  float _temp = -1001;
+  float _temp = utils::getInvalidTemperature();
-  float _hum = -1;
+  float _hum = utils::getInvalidHumidity();
-  int pm01 = -1;
+  int pm01 = utils::getInvalidPmValue();
-  int pm25 = -1;
+  int pm25 = utils::getInvalidPmValue();
-  int pm10 = -1;
+  int pm10 = utils::getInvalidPmValue();
-  int pm03PCount = -1;
+  int pm03PCount = utils::getInvalidPmValue();
-  int atmpCompensated = -1;
+  int atmpCompensated = utils::getInvalidTemperature();
-  int ahumCompensated = -1;
+  int ahumCompensated = utils::getInvalidHumidity();
 
   if (config.hasSensorSHT) {
     _temp = measure.Temperature;
@@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorPMS1) {
-    if (pm01 >= 0) {
+    if (utils::isValidPm(pm01)) {
       add_metric("pm1",
                  "PM1.0 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm01));
     }
-    if (pm25 >= 0) {
+    if (utils::isValidPm(pm25)) {
       add_metric("pm2d5",
                  "PM2.5 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm25));
     }
-    if (pm10 >= 0) {
+    if (utils::isValidPm(pm10)) {
       add_metric("pm10",
                  "PM10 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm10));
     }
-    if (pm03PCount >= 0) {
+    if (utils::isValidPm03Count(pm03PCount)) {
       add_metric("pm0d3",
                  "PM0.3 concentration as measured by the AirGradient PMS "
                  "sensor, in number of particules per 100 milliliters",
@@ -120,28 +120,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorSGP) {
-    if (measure.TVOC >= 0) {
+    if (utils::isValidVOC(measure.TVOC)) {
       add_metric("tvoc_index",
                  "The processed Total Volatile Organic Compounds (TVOC) index "
                  "as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOC));
     }
-    if (measure.TVOCRaw >= 0) {
+    if (utils::isValidVOC(measure.TVOCRaw)) {
       add_metric("tvoc_raw",
                  "The raw input value to the Total Volatile Organic Compounds "
                  "(TVOC) index as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOCRaw));
     }
-    if (measure.NOx >= 0) {
+    if (utils::isValidNOx(measure.NOx)) {
       add_metric("nox_index",
                  "The processed Nitrous Oxide (NOx) index as measured by the "
                  "AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.NOx));
     }
-    if (measure.NOxRaw >= 0) {
+    if (utils::isValidNOx(measure.NOxRaw)) {
       add_metric("nox_raw",
                  "The raw input value to the Nitrous Oxide (NOx) index as "
                  "measured by the AirGradient SGP sensor",
@@ -150,7 +150,7 @@ String OpenMetrics::getPayload(void) {
     }
   }
 
-  if (_temp > -1001) {
+  if (utils::isValidTemperature(_temp)) {
     add_metric(
         "temperature",
         "The ambient temperature as measured by the AirGradient SHT / PMS "
@@ -158,7 +158,7 @@ String OpenMetrics::getPayload(void) {
         "gauge", "celsius");
     add_metric_point("", String(_temp));
   }
-  if (atmpCompensated > -1001) {
+  if (utils::isValidTemperature(atmpCompensated)) {
     add_metric("temperature_compensated",
                "The compensated ambient temperature as measured by the "
                "AirGradient SHT / PMS "
@@ -166,14 +166,14 @@ String OpenMetrics::getPayload(void) {
                "gauge", "celsius");
     add_metric_point("", String(atmpCompensated));
   }
-  if (_hum >= 0) {
+  if (utils::isValidHumidity(_hum)) {
     add_metric(
         "humidity",
         "The relative humidity as measured by the AirGradient SHT sensor",
         "gauge", "percent");
     add_metric_point("", String(_hum));
   }
-  if (ahumCompensated >= 0) {
+  if (utils::isValidHumidity(ahumCompensated)) {
     add_metric("humidity_compensated",
                "The compensated relative humidity as measured by the "
                "AirGradient SHT / PMS sensor",

examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino

@@ -68,7 +68,6 @@ static LocalServer localServer(Serial, openMetrics, measurements, configuration,
                                wifiConnector);
 static MqttClient mqttClient(Serial);
 
-static int pmFailCount = 0;
 static uint32_t factoryBtnPressTime = 0;
 static int getCO2FailCount = 0;
 static AgFirmwareMode fwMode = FW_MODE_I_42PS;
@@ -127,6 +126,9 @@ void setup() {
   openMetrics.setAirGradient(&ag);
   localServer.setAirGraident(&ag);
 
+  /** Example set custom API root URL */
+  // apiClient.setApiRoot("https://example.custom.api");
+
   /** Init sensor */
   boardInit();
 
@@ -258,7 +260,7 @@ void loop() {
 
 static void co2Update(void) {
   int value = ag.s8.getCo2();
-  if (value >= 0) {
+  if (utils::isValidCO2(value)) {
     measurements.CO2 = value;
     getCO2FailCount = 0;
     Serial.printf("CO2 (ppm): %d\r\n", measurements.CO2);
@@ -266,7 +268,7 @@ static void co2Update(void) {
     getCO2FailCount++;
     Serial.printf("Get CO2 failed: %d\r\n", getCO2FailCount);
     if (getCO2FailCount >= 3) {
-      measurements.CO2 = -1;
+      measurements.CO2 = utils::getInvalidCO2();
     }
   }
 }
@@ -325,9 +327,7 @@ static void factoryConfigReset(void) {
             // }
 
             /** Reset WIFI */
-            // WiFi.enableSTA(true); // Incase offline mode
+            WiFi.disconnect(true, true);
-            // WiFi.disconnect(true, true);
-            wifiConnector.reset();
 
             /** Reset local config */
             configuration.reset();
@@ -606,15 +606,21 @@ static void updatePm(void) {
     Serial.printf("PM2.5 ug/m3: %d\r\n", measurements.pm25_1);
     Serial.printf("PM10 ug/m3: %d\r\n", measurements.pm10_1);
     Serial.printf("PM0.3 Count: %d\r\n", measurements.pm03PCount_1);
-    pmFailCount = 0;
+    Serial.printf("PM firmware version: %d\r\n", ag.pms5003.getFirmwareVersion());
+    ag.pms5003.resetFailCount();
   } else {
-    pmFailCount++;
+    ag.pms5003.updateFailCount();
-    Serial.printf("PMS read failed: %d\r\n", pmFailCount);
+    Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount());
-    if (pmFailCount >= 3) {
+    if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.pm01_1 = -1;
+      measurements.pm01_1 = utils::getInvalidPmValue();
-      measurements.pm25_1 = -1;
+      measurements.pm25_1 = utils::getInvalidPmValue();
-      measurements.pm10_1 = -1;
+      measurements.pm10_1 = utils::getInvalidPmValue();
-      measurements.pm03PCount_1 = -1;
+      measurements.pm03PCount_1 = utils::getInvalidPmValue();
+    }
+
+    if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) {
+      Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax());
+      ESP.restart();
     }
   }
 }
@@ -659,5 +665,7 @@ static void tempHumUpdate(void) {
     }
   } else {
     Serial.println("SHT read failed");
+    measurements.Temperature = utils::getInvalidTemperature();
+    measurements.Humidity = utils::getInvalidHumidity();
   }
 }

examples/DiyProIndoorV4_2/OpenMetrics.cpp

@@ -65,14 +65,14 @@ String OpenMetrics::getPayload(void) {
     add_metric_point("", String(measure.CO2));
   }
 
-  float _temp = -1001;
+  float _temp = utils::getInvalidTemperature();
-  float _hum = -1;
+  float _hum = utils::getInvalidHumidity();
-  int pm01 = -1;
+  int pm01 = utils::getInvalidPmValue();
-  int pm25 = -1;
+  int pm25 = utils::getInvalidPmValue();
-  int pm10 = -1;
+  int pm10 = utils::getInvalidPmValue();
-  int pm03PCount = -1;
+  int pm03PCount = utils::getInvalidPmValue();
-  int atmpCompensated = -1;
+  int atmpCompensated = utils::getInvalidTemperature();
-  int ahumCompensated = -1;
+  int ahumCompensated = utils::getInvalidHumidity();
 
   if (config.hasSensorSHT) {
     _temp = measure.Temperature;
@@ -89,28 +89,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorPMS1) {
-    if (pm01 >= 0) {
+    if (utils::isValidPm(pm01)) {
       add_metric("pm1",
                  "PM1.0 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm01));
     }
-    if (pm25 >= 0) {
+    if (utils::isValidPm(pm25)) {
       add_metric("pm2d5",
                  "PM2.5 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm25));
     }
-    if (pm10 >= 0) {
+    if (utils::isValidPm(pm10)) {
       add_metric("pm10",
                  "PM10 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm10));
     }
-    if (pm03PCount >= 0) {
+    if (utils::isValidPm03Count(pm03PCount)) {
       add_metric("pm0d3",
                  "PM0.3 concentration as measured by the AirGradient PMS "
                  "sensor, in number of particules per 100 milliliters",
@@ -120,28 +120,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorSGP) {
-    if (measure.TVOC >= 0) {
+    if (utils::isValidVOC(measure.TVOC)) {
       add_metric("tvoc_index",
                  "The processed Total Volatile Organic Compounds (TVOC) index "
                  "as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOC));
     }
-    if (measure.TVOCRaw >= 0) {
+    if (utils::isValidVOC(measure.TVOCRaw)) {
       add_metric("tvoc_raw",
                  "The raw input value to the Total Volatile Organic Compounds "
                  "(TVOC) index as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOCRaw));
     }
-    if (measure.NOx >= 0) {
+    if (utils::isValidNOx(measure.NOx)) {
       add_metric("nox_index",
                  "The processed Nitrous Oxide (NOx) index as measured by the "
                  "AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.NOx));
     }
-    if (measure.NOxRaw >= 0) {
+    if (utils::isValidNOx(measure.NOxRaw)) {
       add_metric("nox_raw",
                  "The raw input value to the Nitrous Oxide (NOx) index as "
                  "measured by the AirGradient SGP sensor",
@@ -150,7 +150,7 @@ String OpenMetrics::getPayload(void) {
     }
   }
 
-  if (_temp > -1001) {
+  if (utils::isValidTemperature(_temp)) {
     add_metric(
         "temperature",
         "The ambient temperature as measured by the AirGradient SHT / PMS "
@@ -158,7 +158,7 @@ String OpenMetrics::getPayload(void) {
         "gauge", "celsius");
     add_metric_point("", String(_temp));
   }
-  if (atmpCompensated > -1001) {
+  if (utils::isValidTemperature(atmpCompensated)) {
     add_metric("temperature_compensated",
                "The compensated ambient temperature as measured by the "
                "AirGradient SHT / PMS "
@@ -166,14 +166,14 @@ String OpenMetrics::getPayload(void) {
                "gauge", "celsius");
     add_metric_point("", String(atmpCompensated));
   }
-  if (_hum >= 0) {
+  if (utils::isValidHumidity(_hum)) {
     add_metric(
         "humidity",
         "The relative humidity as measured by the AirGradient SHT sensor",
         "gauge", "percent");
     add_metric_point("", String(_hum));
   }
-  if (ahumCompensated >= 0) {
+  if (utils::isValidHumidity(ahumCompensated)) {
     add_metric("humidity_compensated",
                "The compensated relative humidity as measured by the "
                "AirGradient SHT / PMS sensor",

examples/OneOpenAir/OneOpenAir.ino

@@ -88,7 +88,6 @@ static OtaHandler otaHandler;
 static LocalServer localServer(Serial, openMetrics, measurements, configuration,
                                wifiConnector);
 
-static int pmFailCount = 0;
 static uint32_t factoryBtnPressTime = 0;
 static int getCO2FailCount = 0;
 static AgFirmwareMode fwMode = FW_MODE_I_9PSL;
@@ -163,6 +162,9 @@ void setup() {
   openMetrics.setAirGradient(ag);
   localServer.setAirGraident(ag);
 
+  /** Example set custom API root URL */
+  // apiClient.setApiRoot("https://example.custom.api");
+
   /** Init sensor */
   boardInit();
 
@@ -317,7 +319,7 @@ void loop() {
 
 static void co2Update(void) {
   int value = ag->s8.getCo2();
-  if (value >= 0) {
+  if (utils::isValidCO2(value)) {
     measurements.CO2 = value;
     getCO2FailCount = 0;
     Serial.printf("CO2 (ppm): %d\r\n", measurements.CO2);
@@ -325,7 +327,7 @@ static void co2Update(void) {
     getCO2FailCount++;
     Serial.printf("Get CO2 failed: %d\r\n", getCO2FailCount);
     if (getCO2FailCount >= 3) {
-      measurements.CO2 = -1;
+      measurements.CO2 = utils::getInvalidCO2();
     }
   }
 }
@@ -421,12 +423,7 @@ static void factoryConfigReset(void) {
             }
 
             /** Reset WIFI */
-            WiFi.enableSTA(true); // Incase offline mode
             WiFi.disconnect(true, true);
-            if (ag->isOne() == false) {
-              WiFi.begin("airgradient", "cleanair");
-              Serial.println("Set WiFi connect to \"airgradient\"");
-            }
 
             /** Reset local config */
             configuration.reset();
@@ -700,7 +697,7 @@ static void oneIndoorInit(void) {
   ledBarEnabledUpdate();
 
   /** Show message init sensor */
-  oledDisplay.setText("Sensor", "initializing...", "");
+  oledDisplay.setText("Monitor", "initializing...", "");
 
   /** Init sensor SGP41 */
   if (sgp41Init() == false) {
@@ -781,27 +778,27 @@ static void openAirInit(void) {
     }
   }
 
-  /** Try to find the PMS on other difference port with S8 */
+  /** Attempt to detect PM sensors */
   if (fwMode == FW_MODE_O_1PST) {
     bool pmInitSuccess = false;
     if (serial0Available) {
       if (ag->pms5003t_1.begin(Serial0) == false) {
         configuration.hasSensorPMS1 = false;
-        Serial.println("PMS1 sensor not found");
+        Serial.println("No PM sensor detected on Serial0");
       } else {
         serial0Available = false;
         pmInitSuccess = true;
-        Serial.println("Found PMS 1 on Serial0");
+        Serial.println("Detected PM 1 on Serial0");
       }
     }
     if (pmInitSuccess == false) {
       if (serial1Available) {
         if (ag->pms5003t_1.begin(Serial1) == false) {
           configuration.hasSensorPMS1 = false;
-          Serial.println("PMS1 sensor not found");
+          Serial.println("No PM sensor detected on Serial1");
         } else {
           serial1Available = false;
-          Serial.println("Found PMS 1 on Serial1");
+          Serial.println("Detected PM 1 on Serial1");
         }
       }
     }
@@ -809,15 +806,15 @@ static void openAirInit(void) {
   } else {
     if (ag->pms5003t_1.begin(Serial0) == false) {
       configuration.hasSensorPMS1 = false;
-      Serial.println("PMS1 sensor not found");
+      Serial.println("No PM sensor detected on Serial0");
     } else {
-      Serial.println("Found PMS 1 on Serial0");
+      Serial.println("Detected PM 1 on Serial0");
     }
     if (ag->pms5003t_2.begin(Serial1) == false) {
       configuration.hasSensorPMS2 = false;
-      Serial.println("PMS2 sensor not found");
+      Serial.println("No PM sensor detected on Serial1");
     } else {
-      Serial.println("Found PMS 2 on Serial1");
+      Serial.println("Detected PM 2 on Serial1");
     }
 
     if (fwMode == FW_MODE_O_1PP) {
@@ -941,6 +938,9 @@ static void configUpdateHandle() {
 
     stateMachine.executeLedBarTest();
   }
+  else if(ag->isOpenAir()) {
+    stateMachine.executeLedBarTest();
+  }
 
   appDispHandler();
   appLedHandler();
@@ -1007,6 +1007,7 @@ static void updateTvoc(void) {
 }
 
 static void updatePm(void) {
+  bool restart = false;
   if (ag->isOne()) {
     if (ag->pms5003.isFailed() == false) {
       measurements.pm01_1 = ag->pms5003.getPm01Ae();
@@ -1019,15 +1020,20 @@ static void updatePm(void) {
       Serial.printf("PM2.5 ug/m3: %d\r\n", measurements.pm25_1);
       Serial.printf("PM10 ug/m3: %d\r\n", measurements.pm10_1);
       Serial.printf("PM0.3 Count: %d\r\n", measurements.pm03PCount_1);
-      pmFailCount = 0;
+      Serial.printf("PM firmware version: %d\r\n", ag->pms5003.getFirmwareVersion());
+      ag->pms5003.resetFailCount();
     } else {
-      pmFailCount++;
+      ag->pms5003.updateFailCount();
-      Serial.printf("PMS read failed: %d\r\n", pmFailCount);
+      Serial.printf("PMS read failed %d times\r\n", ag->pms5003.getFailCount());
-      if (pmFailCount >= 3) {
+      if (ag->pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-        measurements.pm01_1 = -1;
+        measurements.pm01_1 = utils::getInvalidPmValue();
-        measurements.pm25_1 = -1;
+        measurements.pm25_1 = utils::getInvalidPmValue();
-        measurements.pm10_1 = -1;
+        measurements.pm10_1 = utils::getInvalidPmValue();
-        measurements.pm03PCount_1 = -1;
+        measurements.pm03PCount_1 = utils::getInvalidPmValue();
+      }
+
+      if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) {
+        restart = true;
       }
     }
   } else {
@@ -1051,16 +1057,30 @@ static void updatePm(void) {
       Serial.printf("[1] Temperature in C: %0.2f\r\n", measurements.temp_1);
       Serial.printf("[1] Relative Humidity: %d\r\n", measurements.hum_1);
       Serial.printf("[1] Temperature compensated in C: %0.2f\r\n",
-                    ag->pms5003t_1.temperatureCompensated(measurements.temp_1));
+                    ag->pms5003t_1.compensateTemp(measurements.temp_1));
-      Serial.printf("[1] Relative Humidity compensated: %f\r\n",
+      Serial.printf("[1] Relative Humidity compensated: %0.2f\r\n",
-                    ag->pms5003t_1.humidityCompensated(measurements.hum_1));
+                    ag->pms5003t_1.compensateHum(measurements.hum_1));
+      Serial.printf("[1] PM firmware version: %d\r\n", ag->pms5003t_1.getFirmwareVersion());
+
+      ag->pms5003t_1.resetFailCount();
     } else {
-      measurements.pm01_1 = -1;
+      if (configuration.hasSensorPMS1) {
-      measurements.pm25_1 = -1;
+        ag->pms5003t_1.updateFailCount();
-      measurements.pm10_1 = -1;
+        Serial.printf("[1] PMS read failed %d times\r\n", ag->pms5003t_1.getFailCount());
-      measurements.pm03PCount_1 = -1;
+
-      measurements.temp_1 = -1001;
+        if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.hum_1 = -1;
+          measurements.pm01_1 = utils::getInvalidPmValue();
+          measurements.pm25_1 = utils::getInvalidPmValue();
+          measurements.pm10_1 = utils::getInvalidPmValue();
+          measurements.pm03PCount_1 = utils::getInvalidPmValue();
+          measurements.temp_1 = utils::getInvalidTemperature();
+          measurements.hum_1 = utils::getInvalidHumidity();
+        }
+
+        if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) {
+          restart = true;
+        }
+      }
     }
 
     if (configuration.hasSensorPMS2 && (ag->pms5003t_2.isFailed() == false)) {
@@ -1081,16 +1101,30 @@ static void updatePm(void) {
       Serial.printf("[2] Temperature in C: %0.2f\r\n", measurements.temp_2);
       Serial.printf("[2] Relative Humidity: %d\r\n", measurements.hum_2);
       Serial.printf("[2] Temperature compensated in C: %0.2f\r\n",
-                    ag->pms5003t_1.temperatureCompensated(measurements.temp_2));
+                    ag->pms5003t_1.compensateTemp(measurements.temp_2));
-      Serial.printf("[2] Relative Humidity compensated: %d\r\n",
+      Serial.printf("[2] Relative Humidity compensated: %0.2f\r\n",
-                    ag->pms5003t_1.humidityCompensated(measurements.hum_2));
+                    ag->pms5003t_1.compensateHum(measurements.hum_2));
+      Serial.printf("[2] PM firmware version: %d\r\n", ag->pms5003t_2.getFirmwareVersion());
+
+      ag->pms5003t_2.resetFailCount();
     } else {
-      measurements.pm01_2 = -1;
+      if (configuration.hasSensorPMS2) {
-      measurements.pm25_2 = -1;
+        ag->pms5003t_2.updateFailCount();
-      measurements.pm10_2 = -1;
+        Serial.printf("[2] PMS read failed %d times\r\n", ag->pms5003t_2.getFailCount());
-      measurements.pm03PCount_2 = -1;
+
-      measurements.temp_2 = -1001;
+        if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
-      measurements.hum_2 = -1;
+          measurements.pm01_2 = utils::getInvalidPmValue();
+          measurements.pm25_2 = utils::getInvalidPmValue();
+          measurements.pm10_2 = utils::getInvalidPmValue();
+          measurements.pm03PCount_2 = utils::getInvalidPmValue();
+          measurements.temp_2 = utils::getInvalidTemperature();
+          measurements.hum_2 = utils::getInvalidHumidity();
+        }
+
+        if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) {
+          restart = true;
+        }
+      }
     }
 
     if (configuration.hasSensorPMS1 && configuration.hasSensorPMS2 &&
@@ -1190,6 +1224,11 @@ static void updatePm(void) {
       ag->sgp41.setCompensationTemperatureHumidity(temp, hum);
     }
   }
+
+  if (restart) {
+    Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
+    ESP.restart();
+  }
 }
 
 static void sendDataToServer(void) {
@@ -1230,6 +1269,8 @@ static void tempHumUpdate(void) {
                                                    measurements.Humidity);
     }
   } else {
+    measurements.Temperature = utils::getInvalidTemperature();
+    measurements.Humidity = utils::getInvalidHumidity();
     Serial.println("SHT read failed");
   }
 }

examples/OneOpenAir/OpenMetrics.cpp

@@ -65,14 +65,14 @@ String OpenMetrics::getPayload(void) {
     add_metric_point("", String(measure.CO2));
   }
 
-  float _temp = -1001;
+  float _temp = utils::getInvalidTemperature();
-  float _hum = -1;
+  float _hum = utils::getInvalidHumidity();
-  int pm01 = -1;
+  int pm01 = utils::getInvalidPmValue();
-  int pm25 = -1;
+  int pm25 = utils::getInvalidPmValue();
-  int pm10 = -1;
+  int pm10 = utils::getInvalidPmValue();
-  int pm03PCount = -1;
+  int pm03PCount = utils::getInvalidPmValue();
-  int atmpCompensated = -1;
+  int atmpCompensated = utils::getInvalidTemperature();
-  int ahumCompensated = -1;
+  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;
@@ -118,33 +118,33 @@ String OpenMetrics::getPayload(void) {
     atmpCompensated = _temp;
     ahumCompensated = _hum;
   } else {
-    atmpCompensated = ag->pms5003t_1.temperatureCompensated(_temp);
+    atmpCompensated = ag->pms5003t_1.compensateTemp(_temp);
-    ahumCompensated = ag->pms5003t_1.humidityCompensated(_hum);
+    ahumCompensated = ag->pms5003t_1.compensateHum(_hum);
   }
 
   if (config.hasSensorPMS1 || config.hasSensorPMS2) {
-    if (pm01 >= 0) {
+    if (utils::isValidPm(pm01)) {
       add_metric("pm1",
                  "PM1.0 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm01));
     }
-    if (pm25 >= 0) {
+    if (utils::isValidPm(pm25)) {
       add_metric("pm2d5",
                  "PM2.5 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm25));
     }
-    if (pm10 >= 0) {
+    if (utils::isValidPm(pm10)) {
       add_metric("pm10",
                  "PM10 concentration as measured by the AirGradient PMS "
                  "sensor, in micrograms per cubic meter",
                  "gauge", "ugm3");
       add_metric_point("", String(pm10));
     }
-    if (pm03PCount >= 0) {
+    if (utils::isValidPm03Count(pm03PCount)) {
       add_metric("pm0d3",
                  "PM0.3 concentration as measured by the AirGradient PMS "
                  "sensor, in number of particules per 100 milliliters",
@@ -154,28 +154,28 @@ String OpenMetrics::getPayload(void) {
   }
 
   if (config.hasSensorSGP) {
-    if (measure.TVOC >= 0) {
+    if (utils::isValidVOC(measure.TVOC)) {
       add_metric("tvoc_index",
                  "The processed Total Volatile Organic Compounds (TVOC) index "
                  "as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOC));
     }
-    if (measure.TVOCRaw >= 0) {
+    if (utils::isValidVOC(measure.TVOCRaw)) {
       add_metric("tvoc_raw",
                  "The raw input value to the Total Volatile Organic Compounds "
                  "(TVOC) index as measured by the AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.TVOCRaw));
     }
-    if (measure.NOx >= 0) {
+    if (utils::isValidNOx(measure.NOx)) {
       add_metric("nox_index",
                  "The processed Nitrous Oxide (NOx) index as measured by the "
                  "AirGradient SGP sensor",
                  "gauge");
       add_metric_point("", String(measure.NOx));
     }
-    if (measure.NOxRaw >= 0) {
+    if (utils::isValidNOx(measure.NOxRaw)) {
       add_metric("nox_raw",
                  "The raw input value to the Nitrous Oxide (NOx) index as "
                  "measured by the AirGradient SGP sensor",
@@ -184,14 +184,14 @@ String OpenMetrics::getPayload(void) {
     }
   }
 
-  if (_temp > -1001) {
+  if (utils::isValidTemperature(_temp)) {
     add_metric("temperature",
                "The ambient temperature as measured by the AirGradient SHT / PMS "
                "sensor, in degrees Celsius",
                "gauge", "celsius");
     add_metric_point("", String(_temp));
   }
-  if (atmpCompensated > -1001) {
+  if (utils::isValidTemperature(atmpCompensated)) {
     add_metric(
         "temperature_compensated",
         "The compensated ambient temperature as measured by the AirGradient SHT / PMS "
@@ -199,14 +199,14 @@ String OpenMetrics::getPayload(void) {
         "gauge", "celsius");
     add_metric_point("", String(atmpCompensated));
   }
-  if (_hum >= 0) {
+  if (utils::isValidHumidity(_hum)) {
     add_metric(
         "humidity",
         "The relative humidity as measured by the AirGradient SHT sensor",
         "gauge", "percent");
     add_metric_point("", String(_hum));
   }
-  if (ahumCompensated >= 0) {
+  if (utils::isValidHumidity(ahumCompensated)) {
     add_metric(
         "humidity_compensated",
         "The compensated relative humidity as measured by the AirGradient SHT / PMS sensor",

library.properties

@@ -1,5 +1,5 @@
 name=AirGradient Air Quality Sensor
-version=3.1.4
+version=3.1.8
 author=AirGradient <support@airgradient.com>
 maintainer=AirGradient <support@airgradient.com>
 sentence=ESP32-C3 / ESP8266 library for air quality monitor measuring PM, CO2, Temperature, TVOC and Humidity with OLED display.

src/AgApiClient.cpp

@@ -22,6 +22,7 @@ AgApiClient::~AgApiClient() {}
 void AgApiClient::begin(void) {
   getConfigFailed = false;
   postToServerFailed = false;
+  logInfo("Init apiRoot: " + apiRoot);
   logInfo("begin");
 }
 
@@ -44,9 +45,8 @@ bool AgApiClient::fetchServerConfiguration(void) {
     return false;
   }
 
-  String uri =
+  String uri = apiRoot + "/sensors/airgradient:" +
-      "http://hw.airgradient.com/sensors/airgradient:" + ag->deviceId() +
+               ag->deviceId() + "/one/config";
-      "/one/config";
 
   /** Init http client */
 #ifdef ESP8266
@@ -58,6 +58,7 @@ bool AgApiClient::fetchServerConfiguration(void) {
   }
 #else
   HTTPClient client;
+  client.setTimeout(timeoutMs);
   if (client.begin(uri) == false) {
     getConfigFailed = true;
     return false;
@@ -66,6 +67,10 @@ bool AgApiClient::fetchServerConfiguration(void) {
 
   /** Get data */
   int retCode = client.GET();
+
+  logInfo(String("GET: ") + uri);
+  logInfo(String("Return code: ") + String(retCode));
+
   if (retCode != 200) {
     client.end();
     getConfigFailed = true;
@@ -109,21 +114,25 @@ bool AgApiClient::postToServer(String data) {
     return false;
   }
 
-  String uri =
+  String uri = apiRoot + "/sensors/airgradient:" + ag->deviceId() + "/measures";
-      "http://hw.airgradient.com/sensors/airgradient:" + ag->deviceId() +
+  // logInfo("Post uri: " + uri);
-      "/measures";
+  // logInfo("Post data: " + data);
-  logInfo("Post uri: " + uri);
-  logInfo("Post data: " + data);
 
   WiFiClient wifiClient;
   HTTPClient client;
+  client.setTimeout(timeoutMs);
   if (client.begin(wifiClient, uri.c_str()) == false) {
+    logError("Init client failed");
     return false;
   }
   client.addHeader("content-type", "application/json");
   int retCode = client.POST(data);
   client.end();
 
+  logInfo(String("POST: ") + uri);
+  logInfo(String("DATA: ") + data);
+  logInfo(String("Return code: ") + String(retCode));
+
   if ((retCode == 200) || (retCode == 429)) {
     postToServerFailed = false;
     return true;
@@ -177,3 +186,16 @@ bool AgApiClient::sendPing(int rssi, int bootCount) {
   root["boot"] = bootCount;
   return postToServer(JSON.stringify(root));
 }
+
+String AgApiClient::getApiRoot() const { return apiRoot; }
+
+void AgApiClient::setApiRoot(const String &apiRoot) { this->apiRoot = apiRoot; }
+
+/**
+ * @brief Set http request timeout. (Default: 10s)
+ *
+ * @param timeoutMs
+ */
+void AgApiClient::setTimeout(uint16_t timeoutMs) {
+  this->timeoutMs = timeoutMs;
+}

src/AgApiClient.h

@@ -20,10 +20,12 @@ class AgApiClient : public PrintLog {
 private:
   Configuration &config;
   AirGradient *ag;
+  String apiRoot = "http://hw.airgradient.com";
 
   bool getConfigFailed;
   bool postToServerFailed;
   bool notAvailableOnDashboard = false; // Device not setup on Airgradient cloud dashboard.
+  uint16_t timeoutMs = 10000;           // Default set to 10s
 
 public:
   AgApiClient(Stream &stream, Configuration &config);
@@ -37,6 +39,9 @@ public:
   bool isNotAvailableOnDashboard(void);
   void setAirGradient(AirGradient *ag);
   bool sendPing(int rssi, int bootCount);
+  String getApiRoot() const;
+  void setApiRoot(const String &apiRoot);
+  void setTimeout(uint16_t timeoutMs);
 };
 
 #endif /** _AG_API_CLIENT_H_ */

src/AgConfigure.cpp

@@ -264,12 +264,14 @@ bool Configuration::parse(String data, bool isLocal) {
                         jconfig[jprop_configurationControl]);
         }
 
-        /** Check to return result if configurationControl is 'cloud' */
+        /** Return failed if new "configurationControl" new and old is "cloud" */
-        if (ctrl ==
+        if (ctrl == String(CONFIGURATION_CONTROL_NAME [ConfigurationControl::ConfigurationControlCloud])) {
-            String(CONFIGURATION_CONTROL_NAME
+          if(ctrl != lastCtrl) {
-                       [ConfigurationControl::ConfigurationControlCloud])) {
-          failedMessage = String(msg);
             return true;
+          } else {
+            failedMessage = String(msg);
+            return false;
+          }
         }
       } else {
         failedMessage =

src/AgOledDisplay.cpp

@@ -1,5 +1,6 @@
 #include "AgOledDisplay.h"
 #include "Libraries/U8g2/src/U8g2lib.h"
+#include "Main/utils.h"
 
 /** Cast U8G2 */
 #define DISP() ((U8G2_SH1106_128X64_NONAME_F_HW_I2C *)(this->u8g2))
@@ -10,8 +11,8 @@
  * @param hasStatus
  */
 void OledDisplay::showTempHum(bool hasStatus) {
-  char buf[10];
+  char buf[16];
-  if (value.Temperature > -1001) {
+  if (utils::isValidTemperature(value.Temperature)) {
     if (config.isTemperatureUnitInF()) {
       float tempF = (value.Temperature * 9) / 5 + 32;
       if (hasStatus) {
@@ -36,10 +37,10 @@ void OledDisplay::showTempHum(bool hasStatus) {
   DISP()->drawUTF8(1, 10, buf);
 
   /** Show humidty */
-  if (value.Humidity >= 0) {
+  if (utils::isValidHumidity(value.Humidity)) {
     snprintf(buf, sizeof(buf), "%d%%", value.Humidity);
   } else {
-    snprintf(buf, sizeof(buf), "%-%%");
+    snprintf(buf, sizeof(buf), "-%%");
   }
 
   if (value.Humidity > 99) {
@@ -283,12 +284,8 @@ void OledDisplay::showDashboard(const char *status) {
       DISP()->drawUTF8(1, 27, "CO2");
 
       DISP()->setFont(u8g2_font_t0_22b_tf);
-      if (value.CO2 > 0) {
+      if (utils::isValidCO2(value.CO2)) {
-        int val = 9999;
+        sprintf(strBuf, "%d", value.CO2);
-        if (value.CO2 < 10000) {
-          val = value.CO2;
-        }
-        sprintf(strBuf, "%d", val);
       } else {
         sprintf(strBuf, "%s", "-");
       }
@@ -299,88 +296,112 @@ void OledDisplay::showDashboard(const char *status) {
       DISP()->drawStr(1, 61, "ppm");
 
       /** Draw vertical line */
-      DISP()->drawLine(45, 14, 45, 64);
+      DISP()->drawLine(52, 14, 52, 64);
-      DISP()->drawLine(82, 14, 82, 64);
+      DISP()->drawLine(97, 14, 97, 64);
 
       /** Draw PM2.5 label */
       DISP()->setFont(u8g2_font_t0_12_tf);
-      DISP()->drawStr(48, 27, "PM2.5");
+      DISP()->drawStr(55, 27, "PM2.5");
 
       /** Draw PM2.5 value */
+      int pm25 = value.pm25_1;
+      if (config.hasSensorSHT) {
+        pm25 = ag->pms5003.compensate(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 (value.pm25_1 >= 0) {
+        if (utils::isValidPm(pm25)) {
-          sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(value.pm25_1));
+          sprintf(strBuf, "%d", ag->pms5003.convertPm25ToUsAqi(pm25));
         } else {
           sprintf(strBuf, "%s", "-");
         }
-        DISP()->drawStr(48, 48, strBuf);
+        DISP()->drawStr(55, 48, strBuf);
         DISP()->setFont(u8g2_font_t0_12_tf);
-        DISP()->drawUTF8(48, 61, "AQI");
+        DISP()->drawUTF8(55, 61, "AQI");
       } else {
-        if (value.pm25_1 >= 0) {
+        if (utils::isValidPm(pm25)) {
-          sprintf(strBuf, "%d", value.pm25_1);
+          sprintf(strBuf, "%d", pm25);
         } else {
           sprintf(strBuf, "%s", "-");
         }
-        DISP()->drawStr(48, 48, strBuf);
+        DISP()->drawStr(55, 48, strBuf);
         DISP()->setFont(u8g2_font_t0_12_tf);
-        DISP()->drawUTF8(48, 61, "ug/m³");
+        DISP()->drawUTF8(55, 61, "ug/m³");
       }
 
       /** Draw tvocIndexlabel */
       DISP()->setFont(u8g2_font_t0_12_tf);
-      DISP()->drawStr(85, 27, "tvoc:");
+      DISP()->drawStr(100, 27, "VOC:");
 
       /** Draw tvocIndexvalue */
-      if (value.TVOC >= 0) {
+      if (utils::isValidVOC(value.TVOC)) {
         sprintf(strBuf, "%d", value.TVOC);
       } else {
         sprintf(strBuf, "%s", "-");
       }
-      DISP()->drawStr(85, 39, strBuf);
+      DISP()->drawStr(100, 39, strBuf);
 
       /** Draw NOx label */
-      DISP()->drawStr(85, 53, "NOx:");
+      DISP()->drawStr(100, 53, "NOx:");
-      if (value.NOx >= 0) {
+      if (utils::isValidNOx(value.NOx)) {
         sprintf(strBuf, "%d", value.NOx);
       } else {
         sprintf(strBuf, "%s", "-");
       }
-      DISP()->drawStr(85, 63, strBuf);
+      DISP()->drawStr(100, 63, strBuf);
     } while (DISP()->nextPage());
   } else if (ag->isBasic()) {
     ag->display.clear();
 
     /** Set CO2 */
+    if(utils::isValidCO2(value.CO2)) {
       snprintf(strBuf, sizeof(strBuf), "CO2:%d", value.CO2);
+    } else {
+      snprintf(strBuf, sizeof(strBuf), "CO2:-");
+    }
+    
     ag->display.setCursor(0, 0);
     ag->display.setText(strBuf);
 
     /** Set PM */
+    int pm25 = value.pm25_1;
+    if(config.hasSensorSHT) {
+      pm25 = (int)ag->pms5003.compensate(pm25, value.Humidity);
+    }
     ag->display.setCursor(0, 12);
-    snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", value.pm25_1);
+    if (utils::isValidPm(pm25)) {
+      snprintf(strBuf, sizeof(strBuf), "PM2.5:%d", pm25);
+    } else {
+      snprintf(strBuf, sizeof(strBuf), "PM2.5:-");
+    }
     ag->display.setText(strBuf);
 
     /** Set temperature and humidity */
-    if (value.Temperature <= -1001.0f) {
+    if (utils::isValidTemperature(value.Temperature)) {
+      if (config.isTemperatureUnitInF()) {
+        float tempF = (value.Temperature * 9) / 5 + 32;
+        snprintf(strBuf, sizeof(strBuf), "T:%0.1f F", tempF);
+      } else {
+        snprintf(strBuf, sizeof(strBuf), "T:%0.f1 C", value.Temperature);
+      }
+    } else {
       if (config.isTemperatureUnitInF()) {
         snprintf(strBuf, sizeof(strBuf), "T:-F");
       } else {
         snprintf(strBuf, sizeof(strBuf), "T:-C");
       }
-    } else {
-      if (config.isTemperatureUnitInF()) {
-        float tempF = (value.Temperature * 9) / 5 + 32;
-        snprintf(strBuf, sizeof(strBuf), "T:%d F", (int)tempF);
-      } else {
-        snprintf(strBuf, sizeof(strBuf), "T:%d C", (int)value.Temperature);
-      }
     }
+
     ag->display.setCursor(0, 24);
     ag->display.setText(strBuf);
 
+    if (utils::isValidHumidity(value.Humidity)) {
       snprintf(strBuf, sizeof(strBuf), "H:%d %%", (int)value.Humidity);
+    } else {
+      snprintf(strBuf, sizeof(strBuf), "H:- %%");
+    }
+
     ag->display.setCursor(0, 36);
     ag->display.setText(strBuf);
 
@@ -498,7 +519,7 @@ void OledDisplay::showRebooting(void) {
     do {
       DISP()->setFont(u8g2_font_t0_16_tf);
       // setCentralText(20, "Firmware Update");
-      setCentralText(40, "Reboot...");
+      setCentralText(40, "Rebooting...");
       // setCentralText(60, String("Retry after 24h"));
     } while (DISP()->nextPage());
   } else if (ag->isBasic()) {

src/AgStateMachine.cpp

@@ -1,5 +1,6 @@
 #include "AgStateMachine.h"
 
+#define LED_TEST_BLINK_DELAY  50  /** ms */
 #define LED_FAST_BLINK_DELAY 250  /** ms */
 #define LED_SLOW_BLINK_DELAY 1000 /** ms */
 #define LED_SHORT_BLINK_DELAY 500 /** ms */
@@ -9,9 +10,9 @@
 
 #define RGB_COLOR_R 255, 0, 0    /** Red */
 #define RGB_COLOR_G 0, 255, 0    /** Green */
-#define RGB_COLOR_Y 255, 255, 0  /** Yellow */
+#define RGB_COLOR_Y 255, 150, 0  /** Yellow */
-#define RGB_COLOR_O 255, 165, 0  /** Organge */
+#define RGB_COLOR_O 255, 40, 0  /** Orange */
-#define RGB_COLOR_P 160, 32, 240 /** Purple */
+#define RGB_COLOR_P 180, 0, 255 /** Purple */
 
 /**
  * @brief Animation LED bar with color
@@ -140,7 +141,7 @@ void StateMachine::co2handleLeds(void) {
  *
  */
 void StateMachine::pm25handleLeds(void) {
-  int pm25Value = value.pm25_1;
+  int pm25Value = ag->pms5003.compensate(value.pm25_1, value.Humidity);
   if (pm25Value < 5) {
     /** G; 1 */
     ag->ledBar.setColor(RGB_COLOR_G, ag->ledBar.getNumberOfLeds() - 1);
@@ -305,6 +306,7 @@ void StateMachine::co2Calibration(void) {
 
 void StateMachine::ledBarTest(void) {
   if (config.isLedBarTestRequested()) {
+    if (ag->isOne()) {
       if (config.getCountry() == "TH") {
         uint32_t tstart = millis();
         logInfo("Start run LED test for 2 min");
@@ -320,11 +322,16 @@ void StateMachine::ledBarTest(void) {
         ledBarRunTest();
       }
     }
+    else if(ag->isOpenAir()) {
+      ledBarRunTest();
+    }
+  }
 }
 
 void StateMachine::ledBarPowerUpTest(void) { ledBarRunTest(); }
 
 void StateMachine::ledBarRunTest(void) {
+  if (ag->isOne()) {
     disp.setText("LED Test", "running", ".....");
     runLedTest('r');
     ag->ledBar.show();
@@ -341,6 +348,14 @@ void StateMachine::ledBarRunTest(void) {
     runLedTest('n');
     ag->ledBar.show();
     delay(1000);
+  } else if (ag->isOpenAir()) {
+    for (int i = 0; i < 100; i++) {
+      ag->statusLed.setOn();
+      delay(LED_TEST_BLINK_DELAY);
+      ag->statusLed.setOff();
+      delay(LED_TEST_BLINK_DELAY);
+    }
+  }
 }
 
 void StateMachine::runLedTest(char color) {
@@ -573,7 +588,7 @@ void StateMachine::handleLeds(AgStateMachineState state) {
   case AgStateMachineWiFiManagerMode: {
     /** In WiFi Manager Mode */
     /** Turn LED OFF */
-    /** Turn midle LED Color */
+    /** Turn middle LED Color */
     if (ag->isOne()) {
       ag->ledBar.setColor(0, 0, 255, ag->ledBar.getNumberOfLeds() / 2);
     } else {
@@ -713,7 +728,7 @@ void StateMachine::handleLeds(AgStateMachineState state) {
     break;
   }
   case AgStateMachineSensorConfigFailed: {
-    /** Server is reachable but there is some configuration issue to be fixed on
+    /** Server is reachable but there is some configuration issue to be fixed on
      * the server side */
     if (ag->isOne()) {
       ag->ledBar.setColor(139, 24, 248, 0);

src/AgValue.cpp

@@ -1,8 +1,42 @@
 #include "AgValue.h"
 #include "AgConfigure.h"
 #include "AirGradient.h"
+#include "Main/utils.h"
 #include "Libraries/Arduino_JSON/src/Arduino_JSON.h"
 
+#define json_prop_pmFirmware     "firmware"
+
+/**
+ * @brief Get PMS5003 firmware version string
+ * 
+ * @param fwCode 
+ * @return String
+ */
+String Measurements::pms5003FirmwareVersion(int fwCode) {
+  return pms5003FirmwareVersionBase("PMS5003x", fwCode);
+}
+
+/**
+ * @brief Get PMS5003T firmware version string
+ * 
+ * @param fwCode 
+ * @return String
+ */
+String Measurements::pms5003TFirmwareVersion(int fwCode) {
+  return pms5003FirmwareVersionBase("PMS5003x", fwCode);
+}
+
+/**
+ * @brief Get firmware version string
+ * 
+ * @param prefix Prefix firmware string
+ * @param fwCode Version code
+ * @return string 
+ */
+String Measurements::pms5003FirmwareVersionBase(String prefix, int fwCode) {
+  return prefix + String("-") + String(fwCode);
+}
+
 String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
                               void *_ag, void *_config) {
   AirGradient *ag = (AirGradient *)_ag;
@@ -13,36 +47,40 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
   if (localServer) {
     root["serialno"] = ag->deviceId();
   }
-  if (config->hasSensorS8) {
+
-    if (this->CO2 >= 0) {
+  if (config->hasSensorS8 && utils::isValidCO2(this->CO2)) {
     root["rco2"] = this->CO2;
   }
-  }
 
   if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
     if (config->hasSensorPMS1) {
-      if (this->pm01_1 >= 0) {
+      if (utils::isValidPm(this->pm01_1)) {
         root["pm01"] = this->pm01_1;
       }
-      if (this->pm25_1 >= 0) {
+      if (utils::isValidPm(this->pm25_1)) {
         root["pm02"] = this->pm25_1;
       }
-      if (this->pm10_1 >= 0) {
+      if (utils::isValidPm(this->pm10_1)) {
         root["pm10"] = this->pm10_1;
       }
-      if (this->pm03PCount_1 >= 0) {
+      if (utils::isValidPm03Count(this->pm03PCount_1)) {
         root["pm003Count"] = this->pm03PCount_1;
       }
+      if (!localServer) {
+
+        root[json_prop_pmFirmware] =
+            this->pms5003FirmwareVersion(ag->pms5003.getFirmwareVersion());
+      }
     }
 
     if (config->hasSensorSHT) {
-      if (this->Temperature > -1001) {
+      if (utils::isValidTemperature(this->Temperature)) {
         root["atmp"] = ag->round2(this->Temperature);
         if (localServer) {
           root["atmpCompensated"] = ag->round2(this->Temperature);
         }
       }
-      if (this->Humidity >= 0) {
+      if (utils::isValidHumidity(this->Humidity)) {
         root["rhum"] = this->Humidity;
         if (localServer) {
           root["rhumCompensated"] = this->Humidity;
@@ -50,109 +88,297 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
       }
     }
 
-  } else {
+    if (config->hasSensorSHT && config->hasSensorPMS1) {
-    if (config->hasSensorPMS1 && config->hasSensorPMS2) {
+      int pm25 = ag->pms5003.compensate(this->pm25_1, this->Humidity);
-      root["pm01"] = ag->round2((this->pm01_1 + this->pm01_2) / 2.0);
+      if (pm25 >= 0) {
-      root["pm02"] = ag->round2((this->pm25_1 + this->pm25_2) / 2.0);
+        root["pm02Compensated"] = pm25;
-      root["pm10"] = ag->round2((this->pm10_1 + this->pm10_2) / 2.0);
-      root["pm003Count"] =
-          ag->round2((this->pm03PCount_1 + this->pm03PCount_2) / 2.0);
-      root["atmp"] = ag->round2((this->temp_1 + this->temp_2) / 2.0f);
-      root["rhum"] = ag->round2((this->hum_1 + this->hum_2) / 2.0f);
-      if (localServer) {
-        root["atmpCompensated"] =
-            ag->round2(ag->pms5003t_2.temperatureCompensated(
-                (this->temp_1 + this->temp_2) / 2.0f));
-        root["rhumCompensated"] = (int)ag->pms5003t_2.humidityCompensated(
-            (this->hum_1 + this->hum_2) / 2.0f);
       }
     }
 
-    if (fwMode == FW_MODE_O_1PS || fwMode == FW_MODE_O_1PST) {
+  } else {
-      if (config->hasSensorPMS1) {
+    if (config->hasSensorPMS1 && config->hasSensorPMS2) {
-        root["pm01"] = this->pm01_1;
+      if (utils::isValidPm(this->pm01_1) && utils::isValidPm(this->pm01_2)) {
-        root["pm02"] = this->pm25_1;
+        root["pm01"] = ag->round2((this->pm01_1 + this->pm01_2) / 2.0f);
-        root["pm10"] = this->pm10_1;
+      }
-        root["pm003Count"] = this->pm03PCount_1;
+      if (utils::isValidPm(this->pm25_1) && utils::isValidPm(this->pm25_2)) {
-        root["atmp"] = ag->round2(this->temp_1);
+        root["pm02"] = ag->round2((this->pm25_1 + this->pm25_2) / 2.0f);
-        root["rhum"] = this->hum_1;
+      }
+      if (utils::isValidPm(this->pm10_1) && utils::isValidPm(this->pm10_2)) {
+        root["pm10"] = ag->round2((this->pm10_1 + this->pm10_2) / 2.0f);
+      }
+      if (utils::isValidPm(this->pm03PCount_1) && utils::isValidPm(this->pm03PCount_2)) {
+        root["pm003Count"] = ag->round2((this->pm03PCount_1 + this->pm03PCount_2) / 2.0f);
+      }
+
+      float val;
+      if (utils::isValidTemperature(this->temp_1) && utils::isValidTemperature(this->temp_1)) {
+        root["atmp"] = ag->round2((this->temp_1 + this->temp_2) / 2.0f);
         if (localServer) {
-          root["atmpCompensated"] =
+          val = ag->pms5003t_2.compensateTemp((this->temp_1 + this->temp_2) / 2.0f);
-              ag->round2(ag->pms5003t_1.temperatureCompensated(this->temp_1));
+          if (utils::isValidTemperature(val)) {
-          root["rhumCompensated"] =
+            root["atmpCompensated"] = ag->round2(val);
-              (int)ag->pms5003t_1.humidityCompensated(this->hum_1);
+          }
+        }
+      }
+      if (utils::isValidHumidity(this->hum_1) && utils::isValidHumidity(this->hum_1)) {
+        root["rhum"] = ag->round2((this->hum_1 + this->hum_2) / 2.0f);
+        if (localServer) {
+          val = ag->pms5003t_2.compensateHum((this->hum_1 + this->hum_2) / 2.0f);
+          if (utils::isValidHumidity(val)) {
+            root["rhumCompensated"] = (int)val;
+          }
+        }
+      }
+
+      int pm25 = (ag->pms5003t_1.compensate(this->pm25_1, this->hum_1) +
+                  ag->pms5003t_2.compensate(this->pm25_2, this->hum_2)) /
+                 2;
+      root["pm02Compensated"] = pm25;
+    }
+
+    if (fwMode == FW_MODE_O_1PS || fwMode == FW_MODE_O_1PST) {
+      float val;
+      if (config->hasSensorPMS1) {
+        if (utils::isValidPm(this->pm01_1)) {
+          root["pm01"] = this->pm01_1;
+        }
+        if (utils::isValidPm(this->pm25_1)) {
+          root["pm02"] = this->pm25_1;
+        }
+        if (utils::isValidPm(this->pm10_1)) {
+          root["pm10"] = this->pm10_1;
+        }
+        if (utils::isValidPm03Count(this->pm03PCount_1)) {
+          root["pm003Count"] = this->pm03PCount_1;
+        }
+        if (utils::isValidTemperature(this->temp_1)) {
+          root["atmp"] = ag->round2(this->temp_1);
+
+          if (localServer) {
+            val = ag->pms5003t_1.compensateTemp(this->temp_1);
+            if (utils::isValidTemperature(val)) {
+              root["atmpCompensated"] = ag->round2(val);
+            }
+          }
+        }
+        if (utils::isValidHumidity(this->hum_1)) {
+          root["rhum"] = this->hum_1;
+
+          if (localServer) {
+            val = ag->pms5003t_1.compensateHum(this->hum_1);
+            if (utils::isValidHumidity(val)) {
+              root["rhumCompensated"] = (int)val;
+            }
+          }
+        }
+        root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->hum_1);
+        if (!localServer) {
+          root[json_prop_pmFirmware] =
+              pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
         }
       }
       if (config->hasSensorPMS2) {
+        if(utils::isValidPm(this->pm01_2)) {
           root["pm01"] = this->pm01_2;
+        }
+        if(utils::isValidPm(this->pm25_2)) {
           root["pm02"] = this->pm25_2;
+        }
+        if(utils::isValidPm(this->pm10_2)) {
           root["pm10"] = this->pm10_2;
+        }
+        if(utils::isValidPm03Count(this->pm03PCount_2)) {
           root["pm003Count"] = this->pm03PCount_2;
+        }
+
+        float val;
+        if (utils::isValidTemperature(this->temp_2)) {
           root["atmp"] = ag->round2(this->temp_2);
-        root["rhum"] = this->hum_2;
+
           if (localServer) {
-          root["atmpCompensated"] =
+            val = ag->pms5003t_2.compensateTemp(this->temp_2);
-              ag->round2(ag->pms5003t_2.temperatureCompensated(this->temp_2));
+            if (utils::isValidTemperature(val)) {
-          root["rhumCompensated"] =
+              root["atmpCompensated"] = ag->round2(val);
-              (int)ag->pms5003t_2.humidityCompensated(this->hum_2);
+            }
+          }
+        }
+        if(utils::isValidHumidity(this->hum_2)) {
+          root["rhum"] = this->hum_2;
+
+          if (localServer) {
+            val = ag->pms5003t_2.compensateHum(this->hum_2);
+            if (utils::isValidHumidity(val)) {
+              root["rhumCompensated"] = (int)val;
+            }
+          }
+        }
+        root["pm02Compensated"] = ag->pms5003t_2.compensate(this->pm25_2, this->hum_2);
+        if(!localServer) {
+          root[json_prop_pmFirmware] =
+              pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
         }
       }
     } else {
       if (fwMode == FW_MODE_O_1P) {
+        float val;
         if (config->hasSensorPMS1) {
+          if (utils::isValidPm(this->pm01_1)) {
             root["pm01"] = this->pm01_1;
+          }
+          if (utils::isValidPm(this->pm25_1)) {
             root["pm02"] = this->pm25_1;
+          }
+          if (utils::isValidPm(this->pm10_1)) {
             root["pm10"] = this->pm10_1;
+          }
+          if (utils::isValidPm03Count(this->pm03PCount_1)) {
             root["pm003Count"] = this->pm03PCount_1;
+          }
+          if (utils::isValidTemperature(this->temp_1)) {
             root["atmp"] = ag->round2(this->temp_1);
+
+            if (localServer) {
+              val = ag->pms5003t_1.compensateTemp(this->temp_1);
+              if (utils::isValidTemperature(val)) {
+                root["atmpCompensated"] = ag->round2(val);
+              }
+            }
+          }
+          if (utils::isValidHumidity(this->hum_1)) {
             root["rhum"] = this->hum_1;
             if(localServer) {
-            root["atmpCompensated"] =
+              val = ag->pms5003t_1.compensateHum(this->hum_1);
-                ag->round2(ag->pms5003t_1.temperatureCompensated(this->temp_1));
+              if(utils::isValidHumidity(val)) {
-            root["rhumCompensated"] =
+                root["rhumCompensated"] = (int)val;
-                (int)ag->pms5003t_1.humidityCompensated(this->hum_1);
+              }
+            }
+          }
+          root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->hum_1);
+          if(!localServer) {
+            root[json_prop_pmFirmware] =
+                pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
           }
         } else if (config->hasSensorPMS2) {
+          if(utils::isValidPm(this->pm01_2)) {
             root["pm01"] = this->pm01_2;
+          }
+          if(utils::isValidPm(this->pm25_2)) {
             root["pm02"] = this->pm25_2;
+          }
+          if(utils::isValidPm(this->pm10_2)) {
             root["pm10"] = this->pm10_2;
+          }
+          if(utils::isValidPm03Count(this->pm03PCount_2)) {
             root["pm003Count"] = this->pm03PCount_2;
+          }
+          if (utils::isValidTemperature(this->temp_2)) {
             root["atmp"] = ag->round2(this->temp_2);
-          root["rhum"] = this->hum_2;
             if (localServer) {
-            root["atmpCompensated"] =
+
-                ag->round2(ag->pms5003t_1.temperatureCompensated(this->temp_2));
+              val = ag->pms5003t_1.compensateTemp(this->temp_2);
-            root["rhumCompensated"] =
+              if (utils::isValidTemperature(val)) {
-                (int)ag->pms5003t_1.humidityCompensated(this->hum_2);
+                root["atmpCompensated"] = ag->round2(val);
+              }
+            }
+          }
+          if (utils::isValidHumidity(this->hum_2)) {
+            root["rhum"] = this->hum_2;
+
+            if(localServer) {
+              val = ag->pms5003t_1.compensateHum(this->hum_2);
+              if(utils::isValidHumidity(val)) {
+                root["rhumCompensated"] = (int)val;
+              }
+            }
+          }
+          root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->hum_1);
+          if(!localServer) {
+            root[json_prop_pmFirmware] =
+                pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion());
           }
         }
       } else {
+        float val;
         if (config->hasSensorPMS1) {
+          if(utils::isValidPm(this->pm01_1)) {
             root["channels"]["1"]["pm01"] = this->pm01_1;
+          }
+          if(utils::isValidPm(this->pm25_1)) {
             root["channels"]["1"]["pm02"] = this->pm25_1;
+          }
+          if(utils::isValidPm(this->pm10_1)) {
             root["channels"]["1"]["pm10"] = this->pm10_1;
+          }
+          if (utils::isValidPm03Count(this->pm03PCount_1)) {
             root["channels"]["1"]["pm003Count"] = this->pm03PCount_1;
+          }
+          if(utils::isValidTemperature(this->temp_1)) {
             root["channels"]["1"]["atmp"] = ag->round2(this->temp_1);
-          root["channels"]["1"]["rhum"] = this->hum_1;
+
             if (localServer) {
-            root["channels"]["1"]["atmpCompensated"] =
+              val = ag->pms5003t_1.compensateTemp(this->temp_1);
-                ag->round2(ag->pms5003t_1.temperatureCompensated(this->temp_1));
+              if (utils::isValidTemperature(val)) {
-            root["channels"]["1"]["rhumCompensated"] =
+                root["channels"]["1"]["atmpCompensated"] = ag->round2(val);
-                (int)ag->pms5003t_1.humidityCompensated(this->hum_1);
+              }
+            }
+          }
+          if (utils::isValidHumidity(this->hum_1)) {
+            root["channels"]["1"]["rhum"] = this->hum_1;
+
+            if (localServer) {
+              val = ag->pms5003t_1.compensateHum(this->hum_1);
+              if (utils::isValidHumidity(val)) {
+                root["channels"]["1"]["rhumCompensated"] = (int)val;
+              }
+            }
+          }
+          root["channels"]["1"]["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->hum_1);
+        
+          // PMS5003T version
+          if(!localServer) {
+            root["channels"]["1"][json_prop_pmFirmware] =
+                pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion());
           }
         }
         if (config->hasSensorPMS2) {
+          float val;
+          if (utils::isValidPm(this->pm01_2)) {
             root["channels"]["2"]["pm01"] = this->pm01_2;
+          }
+          if (utils::isValidPm(this->pm25_2)) {
             root["channels"]["2"]["pm02"] = this->pm25_2;
+          }
+          if (utils::isValidPm(this->pm10_2)) {
             root["channels"]["2"]["pm10"] = this->pm10_2;
+          }
+          if (utils::isValidPm03Count(this->pm03PCount_2)) {
             root["channels"]["2"]["pm003Count"] = this->pm03PCount_2;
+          }
+          if (utils::isValidTemperature(this->temp_2)) {
             root["channels"]["2"]["atmp"] = ag->round2(this->temp_2);
-          root["channels"]["2"]["rhum"] = this->hum_2;
+
             if (localServer) {
-            root["channels"]["2"]["atmpCompensated"] =
+              val = ag->pms5003t_1.compensateTemp(this->temp_2);
-                ag->round2(ag->pms5003t_1.temperatureCompensated(this->temp_2));
+              if (utils::isValidTemperature(val)) {
-            root["channels"]["2"]["rhumCompensated"] =
+                root["channels"]["2"]["atmpCompensated"] = ag->round2(val);
-                (int)ag->pms5003t_1.humidityCompensated(this->hum_2);
+              }
+            }
+          }
+          if (utils::isValidHumidity(this->hum_2)) {
+            root["channels"]["2"]["rhum"] = this->hum_2;
+
+            if (localServer) {
+              val = ag->pms5003t_1.compensateHum(this->hum_2);
+              if (utils::isValidHumidity(val)) {
+                root["channels"]["2"]["rhumCompensated"] = (int)val;
+              }
+            }
+          }
+          root["channels"]["2"]["pm02Compensated"] = ag->pms5003t_2.compensate(this->pm25_2, this->hum_2);
+          // PMS5003T version
+          if(!localServer) {
+            root["channels"]["2"][json_prop_pmFirmware] =
+                pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion());
           }
         }
       }
@@ -160,16 +386,16 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
   }
 
   if (config->hasSensorSGP) {
-    if (this->TVOC >= 0) {
+    if (utils::isValidVOC(this->TVOC)) {
       root["tvocIndex"] = this->TVOC;
     }
-    if (this->TVOCRaw >= 0) {
+    if (utils::isValidVOC(this->TVOCRaw)) {
       root["tvocRaw"] = this->TVOCRaw;
     }
-    if (this->NOx >= 0) {
+    if (utils::isValidNOx(this->NOx)) {
       root["noxIndex"] = this->NOx;
     }
-    if (this->NOxRaw >= 0) {
+    if (utils::isValidNOx(this->NOxRaw)) {
       root["noxRaw"] = this->NOxRaw;
     }
   }

src/AgValue.h

@@ -6,6 +6,9 @@
 
 class Measurements {
 private:
+  String pms5003FirmwareVersion(int fwCode);
+  String pms5003TFirmwareVersion(int fwCode);
+  String pms5003FirmwareVersionBase(String prefix, int fwCode);
 public:
   Measurements() {
     pm25_1 = -1;

src/AgWiFiConnector.cpp

@@ -41,6 +41,28 @@ bool WifiConnector::connect(void) {
     }
   }
 
+  WiFi.begin();
+  String wifiSSID = WIFI()->getWiFiSSID(true);
+  if (wifiSSID.isEmpty()) {
+    logInfo("Connected WiFi is empty, connect to default wifi \"" +
+            String(this->defaultSsid) + String("\""));
+
+    /** Set wifi connect */
+    WiFi.begin(this->defaultSsid, this->defaultPassword);
+
+    /** Wait for wifi connect to AP */
+    int count = 0;
+    while (WiFi.status() != WL_CONNECTED) {
+      delay(1000);
+      count++;
+      if (count >= 15) {
+        logError("Try connect to default wifi \"" + String(this->defaultSsid) +
+                 String("\" failed"));
+        break;
+      }
+    }
+  }
+
   WIFI()->setConfigPortalBlocking(false);
   WIFI()->setConnectTimeout(15);
   WIFI()->setTimeout(WIFI_CONNECT_COUNTDOWN_MAX);
@@ -50,7 +72,7 @@ bool WifiConnector::connect(void) {
   WIFI()->setSaveParamsCallback([this]() { _wifiSaveParamCallback(); });
   WIFI()->setConfigPortalTimeoutCallback([this]() {_wifiTimeoutCallback();});
   if (ag->isOne() || (ag->isPro4_2()) || ag->isPro3_3() || ag->isBasic()) {
-    disp.setText("Connect to", "WiFi", "...");
+    disp.setText("Connecting to", "WiFi", "...");
   } else {
     logInfo("Connecting to WiFi...");
   }
@@ -383,3 +405,11 @@ bool WifiConnector::hasConfigurated(void) {
  * @return false
  */
 bool WifiConnector::isConfigurePorttalTimeout(void) { return connectorTimeout; }
+
+/**
+ * @brief Set wifi connect to default WiFi
+ * 
+ */
+void WifiConnector::setDefault(void) {
+  WiFi.begin("airgradient", "cleanair");
+}

src/AgWiFiConnector.h

@@ -46,6 +46,10 @@ public:
   String localIpStr(void);
   bool hasConfigurated(void);
   bool isConfigurePorttalTimeout(void);
+
+  const char* defaultSsid = "airgradient";
+  const char* defaultPassword = "cleanair";
+  void setDefault(void);
 };
 
 #endif /** _AG_WIFI_CONNECTOR_H_ */

src/AirGradient.cpp

@@ -41,7 +41,14 @@ String AirGradient::getVersion(void) { return GIT_VERSION; }
 BoardType AirGradient::getBoardType(void) { return boardType; }
 
 double AirGradient::round2(double value) {
-  return (int)(value * 100 + 0.5) / 100.0;
+  double ret;
+  if (value >= 0) {
+    ret = (int)(value * 100 + 0.5f);
+  } else {
+    ret = (int)(value * 100 - 0.5f);
+  }
+
+  return ret / 100;
 }
 
 String AirGradient::getBoardName(void) {
@@ -58,6 +65,10 @@ bool AirGradient::isOne(void) {
   return boardType == BoardType::ONE_INDOOR;
 }
 
+bool AirGradient::isOpenAir(void) { 
+  return boardType == BoardType::OPEN_AIR_OUTDOOR; 
+}
+
 bool AirGradient::isPro4_2(void) {
   return boardType == BoardType::DIY_PRO_INDOOR_V4_2;
 }

src/AirGradient.h

@@ -12,9 +12,10 @@
 #include "S8/S8.h"
 #include "Sgp41/Sgp41.h"
 #include "Sht/Sht.h"
+#include "Main/utils.h"
 
 #ifndef GIT_VERSION
-#define GIT_VERSION "snapshot"
+#define GIT_VERSION "3.1.8-snap"
 #endif
 
 /**
@@ -134,6 +135,14 @@ public:
    */
   bool isOne(void);
 
+  /**
+   * @brief Check that Airgradient object is OPEN_AIR
+   * 
+   * @return true 
+   * @return false 
+   */
+  bool isOpenAir(void);
+
   /**
    * @brief Check that Airgradient object is DIY_PRO 4.2 indoor
    *

src/Main/utils.cpp

@@ -0,0 +1,89 @@
+#include "utils.h"
+
+#define VALID_TEMPERATURE_MAX (125)
+#define VALID_TEMPERATURE_MIN (-40)
+#define INVALID_TEMPERATURE   (-1000)
+
+#define VALID_HUMIDITY_MAX    (100)
+#define VALID_HUMIDITY_MIN    (0)
+#define INVALID_HUMIDITY      (-1)
+
+#define VALID_PMS_MAX         (1000)
+#define VALID_PMS_MIN         (0)
+#define INVALID_PMS           (-1)
+
+#define VALID_PMS03COUNT_MIN  (0)
+
+#define VALID_CO2_MAX         (10000)
+#define VALID_CO2_MIN         (0)
+#define INVALID_CO2           (-1)
+
+#define VALID_NOX_MIN         (0)
+#define VALID_VOC_MIN         (0)
+#define INVALID_NOX           (-1)
+#define INVALID_VOC           (-1)
+
+utils::utils(/* args */) {}
+
+utils::~utils() {}
+
+bool utils::isValidTemperature(float value) {
+  if ((value >= VALID_TEMPERATURE_MIN) && (value <= VALID_TEMPERATURE_MAX)) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidHumidity(float value) {
+  if ((value >= VALID_HUMIDITY_MIN) && (value <= VALID_HUMIDITY_MAX)) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidCO2(int16_t value) {
+  if ((value >= VALID_CO2_MIN) && (value <= VALID_CO2_MAX)) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidPm(int value) {
+  if ((value >= VALID_PMS_MIN) && (value <= VALID_PMS_MAX)) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidPm03Count(int value) {
+  if (value >= VALID_PMS03COUNT_MIN) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidNOx(int value) {
+  if (value >= VALID_NOX_MIN) {
+    return true;
+  }
+  return false;
+}
+
+bool utils::isValidVOC(int value) {
+  if (value >= VALID_VOC_MIN) {
+    return true;
+  }
+  return false;
+}
+
+float utils::getInvalidTemperature(void) { return INVALID_TEMPERATURE; }
+
+float utils::getInvalidHumidity(void) { return INVALID_HUMIDITY; }
+
+int utils::getInvalidCO2(void) { return INVALID_CO2; }
+
+int utils::getInvalidPmValue(void) { return INVALID_PMS; }
+
+int utils::getInvalidNOx(void) { return INVALID_NOX; }
+
+int utils::getInvalidVOC(void) { return INVALID_VOC; }

src/Main/utils.h

@@ -0,0 +1,30 @@
+#ifndef _UTILS_H_
+#define _UTILS_H_
+
+#include <Arduino.h>
+
+class utils
+{
+private:
+  /* data */
+public:
+  utils(/* args */);
+  ~utils();
+
+  static bool isValidTemperature(float value);
+  static bool isValidHumidity(float value);
+  static bool isValidCO2(int16_t value);
+  static bool isValidPm(int value);
+  static bool isValidPm03Count(int value);
+  static bool isValidNOx(int value);
+  static bool isValidVOC(int value);
+  static float getInvalidTemperature(void);
+  static float getInvalidHumidity(void);
+  static int getInvalidCO2(void);
+  static int getInvalidPmValue(void);
+  static int getInvalidNOx(void);
+  static int getInvalidVOC(void);
+};
+
+
+#endif /** _UTILS_H_ */

src/PMS/PMS.cpp

@@ -2,33 +2,48 @@
 #include "../Main/BoardDef.h"
 
 /**
- * @brief Init and check that sensor has connected
+ * @brief Initializes the sensor and attempts to read data.
  *
  * @param stream UART stream
  * @return true Sucecss
  * @return false Failure
  */
 bool PMSBase::begin(Stream *stream) {
+  Serial.printf("initializing PM sensor\n");
   this->stream = stream;
 
   failed = true;
+  failCount = 0;
   lastRead = 0; // To read buffer on handle without wait after 1.5sec
 
-  this->stream->flush();
+  // empty first
+  int bytesCleared = 0;
+  while (this->stream->read() != -1) {
+    bytesCleared++;
+  }
+  Serial.printf("cleared %d byte(s)\n", bytesCleared);
+
+  // explicitly put the sensor into active mode, this seems to be be needed for the Cubic PM2009X
+  Serial.printf("setting active mode\n");
+  uint8_t activeModeCommand[] = { 0x42, 0x4D, 0xE1, 0x00, 0x01, 0x01, 0x71 };
+  size_t bytesWritten = this->stream->write(activeModeCommand, sizeof(activeModeCommand));
+  Serial.printf("%d byte(s) written\n", bytesWritten);
 
   // Run and check sensor data for 4sec
   while (1) {
     handle();
     if (failed == false) {
+      Serial.printf("PM sensor initialized\n");
       return true; 
     }
 
-    delay(1);
+    delay(10);
     uint32_t ms = (uint32_t)(millis() - lastRead);
     if (ms >= 4000) {
       break;
     }
   }
+  Serial.printf("PM sensor initialization failed\n");
   return false;
 }
 
@@ -86,7 +101,7 @@ void PMSBase::handle() {
     case 2: {
       buf[bufIndex++] = value;
       if (bufIndex >= 4) {
-        len = toValue(&buf[2]);
+        len = toI16(&buf[2]);
         if (len != 28) {
           // Serial.printf("Got good bad len %d\r\n", len);
           len += 4;
@@ -147,103 +162,138 @@ void PMSBase::handle() {
  */
 bool PMSBase::isFailed(void) { return failed; }
 
+/**
+ * @brief Increate number of fail
+ * 
+ */
+void PMSBase::updateFailCount(void) {
+  if (failCount < failCountMax) {
+    failCount++;
+  }
+}
+
+void PMSBase::resetFailCount(void) { failCount = 0; }
+
+/**
+ * @brief Get number of fail
+ * 
+ * @return int 
+ */
+int PMSBase::getFailCount(void) { return failCount; }
+
+int PMSBase::getFailCountMax(void) { return failCountMax; }
+
 /**
  * @brief Read PMS 0.1 ug/m3 with CF = 1 PM estimates
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getRaw0_1(void) { return toValue(&package[4]); }
+uint16_t PMSBase::getRaw0_1(void) { return toU16(&package[4]); }
 
 /**
  * @brief Read PMS 2.5 ug/m3 with CF = 1 PM estimates
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getRaw2_5(void) { return toValue(&package[6]); }
+uint16_t PMSBase::getRaw2_5(void) { return toU16(&package[6]); }
 
 /**
  * @brief Read PMS 10 ug/m3 with CF = 1 PM estimates
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getRaw10(void) { return toValue(&package[8]); }
+uint16_t PMSBase::getRaw10(void) { return toU16(&package[8]); }
 
 /**
  * @brief Read PMS 0.1 ug/m3
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getPM0_1(void) { return toValue(&package[10]); }
+uint16_t PMSBase::getPM0_1(void) { return toU16(&package[10]); }
 
 /**
  * @brief Read PMS 2.5 ug/m3
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getPM2_5(void) { return toValue(&package[12]); }
+uint16_t PMSBase::getPM2_5(void) { return toU16(&package[12]); }
 
 /**
  * @brief Read PMS 10 ug/m3
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getPM10(void) { return toValue(&package[14]); }
+uint16_t PMSBase::getPM10(void) { return toU16(&package[14]); }
 
 /**
  * @brief Get numnber concentrations over 0.3 um/0.1L
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount0_3(void) { return toValue(&package[16]); }
+uint16_t PMSBase::getCount0_3(void) { return toU16(&package[16]); }
 
 /**
  * @brief Get numnber concentrations over 0.5 um/0.1L
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount0_5(void) { return toValue(&package[18]); }
+uint16_t PMSBase::getCount0_5(void) { return toU16(&package[18]); }
 
 /**
  * @brief Get numnber concentrations over 1.0 um/0.1L
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount1_0(void) { return toValue(&package[20]); }
+uint16_t PMSBase::getCount1_0(void) { return toU16(&package[20]); }
 
 /**
  * @brief Get numnber concentrations over 2.5 um/0.1L
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount2_5(void) { return toValue(&package[22]); }
+uint16_t PMSBase::getCount2_5(void) { return toU16(&package[22]); }
 
 /**
  * @brief Get numnber concentrations over 5.0 um/0.1L (only PMS5003)
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount5_0(void) { return toValue(&package[24]); }
+uint16_t PMSBase::getCount5_0(void) { return toU16(&package[24]); }
 
 /**
  * @brief Get numnber concentrations over 10.0 um/0.1L (only PMS5003)
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getCount10(void) { return toValue(&package[26]); }
+uint16_t PMSBase::getCount10(void) { return toU16(&package[26]); }
 
 /**
  * @brief Get temperature (only PMS5003T)
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getTemp(void) { return toValue(&package[24]); }
+int16_t PMSBase::getTemp(void) { return toI16(&package[24]); }
 
 /**
  * @brief Get humidity (only PMS5003T)
  *
  * @return uint16_t
  */
-uint16_t PMSBase::getHum(void) { return toValue(&package[26]); }
+uint16_t PMSBase::getHum(void) { return toU16(&package[26]); }
+
+/**
+ * @brief Get firmware version code
+ * 
+ * @return uint8_t 
+ */
+uint8_t PMSBase::getFirmwareVersion(void) { return package[28]; }
+
+/**
+ * @brief Ge PMS5003 error code
+ * 
+ * @return uint8_t 
+ */
+uint8_t PMSBase::getErrorCode(void) { return package[29]; }
 
 /**
  * @brief Convert PMS2.5 to US AQI unit
@@ -270,13 +320,61 @@ int PMSBase::pm25ToAQI(int pm02) {
     return 500;
 }
 
+/**
+ * @brief Correction PM2.5
+ * 
+ * Formula: https://www.airgradient.com/documentation/correction-algorithms/
+ * 
+ * @param pm25 Raw PM2.5 value
+ * @param humidity Humidity value (%)
+ * @return int 
+ */
+int PMSBase::compensate(int pm25, float humidity) {
+  float value;
+  float fpm25 = pm25;
+  if (humidity < 0) {
+    humidity = 0;
+  }
+  if (humidity > 100) {
+    humidity = 100.0f;
+  }
+
+  if(pm25 < 30) { /** pm2.5 < 30 */
+    value = (fpm25 * 0.524f) - (humidity * 0.0862f) + 5.75f;
+  } else if(pm25 < 50) { /** 30 <= pm2.5 < 50 */
+    value = (0.786f * (fpm25 * 0.05f - 1.5f) + 0.524f * (1.0f - (fpm25 * 0.05f - 1.5f))) * fpm25 - (0.0862f * humidity) + 5.75f;
+  } else if(pm25 < 210) { /** 50 <= pm2.5 < 210 */
+    value = (0.786f * fpm25) - (0.0862f * humidity) + 5.75f;
+  } else if(pm25 < 260) { /** 210 <= pm2.5 < 260 */
+    value = (0.69f * (fpm25 * 0.02f - 4.2f) + 0.786f * (1.0f - (fpm25 * 0.02f - 4.2f))) * fpm25 - (0.0862f * humidity * (1.0f - (fpm25 * 0.02f - 4.2f))) + (2.966f * (fpm25 * 0.02f - 4.2f)) + (5.75f * (1.0f - (fpm25 * 0.02f - 4.2f))) + (8.84f * (1.e-4) * fpm25 * fpm25 * (fpm25 * 0.02f - 4.2f));
+  } else { /** 260 <= pm2.5 */
+    value = 2.966f + (0.69f * fpm25) + (8.84f * (1.e-4) * fpm25 * fpm25);
+  }
+
+  if(value < 0) {
+    value = 0;
+  }
+
+  return (int)value;
+}
+
 /**
  * @brief   Convert two byte value to uint16_t value
  *
  * @param buf bytes array (must be >= 2)
- * @return uint16_t
+ * @return int16_t
  */
-uint16_t PMSBase::toValue(char *buf) { return (buf[0] << 8) | buf[1]; }
+int16_t PMSBase::toI16(char *buf) {
+  int16_t value = buf[0];
+  value = (value << 8) | buf[1];
+  return value;
+}
+
+uint16_t PMSBase::toU16(char *buf) {
+  uint16_t value = buf[0];
+  value = (value << 8) | buf[1];
+  return value;
+}
 
 /**
  * @brief Validate package data
@@ -290,7 +388,7 @@ bool PMSBase::validate(char *buf) {
   for (int i = 0; i < 30; i++) {
     sum += buf[i];
   }
-  if (sum == toValue(&buf[30])) {
+  if (sum == toU16(&buf[30])) {
     for (int i = 0; i < 32; i++) {
       package[i] = buf[i];
     }

src/PMS/PMS.h

@@ -3,11 +3,20 @@
 
 #include <Arduino.h>
 
+#define PMS_FAIL_COUNT_SET_INVALID 3
+
+/**
+ * Known to work with these sensors: Plantower PMS5003, Plantower PMS5003, Cubic PM2009X
+ */
 class PMSBase {
 public:
   bool begin(Stream *stream);
   void handle();
   bool isFailed(void);
+  void updateFailCount(void);
+  void resetFailCount(void);
+  int getFailCount(void);
+  int getFailCountMax(void);
   uint16_t getRaw0_1(void);
   uint16_t getRaw2_5(void);
   uint16_t getRaw10(void);
@@ -24,10 +33,13 @@ public:
   uint16_t getCount10(void);
 
   /** For PMS5003T*/
-  uint16_t getTemp(void);
+  int16_t getTemp(void);
   uint16_t getHum(void);
+  uint8_t getFirmwareVersion(void); 
+  uint8_t getErrorCode(void);
 
   int pm25ToAQI(int pm02);
+  int compensate(int pm25, float humidity);
 
 private:
   Stream *stream;
@@ -35,8 +47,11 @@ private:
   int packageIndex;
   bool failed = false;
   uint32_t lastRead;
+  const int failCountMax = 10;
+  int failCount = 0;
 
-  uint16_t toValue(char *buf);
+  int16_t toI16(char *buf);
+  uint16_t toU16(char* buf);
   bool validate(char *buf);
 };
 

src/PMS/PMS5003.cpp

@@ -1,5 +1,6 @@
 #include "PMS5003.h"
 #include "Arduino.h"
+#include "../Main/utils.h"
 
 #if defined(ESP8266)
 #include <SoftwareSerial.h>
@@ -37,14 +38,11 @@ bool PMS5003::begin(HardwareSerial &serial) {
 PMS5003::PMS5003(BoardType def) : _boardDef(def) {}
 
 /**
- * @brief Init sensor
+ * Initializes the sensor.
- *
- * @return true Success
- * @return false Failure
  */
 bool PMS5003::begin(void) {
   if (this->_isBegin) {
-    AgLog("Initialized, call end() then try again");
+    AgLog("Already initialized, call end() then try again");
     return true;
   }
 
@@ -77,7 +75,7 @@ bool PMS5003::begin(void) {
     return false;
   }
 #endif
-
+  _ver = pms.getFirmwareVersion();
   this->_isBegin = true;
   return true;
 }
@@ -108,7 +106,9 @@ int PMS5003::getPm10Ae(void) { return pms.getPM10(); }
  *
  * @return int PM0.3 index
  */
-int PMS5003::getPm03ParticleCount(void) { return pms.getCount0_3(); }
+int PMS5003::getPm03ParticleCount(void) {
+  return pms.getCount0_3();
+}
 
 /**
  * @brief Convert PM2.5 to US AQI
@@ -118,6 +118,33 @@ int PMS5003::getPm03ParticleCount(void) { return pms.getCount0_3(); }
  */
 int PMS5003::convertPm25ToUsAqi(int pm25) { return pms.pm25ToAQI(pm25); }
 
+/**
+ * @brief Correct PM2.5
+ * 
+ * Reference formula: https://www.airgradient.com/documentation/correction-algorithms/
+ * 
+ * @param pm25 PM2.5 raw value
+ * @param humidity Humidity value
+ * @return int 
+ */
+int PMS5003::compensate(int pm25, float humidity) {
+  return pms.compensate(pm25, humidity);
+}
+
+/**
+ * @brief Get sensor firmware version
+ * 
+ * @return int
+ */
+int PMS5003::getFirmwareVersion(void) { return _ver; }
+
+/**
+ * @brief Get sensor error code
+ * 
+ * @return uint8_t 
+ */
+uint8_t PMS5003::getErrorCode(void) { return pms.getErrorCode(); }
+
 /**
  * @brief Check device initialized or not
  *
@@ -161,3 +188,25 @@ void PMS5003::handle(void) { pms.handle(); }
  * @return false Communication timeout or sensor has removed
  */
 bool PMS5003::isFailed(void) { return pms.isFailed(); }
+
+void PMS5003::updateFailCount(void) {
+  pms.updateFailCount();
+}
+
+void PMS5003::resetFailCount(void) {
+  pms.resetFailCount();
+}
+
+/**
+ * @brief Get number of fail count
+ * 
+ * @return int 
+ */
+int PMS5003::getFailCount(void) { return pms.getFailCount(); }
+
+/**
+ * @brief Get number of fail count max
+ * 
+ * @return int 
+ */
+int PMS5003::getFailCountMax(void) { return pms.getFailCountMax(); }

src/PMS/PMS5003.h

@@ -19,14 +19,22 @@ public:
   void end(void);
   void handle(void);
   bool isFailed(void);
+  void updateFailCount(void);
+  void resetFailCount(void);
+  int getFailCount(void);
+  int getFailCountMax(void);
   int getPm01Ae(void);
   int getPm25Ae(void);
   int getPm10Ae(void);
   int getPm03ParticleCount(void);
   int convertPm25ToUsAqi(int pm25);
+  int compensate(int pm25, float humidity);
+  int getFirmwareVersion(void);
+  uint8_t getErrorCode(void);
 
 private:
   bool _isBegin = false;
+  int _ver;
   BoardType _boardDef;
   PMSBase pms;
   const BoardDef *bsp;

src/PMS/PMS5003T.cpp

@@ -1,5 +1,6 @@
 #include "PMS5003T.h"
 #include "Arduino.h"
+#include "../Main/utils.h"
 
 #if defined(ESP8266)
 #include <SoftwareSerial.h>
@@ -102,7 +103,7 @@ bool PMS5003T::begin(void) {
     return false;
   }
 #endif
-
+  _ver = pms.getFirmwareVersion();
   this->_isBegin = true;
   return true;
 }
@@ -133,7 +134,9 @@ int PMS5003T::getPm10Ae(void) { return pms.getPM10(); }
  *
  * @return int PM 0.3 Count index
  */
-int PMS5003T::getPm03ParticleCount(void) { return pms.getCount0_3(); }
+int PMS5003T::getPm03ParticleCount(void) {
+  return pms.getCount0_3();
+}
 
 /**
  * @brief Convert PM2.5 to US AQI
@@ -161,6 +164,33 @@ float PMS5003T::getRelativeHumidity(void) {
   return pms.getHum() / 10.0f;
 }
 
+/**
+ * @brief Correct PM2.5
+ * 
+ * Reference formula: https://www.airgradient.com/documentation/correction-algorithms/
+ * 
+ * @param pm25 PM2.5 raw value
+ * @param humidity Humidity value
+ * @return int 
+ */
+int PMS5003T::compensate(int pm25, float humidity) {
+  return pms.compensate(pm25, humidity);
+}
+
+/**
+ * @brief Get module(s) firmware version
+ * 
+ * @return int Version code
+ */
+int PMS5003T::getFirmwareVersion(void) { return _ver; }
+
+/**
+ * @brief Get sensor error code
+ * 
+ * @return uint8_t 
+ */
+uint8_t PMS5003T::getErrorCode(void) { return pms.getErrorCode(); }
+
 /**
  * @brief Check device initialized or not
  *
@@ -202,3 +232,24 @@ void PMS5003T::handle(void) { pms.handle(); }
  */
 bool PMS5003T::isFailed(void) { return pms.isFailed(); }
 
+void PMS5003T::updateFailCount(void) {
+  pms.updateFailCount();
+}
+
+void PMS5003T::resetFailCount(void) {
+  pms.resetFailCount();
+}
+
+/**
+ * @brief Get fail count
+ * 
+ * @return int 
+ */
+int PMS5003T::getFailCount(void) { return pms.getFailCount(); }
+
+/**
+ * @brief Get fail count max
+ * 
+ * @return int 
+ */
+int PMS5003T::getFailCountMax(void) { return pms.getFailCountMax(); }

src/PMS/PMS5003T.h

@@ -22,6 +22,10 @@ public:
 
   void handle(void);
   bool isFailed(void);
+  void updateFailCount(void);
+  void resetFailCount(void);
+  int getFailCount(void);
+  int getFailCountMax(void);
   int getPm01Ae(void);
   int getPm25Ae(void);
   int getPm10Ae(void);
@@ -29,10 +33,14 @@ public:
   int convertPm25ToUsAqi(int pm25);
   float getTemperature(void);
   float getRelativeHumidity(void);
+  int compensate(int pm25, float humidity);
+  int getFirmwareVersion(void);
+  uint8_t getErrorCode(void);
 
 private:
   bool _isBegin = false;
   bool _isSleep = false;
+  int _ver;   /** Firmware version code */
 
   BoardType _boardDef;
   const BoardDef *bsp;

src/PMS/PMS5003TBase.cpp

@@ -4,14 +4,30 @@ PMS5003TBase::PMS5003TBase() {}
 
 PMS5003TBase::~PMS5003TBase() {}
 
-float PMS5003TBase::temperatureCompensated(float temp) {
+/**
+ * @brief Compensate the temperature
+ * 
+ * Reference formula: https://www.airgradient.com/documentation/correction-algorithms/
+ * 
+ * @param temp 
+ * @return * float 
+ */
+float PMS5003TBase::compensateTemp(float temp) {
   if (temp < 10.0f) {
     return temp * 1.327f - 6.738f;
   }
   return temp * 1.181f - 5.113f;
 }
 
-float PMS5003TBase::humidityCompensated(float hum) {
+/**
+ * @brief Compensate the humidity
+ * 
+ * Reference formula: https://www.airgradient.com/documentation/correction-algorithms/
+ * 
+ * @param temp 
+ * @return * float 
+ */
+float PMS5003TBase::compensateHum(float hum) {
   hum = hum * 1.259f + 7.34f;
 
   if (hum > 100.0f) {

src/PMS/PMS5003TBase.h

@@ -8,8 +8,8 @@ private:
 public:
   PMS5003TBase();
   ~PMS5003TBase();
-  float temperatureCompensated(float temp);
+  float compensateTemp(float temp);
-  float humidityCompensated(float hum);
+  float compensateHum(float hum);
 };
 
 #endif

src/S8/S8.cpp

@@ -1,5 +1,6 @@
 #include "S8.h"
 #include "mb_crc.h"
+#include "../Main/utils.h"
 #if defined(ESP8266)
 #include <SoftwareSerial.h>
 #else
@@ -103,7 +104,7 @@ void S8::getFirmwareVersion(char firmver[]) {
  */
 int32_t S8::getSensorTypeId(void) {
   if (this->isBegin() == false) {
-    return -1;
+    return utils::getInvalidCO2();
   }
 
   int32_t sensorType = 0;

src/Sgp41/Sgp41.cpp

@@ -2,6 +2,7 @@
 #include "../Libraries/SensirionSGP41/src/SensirionI2CSgp41.h"
 #include "../Libraries/Sensirion_Gas_Index_Algorithm/src/NOxGasIndexAlgorithm.h"
 #include "../Libraries/Sensirion_Gas_Index_Algorithm/src/VOCGasIndexAlgorithm.h"
+#include "../Main/utils.h"
 
 #define sgpSensor() ((SensirionI2CSgp41 *)(this->_sensor))
 #define vocAlgorithm() ((VOCGasIndexAlgorithm *)(this->_vocAlgorithm))
@@ -66,6 +67,7 @@ bool Sgp41::begin(TwoWire &wire) {
   }
 
   onConditioning = true;
+  _handleFailCount = 0;
 #ifdef ESP32
   /** Create task */
   xTaskCreate(
@@ -108,7 +110,21 @@ void Sgp41::handle(void) {
         noxRaw = srawNox;
         nox = noxAlgorithm()->process(srawNox);
         tvoc = vocAlgorithm()->process(srawVoc);
+
+        _handleFailCount = 0;
         // AgLog("Polling SGP41 success: tvoc: %d, nox: %d", tvoc, nox);
+      } else {
+        if(_handleFailCount < 5) {
+          _handleFailCount++;
+          AgLog("Polling SGP41 failed: %d", _handleFailCount);
+        }
+
+        if (_handleFailCount >= 5) {
+          tvocRaw = utils::getInvalidVOC();
+          tvoc = utils::getInvalidVOC();
+          noxRaw = utils::getInvalidNOx();
+          nox = utils::getInvalidNOx();
+        }
       }
     }
   }
@@ -141,7 +157,21 @@ void Sgp41::_handle(void) {
       noxRaw = srawNox;
       nox = noxAlgorithm()->process(srawNox);
       tvoc = vocAlgorithm()->process(srawVoc);
+
+      _handleFailCount = 0;
       // AgLog("Polling SGP41 success: tvoc: %d, nox: %d", tvoc, nox);
+    } else {
+      if(_handleFailCount < 5) {
+        _handleFailCount++;
+        AgLog("Polling SGP41 failed: %d", _handleFailCount);
+      }
+
+      if (_handleFailCount >= 5) {
+        tvocRaw = utils::getInvalidVOC();
+        tvoc = utils::getInvalidVOC();
+        noxRaw = utils::getInvalidNOx();
+        nox = utils::getInvalidNOx();
+      }
     }
   }
 }
@@ -176,7 +206,7 @@ void Sgp41::end(void) {
  */
 int Sgp41::getTvocIndex(void) {
   if (onConditioning) {
-    return -1;
+    return utils::getInvalidVOC();
   }
   return tvoc;
 }
@@ -188,7 +218,7 @@ int Sgp41::getTvocIndex(void) {
  */
 int Sgp41::getNoxIndex(void) {
   if (onConditioning) {
-    return -1;
+    return utils::getInvalidNOx();
   }
   return nox;
 }

src/Sgp41/Sgp41.h

@@ -35,6 +35,7 @@ private:
   bool onConditioning = true;
   bool ready = false;
   bool _isBegin = false;
+  uint8_t _handleFailCount = 0;
   void *_sensor;
   void *_vocAlgorithm;
   void *_noxAlgorithm;

src/Sht/Sht.cpp

@@ -1,6 +1,7 @@
 #include "Sht.h"
 
 #include "../Libraries/arduino-sht/SHTSensor.h"
+#include "../Main/utils.h"
 
 /** Cast _sensor to SHTSensor */
 #define shtSensor() ((SHTSensor *)(this->_sensor))
@@ -131,14 +132,18 @@ void Sht::end(void) {
  *
  * @return float
  */
-float Sht::getTemperature(void) { return shtSensor()->getTemperature(); }
+float Sht::getTemperature(void) {
+  return shtSensor()->getTemperature();
+}
 
 /**
  * @brief Get humidity
  *
  * @return float
  */
-float Sht::getRelativeHumidity(void) { return shtSensor()->getHumidity(); }
+float Sht::getRelativeHumidity(void) {
+  return shtSensor()->getHumidity();
+}
 
 /**
  * @brief Measure temperature and humidity