From 4783684443aa9585e2990992cd6d461e31eb3cc7 Mon Sep 17 00:00:00 2001 From: samuelbles07 Date: Tue, 22 Oct 2024 18:37:56 +0700 Subject: [PATCH] Update local server payloads --- docs/local-server.md | 14 ++++++++++---- src/AgValue.cpp | 2 +- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/local-server.md b/docs/local-server.md index 307ad8c..fe0d496 100644 --- a/docs/local-server.md +++ b/docs/local-server.md @@ -50,12 +50,18 @@ You get the following response: |-----------------------------------|---------|----------------------------------------------------------------------------------------| | `serialno` | String | Serial Number of the monitor | | `wifi` | Number | WiFi signal strength | -| `pm01` | Number | PM1 in ug/m3 | -| `pm02` | Number | PM2.5 in ug/m3 | -| `pm10` | Number | PM10 in ug/m3 | +| `pm01` | Number | PM1.0 in ug/m3 (atmospheric environment) | +| `pm02` | Number | PM2.5 in ug/m3 (atmospheric environment) | +| `pm10` | Number | PM10 in ug/m3 (atmospheric environment) | | `pm02Compensated` | Number | PM2.5 in ug/m3 with correction applied (from fw version 3.1.4 onwards) | +| `pm01_sp` | Number | PM1.0 in ug/m3 (standard particle) | +| `pm02_sp` | Number | PM2.5 in ug/m3 (standard particle) | +| `pm10_sp` | Number | PM10 in ug/m3 (standard particle) | | `rco2` | Number | CO2 in ppm | -| `pm003Count` | Number | Particle count per dL | +| `pm003Count` | Number | Particle count 0.3um per dL | +| `pm01Count` | Number | Particle count 1.0um per dL | +| `pm25Count` | Number | Particle count 2.5um per dL | +| `pm10Count` | Number | Particle count 10um per dL | | `atmp` | Number | Temperature in Degrees Celsius | | `atmpCompensated` | Number | Temperature in Degrees Celsius with correction applied | | `rhum` | Number | Relative Humidity | diff --git a/src/AgValue.cpp b/src/AgValue.cpp index 3a93c02..638bee1 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -724,7 +724,7 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem pms["channels"]["1"]["pm02_sp"] = ag.round2(_pm_25_sp[0].update.avg); pms["channels"]["2"]["pm02_sp"] = ag.round2(_pm_25_sp[1].update.avg); } else if (utils::isValidPm(_pm_25_sp[0].update.avg)) { - pms["pm01_sp"] = ag.round2(_pm_25_sp[0].update.avg); + pms["pm02_sp"] = ag.round2(_pm_25_sp[0].update.avg); pms["channels"]["1"]["pm02_sp"] = ag.round2(_pm_25_sp[0].update.avg); } else if (utils::isValidPm(_pm_25_sp[1].update.avg)) { pms["pm02_sp"] = ag.round2(_pm_25_sp[1].update.avg);