From e6696f3d4157a901e74cb588a5800a90c6f3c90f Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Tue, 29 Oct 2024 23:51:19 +0700
Subject: [PATCH 1/8] New particle count 0.5 and 5.0

---
 examples/OneOpenAir/OneOpenAir.ino | 10 +++++
 src/AgValue.cpp                    | 72 +++++++++++++++++++++---------
 src/AgValue.h                      |  4 ++
 src/PMS/PMS5003.cpp                | 14 ++++++
 src/PMS/PMS5003.h                  |  2 +
 src/PMS/PMS5003T.cpp               |  7 +++
 src/PMS/PMS5003T.h                 |  1 +
 7 files changed, 90 insertions(+), 20 deletions(-)

diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino
index 8627583..1824ee7 100644
--- a/examples/OneOpenAir/OneOpenAir.ino
+++ b/examples/OneOpenAir/OneOpenAir.ino
@@ -1005,8 +1005,10 @@ static void updatePMS5003() {
     measurements.update(Measurements::PM25_SP, ag->pms5003.getPm25Sp());
     measurements.update(Measurements::PM10_SP, ag->pms5003.getPm10Sp());
     measurements.update(Measurements::PM03_PC, ag->pms5003.getPm03ParticleCount());
+    measurements.update(Measurements::PM05_PC, ag->pms5003.getPm05ParticleCount());
     measurements.update(Measurements::PM01_PC, ag->pms5003.getPm01ParticleCount());
     measurements.update(Measurements::PM25_PC, ag->pms5003.getPm25ParticleCount());
+    measurements.update(Measurements::PM5_PC, ag->pms5003.getPm5ParticleCount());
     measurements.update(Measurements::PM10_PC, ag->pms5003.getPm10ParticleCount());
   } else {
     measurements.update(Measurements::PM01, utils::getInvalidPmValue());
@@ -1016,8 +1018,10 @@ static void updatePMS5003() {
     measurements.update(Measurements::PM25_SP, utils::getInvalidPmValue());
     measurements.update(Measurements::PM10_SP, utils::getInvalidPmValue());
     measurements.update(Measurements::PM03_PC, utils::getInvalidPmValue());
+    measurements.update(Measurements::PM05_PC, utils::getInvalidPmValue());
     measurements.update(Measurements::PM01_PC, utils::getInvalidPmValue());
     measurements.update(Measurements::PM25_PC, utils::getInvalidPmValue());
+    measurements.update(Measurements::PM5_PC, utils::getInvalidPmValue());
     measurements.update(Measurements::PM10_PC, utils::getInvalidPmValue());
   }
 }
@@ -1043,6 +1047,7 @@ static void updatePm(void) {
       measurements.update(Measurements::PM25_SP, ag->pms5003t_1.getPm25Sp(), channel);
       measurements.update(Measurements::PM10_SP, ag->pms5003t_1.getPm10Sp(), channel);
       measurements.update(Measurements::PM03_PC, ag->pms5003t_1.getPm03ParticleCount(), channel);
+      measurements.update(Measurements::PM05_PC, ag->pms5003t_1.getPm05ParticleCount(), channel);
       measurements.update(Measurements::PM01_PC, ag->pms5003t_1.getPm01ParticleCount(), channel);
       measurements.update(Measurements::PM25_PC, ag->pms5003t_1.getPm25ParticleCount(), channel);
       measurements.update(Measurements::Temperature, ag->pms5003t_1.getTemperature(), channel);
@@ -1059,6 +1064,7 @@ static void updatePm(void) {
       measurements.update(Measurements::PM25_SP, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM10_SP, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM03_PC, utils::getInvalidPmValue(), channel);
+      measurements.update(Measurements::PM05_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM01_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM25_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::Temperature, utils::getInvalidTemperature(), channel);
@@ -1077,6 +1083,7 @@ static void updatePm(void) {
       measurements.update(Measurements::PM25_SP, ag->pms5003t_2.getPm25Sp(), channel);
       measurements.update(Measurements::PM10_SP, ag->pms5003t_2.getPm10Sp(), channel);
       measurements.update(Measurements::PM03_PC, ag->pms5003t_2.getPm03ParticleCount(), channel);
+      measurements.update(Measurements::PM05_PC, ag->pms5003t_2.getPm05ParticleCount(), channel);
       measurements.update(Measurements::PM01_PC, ag->pms5003t_2.getPm01ParticleCount(), channel);
       measurements.update(Measurements::PM25_PC, ag->pms5003t_2.getPm25ParticleCount(), channel);
       measurements.update(Measurements::Temperature, ag->pms5003t_2.getTemperature(), channel);
@@ -1093,6 +1100,7 @@ static void updatePm(void) {
       measurements.update(Measurements::PM25_SP, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM10_SP, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM03_PC, utils::getInvalidPmValue(), channel);
+      measurements.update(Measurements::PM05_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM01_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::PM25_PC, utils::getInvalidPmValue(), channel);
       measurements.update(Measurements::Temperature, utils::getInvalidTemperature(), channel);
@@ -1186,8 +1194,10 @@ void setMeasurementMaxPeriod() {
   measurements.maxPeriod(Measurements::PM01_SP, max);
   measurements.maxPeriod(Measurements::PM10_SP, max);
   measurements.maxPeriod(Measurements::PM03_PC, max);
+  measurements.maxPeriod(Measurements::PM05_PC, max);
   measurements.maxPeriod(Measurements::PM01_PC, max);
   measurements.maxPeriod(Measurements::PM25_PC, max);
+  measurements.maxPeriod(Measurements::PM5_PC, max);
   measurements.maxPeriod(Measurements::PM10_PC, max);
 
   // Temperature and Humidity
diff --git a/src/AgValue.cpp b/src/AgValue.cpp
index 00343cc..969d468 100644
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -57,6 +57,10 @@ void Measurements::maxPeriod(MeasurementType type, int max) {
     _pm_03_pc[0].update.max = max;
     _pm_03_pc[1].update.max = max;
     break;
+  case PM05_PC:
+    _pm_05_pc[0].update.max = max;
+    _pm_05_pc[1].update.max = max;
+    break;
   case PM01_PC:
     _pm_01_pc[0].update.max = max;
     _pm_01_pc[1].update.max = max;
@@ -65,6 +69,10 @@ void Measurements::maxPeriod(MeasurementType type, int max) {
     _pm_25_pc[0].update.max = max;
     _pm_25_pc[1].update.max = max;
     break;
+  case PM5_PC:
+    _pm_5_pc[0].update.max = max;
+    _pm_5_pc[1].update.max = max;
+    break;
   case PM10_PC:
     _pm_10_pc[0].update.max = max;
     _pm_10_pc[1].update.max = max;
@@ -132,6 +140,10 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
     temporary = &_pm_03_pc[ch];
     invalidValue = utils::getInvalidPmValue();
     break;
+  case PM05_PC:
+    temporary = &_pm_05_pc[ch];
+    invalidValue = utils::getInvalidPmValue();
+    break;
   case PM01_PC:
     temporary = &_pm_01_pc[ch];
     invalidValue = utils::getInvalidPmValue();
@@ -140,6 +152,10 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
     temporary = &_pm_25_pc[ch];
     invalidValue = utils::getInvalidPmValue();
     break;
+  case PM5_PC:
+    temporary = &_pm_5_pc[ch];
+    invalidValue = utils::getInvalidPmValue();
+    break;
   case PM10_PC:
     temporary = &_pm_10_pc[ch];
     invalidValue = utils::getInvalidPmValue();
@@ -162,8 +178,8 @@ bool Measurements::update(MeasurementType type, int val, int ch) {
     temporary->update.invalidCounter++;
     if (temporary->update.invalidCounter >= temporary->update.max) {
       Serial.printf("%s{%d} invalid value update counter reached (%dx)! Setting its average value "
-                    "to invalid!",
-                    measurementTypeStr(type), ch, temporary->update.max);
+                    "to invalid!\n",
+                    measurementTypeStr(type).c_str(), ch, temporary->update.max);
       temporary->update.avg = invalidValue;
       return false;
     }
@@ -233,8 +249,8 @@ bool Measurements::update(MeasurementType type, float val, int ch) {
     temporary->update.invalidCounter++;
     if (temporary->update.invalidCounter >= temporary->update.max) {
       Serial.printf("%s{%d} invalid value update counter reached (%dx)! Setting its average value "
-                    "to invalid!",
-                    measurementTypeStr(type), ch, temporary->update.max);
+                    "to invalid!\n",
+                    measurementTypeStr(type).c_str(), ch, temporary->update.max);
       temporary->update.avg = invalidValue;
       return false;
     }
@@ -414,12 +430,18 @@ String Measurements::measurementTypeStr(MeasurementType type) {
   case PM03_PC:
     str = "PM003_PC";
     break;
+  case PM05_PC:
+    str = "PM005_PC";
+    break;
   case PM01_PC:
     str = "PM01_PC";
     break;
   case PM25_PC:
     str = "PM25_PC";
     break;
+  case PM5_PC:
+    str = "PM05_PC";
+    break;
   case PM10_PC:
     str = "PM10_PC";
     break;
@@ -604,12 +626,22 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
     if (utils::isValidPm03Count(_pm_03_pc[ch].update.avg)) {
       pms["pm003Count"] = ag.round2(_pm_03_pc[ch].update.avg);
     }
+    if (utils::isValidPm03Count(_pm_05_pc[ch].update.avg)) {
+      pms["pm005Count"] = ag.round2(_pm_05_pc[ch].update.avg);
+    }
     if (utils::isValidPm03Count(_pm_01_pc[ch].update.avg)) {
       pms["pm01Count"] = ag.round2(_pm_01_pc[ch].update.avg);
     }
     if (utils::isValidPm03Count(_pm_25_pc[ch].update.avg)) {
       pms["pm02Count"] = ag.round2(_pm_25_pc[ch].update.avg);
     }
+    if (_pm_5_pc[ch].listValues.empty() == false) {
+      // Only include pm5.0 count when values available on its list
+      // If not, means no pm5_pc available from the sensor
+      if (utils::isValidPm03Count(_pm_5_pc[ch].update.avg)) {
+        pms["pm05Count"] = ag.round2(_pm_5_pc[ch].update.avg);
+      }
+    }
     if (_pm_10_pc[ch].listValues.empty() == false) {
       // Only include pm10 count when values available on its list
       // If not, means no pm10_pc available from the sensor
@@ -763,6 +795,20 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
     pms["channels"]["2"]["pm003Count"] = ag.round2(_pm_03_pc[1].update.avg);
   }
 
+  /// PM0.5 particle count
+  if (utils::isValidPm03Count(_pm_05_pc[0].update.avg) &&
+      utils::isValidPm03Count(_pm_05_pc[1].update.avg)) {
+    float avg = (_pm_05_pc[0].update.avg + _pm_05_pc[1].update.avg) / 2.0f;
+    pms["pm005Count"] = ag.round2(avg);
+    pms["channels"]["1"]["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
+    pms["channels"]["2"]["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
+  } else if (utils::isValidPm(_pm_05_pc[0].update.avg)) {
+    pms["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
+    pms["channels"]["1"]["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
+  } else if (utils::isValidPm(_pm_05_pc[1].update.avg)) {
+    pms["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
+    pms["channels"]["2"]["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
+  }
   /// PM1.0 particle count
   if (utils::isValidPm03Count(_pm_01_pc[0].update.avg) &&
       utils::isValidPm03Count(_pm_01_pc[1].update.avg)) {
@@ -793,22 +839,8 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
     pms["channels"]["2"]["pm25Count"] = ag.round2(_pm_25_pc[1].update.avg);
   }
 
-  // NOTE: No need for particle count 10. When allCh is true, basically monitor using PM5003T, which
-  // don't have PC 10
-  // /// PM10 particle count
-  // if (utils::isValidPm03Count(_pm_10_pc[0].update.avg) &&
-  //     utils::isValidPm03Count(_pm_10_pc[1].update.avg)) {
-  //   float avg = (_pm_10_pc[0].update.avg + _pm_10_pc[1].update.avg) / 2.0f;
-  //   pms["pm10Count"] = ag.round2(avg);
-  //   pms["channels"]["1"]["pm10Count"] = ag.round2(_pm_10_pc[0].update.avg);
-  //   pms["channels"]["2"]["pm10Count"] = ag.round2(_pm_10_pc[1].update.avg);
-  // } else if (utils::isValidPm(_pm_10_pc[0].update.avg)) {
-  //   pms["pm10Count"] = ag.round2(_pm_10_pc[0].update.avg);
-  //   pms["channels"]["1"]["pm10Count"] = ag.round2(_pm_10_pc[0].update.avg);
-  // } else if (utils::isValidPm(_pm_10_pc[1].update.avg)) {
-  //   pms["pm10Count"] = ag.round2(_pm_10_pc[1].update.avg);
-  //   pms["channels"]["2"]["pm10Count"] = ag.round2(_pm_10_pc[1].update.avg);
-  // }
+  // NOTE: No need for particle count 5.0 and 10. When allCh is true, basically monitor using
+  // PM5003T, which don't have PC 5.0 and 10
 
   if (withTempHum) {
     /// Temperature
diff --git a/src/AgValue.h b/src/AgValue.h
index cb723a0..5efea18 100644
--- a/src/AgValue.h
+++ b/src/AgValue.h
@@ -53,8 +53,10 @@ public:
     PM25_SP, // PM2.5 standard particle
     PM10_SP, // PM10 standard particle
     PM03_PC, // Particle 0.3 count
+    PM05_PC, // Particle 0.5 count
     PM01_PC, // Particle 1.0 count
     PM25_PC, // Particle 2.5 count
+    PM5_PC,  // Particle 5.0 count
     PM10_PC, // Particle 10 count
   };
 
@@ -142,8 +144,10 @@ private:
   IntegerValue _pm_25_sp[2]; // pm 2.5 standard particle
   IntegerValue _pm_10_sp[2]; // pm 10 standard particle
   IntegerValue _pm_03_pc[2]; // particle count 0.3
+  IntegerValue _pm_05_pc[2]; // particle count 0.5
   IntegerValue _pm_01_pc[2]; // particle count 1.0
   IntegerValue _pm_25_pc[2]; // particle count 2.5
+  IntegerValue _pm_5_pc[2];  // particle count 5.0
   IntegerValue _pm_10_pc[2]; // particle count 10
 
   bool _debug = false;
diff --git a/src/PMS/PMS5003.cpp b/src/PMS/PMS5003.cpp
index 5b8cdfd..974bb18 100644
--- a/src/PMS/PMS5003.cpp
+++ b/src/PMS/PMS5003.cpp
@@ -136,6 +136,13 @@ int PMS5003::getPm03ParticleCount(void) {
  */
 int PMS5003::getPm01ParticleCount(void) { return pms.getCount1_0(); }
 
+/**
+ * @brief Read particle 0.5 count
+ *
+ * @return int particle 0.5 count index
+ */
+int PMS5003::getPm05ParticleCount(void) { return pms.getCount0_5(); }
+
 /**
  * @brief Read particle 2.5 count
  *
@@ -143,6 +150,13 @@ int PMS5003::getPm01ParticleCount(void) { return pms.getCount1_0(); }
  */
 int PMS5003::getPm25ParticleCount(void) { return pms.getCount2_5(); }
 
+/**
+ * @brief Read particle 5.0 count
+ *
+ * @return int particle 5.0 count index
+ */
+int PMS5003::getPm5ParticleCount(void) { return pms.getCount5_0(); }
+
 /**
  * @brief Read particle 10 count
  *
diff --git a/src/PMS/PMS5003.h b/src/PMS/PMS5003.h
index 0e3ca13..594964e 100644
--- a/src/PMS/PMS5003.h
+++ b/src/PMS/PMS5003.h
@@ -35,8 +35,10 @@ public:
   int getPm10Sp(void);
   // Particle count
   int getPm03ParticleCount(void);
+  int getPm05ParticleCount(void);
   int getPm01ParticleCount(void);
   int getPm25ParticleCount(void);
+  int getPm5ParticleCount(void);
   int getPm10ParticleCount(void);
 
   int convertPm25ToUsAqi(int pm25);
diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp
index e43ea91..27d6313 100644
--- a/src/PMS/PMS5003T.cpp
+++ b/src/PMS/PMS5003T.cpp
@@ -158,6 +158,13 @@ int PMS5003T::getPm03ParticleCount(void) {
   return pms.getCount0_3();
 }
 
+/**
+ * @brief Read particle 0.5 count
+ *
+ * @return int particle 0.5 count index
+ */
+int PMS5003T::getPm05ParticleCount(void) { return pms.getCount0_5(); }
+
 /**
  * @brief Read particle 1.0 count
  *
diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h
index 695439b..73017e7 100644
--- a/src/PMS/PMS5003T.h
+++ b/src/PMS/PMS5003T.h
@@ -38,6 +38,7 @@ public:
   int getPm10Sp(void);
   // Particle count
   int getPm03ParticleCount(void);
+  int getPm05ParticleCount(void);
   int getPm01ParticleCount(void);
   int getPm25ParticleCount(void);
 

From 4af5ca26655dfae4abf21ef6612072d601b2e17a Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Thu, 31 Oct 2024 21:12:29 +0700
Subject: [PATCH 2/8] Update local server docs

---
 docs/local-server.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/local-server.md b/docs/local-server.md
index d65aee1..b6460a8 100644
--- a/docs/local-server.md
+++ b/docs/local-server.md
@@ -59,8 +59,10 @@ You get the following response:
 | `pm10Standard`                    | Number  | PM10 in ug/m3 (standard particle)                                                      |
 | `rco2`                            | Number  | CO2 in ppm                                                                             |
 | `pm003Count`                      | Number  | Particle count 0.3um per dL                                                            |
+| `pm005Count`                      | Number  | Particle count 0.5um per dL                                                            |
 | `pm01Count`                       | Number  | Particle count 1.0um per dL                                                            |
 | `pm25Count`                       | Number  | Particle count 2.5um per dL                                                            |
+| `pm05Count`                       | Number  | Particle count 5.0um per dL                                                            |
 | `pm10Count`                       | Number  | Particle count 10um per dL (only for indoor monitor)                                                             |
 | `atmp`                            | Number  | Temperature in Degrees Celsius                                                         |
 | `atmpCompensated`                 | Number  | Temperature in Degrees Celsius with correction applied                                 |

From 3004a82e7e22a516ca04f4d43b4f8cf9b75bdc76 Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Thu, 31 Oct 2024 21:16:29 +0700
Subject: [PATCH 3/8] pms disconnected log

---
 src/PMS/PMS.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp
index 68df585..88f17bb 100644
--- a/src/PMS/PMS.cpp
+++ b/src/PMS/PMS.cpp
@@ -151,6 +151,7 @@ void PMSBase::readPackage(Stream *serial) {
     if (ms >= READ_PACKGE_TIMEOUT) {
       lastPackage = 0;
       _connected = false;
+      Serial.println("PMS disconnected");
     }
   }
 }

From 4d40ae421c8eae627157d9a86c7a8863b45ce53d Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Thu, 31 Oct 2024 21:17:28 +0700
Subject: [PATCH 4/8] Comment data to post Payload already print out on
 toString() measurement

---
 src/AgApiClient.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/AgApiClient.cpp b/src/AgApiClient.cpp
index 5933c30..8a72a67 100644
--- a/src/AgApiClient.cpp
+++ b/src/AgApiClient.cpp
@@ -130,7 +130,7 @@ bool AgApiClient::postToServer(String data) {
   client.end();
 
   logInfo(String("POST: ") + uri);
-  logInfo(String("DATA: ") + data);
+  // logInfo(String("DATA: ") + data);
   logInfo(String("Return code: ") + String(retCode));
 
   if ((retCode == 200) || (retCode == 429)) {

From 3ebcc584a4dab37417e2764d10da24b1b966f16e Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Thu, 31 Oct 2024 21:19:46 +0700
Subject: [PATCH 5/8] Update localserver docs

---
 docs/local-server.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/local-server.md b/docs/local-server.md
index b6460a8..ad04f5e 100644
--- a/docs/local-server.md
+++ b/docs/local-server.md
@@ -62,8 +62,8 @@ You get the following response:
 | `pm005Count`                      | Number  | Particle count 0.5um per dL                                                            |
 | `pm01Count`                       | Number  | Particle count 1.0um per dL                                                            |
 | `pm25Count`                       | Number  | Particle count 2.5um per dL                                                            |
-| `pm05Count`                       | Number  | Particle count 5.0um per dL                                                            |
-| `pm10Count`                       | Number  | Particle count 10um per dL (only for indoor monitor)                                                             |
+| `pm05Count`                       | Number  | Particle count 5.0um per dL (only for indoor monitor)                                  |
+| `pm10Count`                       | Number  | Particle count 10um per dL (only for indoor monitor)                                   |
 | `atmp`                            | Number  | Temperature in Degrees Celsius                                                         |
 | `atmpCompensated`                 | Number  | Temperature in Degrees Celsius with correction applied                                 |
 | `rhum`                            | Number  | Relative Humidity                                                                      |

From 1d991b1004b920dc714ab1ad6154b99db28451e7 Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Fri, 1 Nov 2024 17:26:18 +0700
Subject: [PATCH 6/8] json key field from constants

---
 src/AgValue.cpp | 267 +++++++++++++++++++++++++-----------------------
 1 file changed, 142 insertions(+), 125 deletions(-)

diff --git a/src/AgValue.cpp b/src/AgValue.cpp
index 969d468..a54dddc 100644
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -3,6 +3,23 @@
 #include "AirGradient.h"
 
 #define json_prop_pmFirmware     "firmware"
+#define json_prop_pm01Ae "pm01"
+#define json_prop_pm25Ae "pm02"
+#define json_prop_pm10Ae "pm10"
+#define json_prop_pm01Sp "pm01Standard"
+#define json_prop_pm25Sp "pm02Standard"
+#define json_prop_pm10Sp "pm10Standard"
+#define json_prop_pm25Compensated "pm02Compensated"
+#define json_prop_pm03Count "pm003Count"
+#define json_prop_pm05Count "pm005Count"
+#define json_prop_pm1Count "pm01Count"
+#define json_prop_pm25Count "pm25Count"
+#define json_prop_pm5Count "pm05Count"
+#define json_prop_pm10Count "pm10Count"
+#define json_prop_temp "atmp"
+#define json_prop_tempCompensated "atmpCompensated"
+#define json_prop_rhum "rhum"
+#define json_prop_rhumCompensated "rhumCompensated"
 
 void Measurements::maxPeriod(MeasurementType type, int max) {
   switch (type) {
@@ -566,16 +583,16 @@ JSONVar Measurements::buildIndoor(bool localServer, AirGradient &ag, Configurati
   if (config.hasSensorSHT) {
     // Add temperature
     if (utils::isValidTemperature(_temperature[0].update.avg)) {
-      indoor["atmp"] = ag.round2(_temperature[0].update.avg);
+      indoor[json_prop_temp] = ag.round2(_temperature[0].update.avg);
       if (localServer) {
-        indoor["atmpCompensated"] = ag.round2(_temperature[0].update.avg);
+        indoor[json_prop_tempCompensated] = ag.round2(_temperature[0].update.avg);
       }
     }
     // Add humidity
     if (utils::isValidHumidity(_humidity[0].update.avg)) {
-      indoor["rhum"] = ag.round2(_humidity[0].update.avg);
+      indoor[json_prop_rhum] = ag.round2(_humidity[0].update.avg);
       if (localServer) {
-        indoor["rhumCompensated"] = ag.round2(_humidity[0].update.avg);
+        indoor[json_prop_rhumCompensated] = ag.round2(_humidity[0].update.avg);
       }
     }
   }
@@ -585,7 +602,7 @@ JSONVar Measurements::buildIndoor(bool localServer, AirGradient &ag, Configurati
     if (config.hasSensorSHT && utils::isValidHumidity(_humidity[0].update.avg)) {
       float pm25 = ag.pms5003.compensate(_pm_25[0].update.avg, _humidity[0].update.avg);
       if (utils::isValidPm(pm25)) {
-        indoor["pm02Compensated"] = ag.round2(pm25);
+        indoor[json_prop_pm25Compensated] = ag.round2(pm25);
       }
     }
   }
@@ -606,47 +623,47 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
     ch = ch - 1;
 
     if (utils::isValidPm(_pm_01[ch].update.avg)) {
-      pms["pm01"] = ag.round2(_pm_01[ch].update.avg);
+      pms[json_prop_pm01Ae] = ag.round2(_pm_01[ch].update.avg);
     }
     if (utils::isValidPm(_pm_25[ch].update.avg)) {
-      pms["pm02"] = ag.round2(_pm_25[ch].update.avg);
+      pms[json_prop_pm25Ae] = ag.round2(_pm_25[ch].update.avg);
     }
     if (utils::isValidPm(_pm_10[ch].update.avg)) {
-      pms["pm10"] = ag.round2(_pm_10[ch].update.avg);
+      pms[json_prop_pm10Ae] = ag.round2(_pm_10[ch].update.avg);
     }
     if (utils::isValidPm(_pm_01_sp[ch].update.avg)) {
-      pms["pm01Standard"] = ag.round2(_pm_01_sp[ch].update.avg);
+      pms[json_prop_pm01Sp] = ag.round2(_pm_01_sp[ch].update.avg);
     }
     if (utils::isValidPm(_pm_25_sp[ch].update.avg)) {
-      pms["pm02Standard"] = ag.round2(_pm_25_sp[ch].update.avg);
+      pms[json_prop_pm25Sp] = ag.round2(_pm_25_sp[ch].update.avg);
     }
     if (utils::isValidPm(_pm_10_sp[ch].update.avg)) {
-      pms["pm10Standard"] = ag.round2(_pm_10_sp[ch].update.avg);
+      pms[json_prop_pm10Sp] = ag.round2(_pm_10_sp[ch].update.avg);
     }
     if (utils::isValidPm03Count(_pm_03_pc[ch].update.avg)) {
-      pms["pm003Count"] = ag.round2(_pm_03_pc[ch].update.avg);
+      pms[json_prop_pm03Count] = ag.round2(_pm_03_pc[ch].update.avg);
     }
     if (utils::isValidPm03Count(_pm_05_pc[ch].update.avg)) {
-      pms["pm005Count"] = ag.round2(_pm_05_pc[ch].update.avg);
+      pms[json_prop_pm05Count] = ag.round2(_pm_05_pc[ch].update.avg);
     }
     if (utils::isValidPm03Count(_pm_01_pc[ch].update.avg)) {
-      pms["pm01Count"] = ag.round2(_pm_01_pc[ch].update.avg);
+      pms[json_prop_pm1Count] = ag.round2(_pm_01_pc[ch].update.avg);
     }
     if (utils::isValidPm03Count(_pm_25_pc[ch].update.avg)) {
-      pms["pm02Count"] = ag.round2(_pm_25_pc[ch].update.avg);
+      pms[json_prop_pm25Count] = ag.round2(_pm_25_pc[ch].update.avg);
     }
     if (_pm_5_pc[ch].listValues.empty() == false) {
       // Only include pm5.0 count when values available on its list
       // If not, means no pm5_pc available from the sensor
       if (utils::isValidPm03Count(_pm_5_pc[ch].update.avg)) {
-        pms["pm05Count"] = ag.round2(_pm_5_pc[ch].update.avg);
+        pms[json_prop_pm5Count] = ag.round2(_pm_5_pc[ch].update.avg);
       }
     }
     if (_pm_10_pc[ch].listValues.empty() == false) {
       // Only include pm10 count when values available on its list
       // If not, means no pm10_pc available from the sensor
       if (utils::isValidPm03Count(_pm_10_pc[ch].update.avg)) {
-        pms["pm10Count"] = ag.round2(_pm_10_pc[ch].update.avg);
+        pms[json_prop_pm10Count] = ag.round2(_pm_10_pc[ch].update.avg);
       }
     }
 
@@ -654,23 +671,23 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
       float _vc;
       // Set temperature if valid
       if (utils::isValidTemperature(_temperature[ch].update.avg)) {
-        pms["atmp"] = ag.round2(_temperature[ch].update.avg);
+        pms[json_prop_temp] = ag.round2(_temperature[ch].update.avg);
         // Compensate temperature when flag is set
         if (compensate) {
           _vc = ag.pms5003t_1.compensateTemp(_temperature[ch].update.avg);
           if (utils::isValidTemperature(_vc)) {
-            pms["atmpCompensated"] = ag.round2(_vc);
+            pms[json_prop_tempCompensated] = ag.round2(_vc);
           }
         }
       }
       // Set humidity if valid
       if (utils::isValidHumidity(_humidity[ch].update.avg)) {
-        pms["rhum"] = ag.round2(_humidity[ch].update.avg);
+        pms[json_prop_rhum] = ag.round2(_humidity[ch].update.avg);
         // Compensate relative humidity when flag is set
         if (compensate) {
           _vc = ag.pms5003t_1.compensateHum(_humidity[ch].update.avg);
           if (utils::isValidTemperature(_vc)) {
-            pms["rhumCompensated"] = ag.round2(_vc);
+            pms[json_prop_rhumCompensated] = ag.round2(_vc);
           }
         }
       }
@@ -683,7 +700,7 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
           // the same base function
           float pm25 = ag.pms5003t_1.compensate(_pm_25[ch].update.avg, _humidity[ch].update.avg);
           if (utils::isValidPm(pm25)) {
-            pms["pm02Compensated"] = ag.round2(pm25);
+            pms[json_prop_pm25Compensated] = ag.round2(pm25);
           }
         }
       }
@@ -699,144 +716,144 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
   /// PM1.0 atmospheric environment
   if (utils::isValidPm(_pm_01[0].update.avg) && utils::isValidPm(_pm_01[1].update.avg)) {
     float avg = (_pm_01[0].update.avg + _pm_01[1].update.avg) / 2.0f;
-    pms["pm01"] = ag.round2(avg);
-    pms["channels"]["1"]["pm01"] = ag.round2(_pm_01[0].update.avg);
-    pms["channels"]["2"]["pm01"] = ag.round2(_pm_01[1].update.avg);
+    pms[json_prop_pm01Ae] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm01Ae] = ag.round2(_pm_01[0].update.avg);
+    pms["channels"]["2"][json_prop_pm01Ae] = ag.round2(_pm_01[1].update.avg);
   } else if (utils::isValidPm(_pm_01[0].update.avg)) {
-    pms["pm01"] = ag.round2(_pm_01[0].update.avg);
-    pms["channels"]["1"]["pm01"] = ag.round2(_pm_01[0].update.avg);
+    pms[json_prop_pm01Ae] = ag.round2(_pm_01[0].update.avg);
+    pms["channels"]["1"][json_prop_pm01Ae] = ag.round2(_pm_01[0].update.avg);
   } else if (utils::isValidPm(_pm_01[1].update.avg)) {
-    pms["pm01"] = ag.round2(_pm_01[1].update.avg);
-    pms["channels"]["2"]["pm01"] = ag.round2(_pm_01[1].update.avg);
+    pms[json_prop_pm01Ae] = ag.round2(_pm_01[1].update.avg);
+    pms["channels"]["2"][json_prop_pm01Ae] = ag.round2(_pm_01[1].update.avg);
   }
 
   /// PM2.5 atmospheric environment
   if (utils::isValidPm(_pm_25[0].update.avg) && utils::isValidPm(_pm_25[1].update.avg)) {
     float avg = (_pm_25[0].update.avg + _pm_25[1].update.avg) / 2.0f;
-    pms["pm02"] = ag.round2(avg);
-    pms["channels"]["1"]["pm02"] = ag.round2(_pm_25[0].update.avg);
-    pms["channels"]["2"]["pm02"] = ag.round2(_pm_25[1].update.avg);
+    pms[json_prop_pm25Ae] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm25Ae] = ag.round2(_pm_25[0].update.avg);
+    pms["channels"]["2"][json_prop_pm25Ae] = ag.round2(_pm_25[1].update.avg);
   } else if (utils::isValidPm(_pm_25[0].update.avg)) {
-    pms["pm02"] = ag.round2(_pm_25[0].update.avg);
-    pms["channels"]["1"]["pm02"] = ag.round2(_pm_25[0].update.avg);
+    pms[json_prop_pm25Ae] = ag.round2(_pm_25[0].update.avg);
+    pms["channels"]["1"][json_prop_pm25Ae] = ag.round2(_pm_25[0].update.avg);
   } else if (utils::isValidPm(_pm_25[1].update.avg)) {
-    pms["pm02"] = ag.round2(_pm_25[1].update.avg);
-    pms["channels"]["2"]["pm02"] = ag.round2(_pm_25[1].update.avg);
+    pms[json_prop_pm25Ae] = ag.round2(_pm_25[1].update.avg);
+    pms["channels"]["2"][json_prop_pm25Ae] = ag.round2(_pm_25[1].update.avg);
   }
 
   /// PM10 atmospheric environment
   if (utils::isValidPm(_pm_10[0].update.avg) && utils::isValidPm(_pm_10[1].update.avg)) {
     float avg = (_pm_10[0].update.avg + _pm_10[1].update.avg) / 2.0f;
-    pms["pm10"] = ag.round2(avg);
-    pms["channels"]["1"]["pm10"] = ag.round2(_pm_10[0].update.avg);
-    pms["channels"]["2"]["pm10"] = ag.round2(_pm_10[1].update.avg);
+    pms[json_prop_pm10Ae] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm10Ae] = ag.round2(_pm_10[0].update.avg);
+    pms["channels"]["2"][json_prop_pm10Ae] = ag.round2(_pm_10[1].update.avg);
   } else if (utils::isValidPm(_pm_10[0].update.avg)) {
-    pms["pm10"] = ag.round2(_pm_10[0].update.avg);
-    pms["channels"]["1"]["pm10"] = ag.round2(_pm_10[0].update.avg);
+    pms[json_prop_pm10Ae] = ag.round2(_pm_10[0].update.avg);
+    pms["channels"]["1"][json_prop_pm10Ae] = ag.round2(_pm_10[0].update.avg);
   } else if (utils::isValidPm(_pm_10[1].update.avg)) {
-    pms["pm10"] = ag.round2(_pm_10[1].update.avg);
-    pms["channels"]["2"]["pm10"] = ag.round2(_pm_10[1].update.avg);
+    pms[json_prop_pm10Ae] = ag.round2(_pm_10[1].update.avg);
+    pms["channels"]["2"][json_prop_pm10Ae] = ag.round2(_pm_10[1].update.avg);
   }
 
   /// PM1.0 standard particle
   if (utils::isValidPm(_pm_01_sp[0].update.avg) && utils::isValidPm(_pm_01_sp[1].update.avg)) {
     float avg = (_pm_01_sp[0].update.avg + _pm_01_sp[1].update.avg) / 2.0f;
-    pms["pm01Standard"] = ag.round2(avg);
-    pms["channels"]["1"]["pm01Standard"] = ag.round2(_pm_01_sp[0].update.avg);
-    pms["channels"]["2"]["pm01Standard"] = ag.round2(_pm_01_sp[1].update.avg);
+    pms[json_prop_pm01Sp] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm01Sp] = ag.round2(_pm_01_sp[0].update.avg);
+    pms["channels"]["2"][json_prop_pm01Sp] = ag.round2(_pm_01_sp[1].update.avg);
   } else if (utils::isValidPm(_pm_01_sp[0].update.avg)) {
-    pms["pm01Standard"] = ag.round2(_pm_01_sp[0].update.avg);
-    pms["channels"]["1"]["pm01Standard"] = ag.round2(_pm_01_sp[0].update.avg);
+    pms[json_prop_pm01Sp] = ag.round2(_pm_01_sp[0].update.avg);
+    pms["channels"]["1"][json_prop_pm01Sp] = ag.round2(_pm_01_sp[0].update.avg);
   } else if (utils::isValidPm(_pm_01_sp[1].update.avg)) {
-    pms["pm01Standard"] = ag.round2(_pm_01_sp[1].update.avg);
-    pms["channels"]["2"]["pm01Standard"] = ag.round2(_pm_01_sp[1].update.avg);
+    pms[json_prop_pm01Sp] = ag.round2(_pm_01_sp[1].update.avg);
+    pms["channels"]["2"][json_prop_pm01Sp] = ag.round2(_pm_01_sp[1].update.avg);
   }
 
   /// PM2.5 standard particle
   if (utils::isValidPm(_pm_25_sp[0].update.avg) && utils::isValidPm(_pm_25_sp[1].update.avg)) {
     float avg = (_pm_25_sp[0].update.avg + _pm_25_sp[1].update.avg) / 2.0f;
-    pms["pm02Standard"] = ag.round2(avg);
-    pms["channels"]["1"]["pm02Standard"] = ag.round2(_pm_25_sp[0].update.avg);
-    pms["channels"]["2"]["pm02Standard"] = ag.round2(_pm_25_sp[1].update.avg);
+    pms[json_prop_pm25Sp] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm25Sp] = ag.round2(_pm_25_sp[0].update.avg);
+    pms["channels"]["2"][json_prop_pm25Sp] = ag.round2(_pm_25_sp[1].update.avg);
   } else if (utils::isValidPm(_pm_25_sp[0].update.avg)) {
-    pms["pm02Standard"] = ag.round2(_pm_25_sp[0].update.avg);
-    pms["channels"]["1"]["pm02Standard"] = ag.round2(_pm_25_sp[0].update.avg);
+    pms[json_prop_pm25Sp] = ag.round2(_pm_25_sp[0].update.avg);
+    pms["channels"]["1"][json_prop_pm25Sp] = ag.round2(_pm_25_sp[0].update.avg);
   } else if (utils::isValidPm(_pm_25_sp[1].update.avg)) {
-    pms["pm02Standard"] = ag.round2(_pm_25_sp[1].update.avg);
-    pms["channels"]["2"]["pm02Standard"] = ag.round2(_pm_25_sp[1].update.avg);
+    pms[json_prop_pm25Sp] = ag.round2(_pm_25_sp[1].update.avg);
+    pms["channels"]["2"][json_prop_pm25Sp] = ag.round2(_pm_25_sp[1].update.avg);
   }
 
   /// PM10 standard particle
   if (utils::isValidPm(_pm_10_sp[0].update.avg) && utils::isValidPm(_pm_10_sp[1].update.avg)) {
     float avg = (_pm_10_sp[0].update.avg + _pm_10_sp[1].update.avg) / 2.0f;
-    pms["pm10Standard"] = ag.round2(avg);
-    pms["channels"]["1"]["pm10Standard"] = ag.round2(_pm_10_sp[0].update.avg);
-    pms["channels"]["2"]["pm10Standard"] = ag.round2(_pm_10_sp[1].update.avg);
+    pms[json_prop_pm10Sp] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm10Sp] = ag.round2(_pm_10_sp[0].update.avg);
+    pms["channels"]["2"][json_prop_pm10Sp] = ag.round2(_pm_10_sp[1].update.avg);
   } else if (utils::isValidPm(_pm_10_sp[0].update.avg)) {
-    pms["pm10Standard"] = ag.round2(_pm_10_sp[0].update.avg);
-    pms["channels"]["1"]["pm10Standard"] = ag.round2(_pm_10_sp[0].update.avg);
+    pms[json_prop_pm10Sp] = ag.round2(_pm_10_sp[0].update.avg);
+    pms["channels"]["1"][json_prop_pm10Sp] = ag.round2(_pm_10_sp[0].update.avg);
   } else if (utils::isValidPm(_pm_10_sp[1].update.avg)) {
-    pms["pm10Standard"] = ag.round2(_pm_10_sp[1].update.avg);
-    pms["channels"]["2"]["pm10Standard"] = ag.round2(_pm_10_sp[1].update.avg);
+    pms[json_prop_pm10Sp] = ag.round2(_pm_10_sp[1].update.avg);
+    pms["channels"]["2"][json_prop_pm10Sp] = ag.round2(_pm_10_sp[1].update.avg);
   }
 
   /// PM003 particle count
   if (utils::isValidPm03Count(_pm_03_pc[0].update.avg) &&
       utils::isValidPm03Count(_pm_03_pc[1].update.avg)) {
     float avg = (_pm_03_pc[0].update.avg + _pm_03_pc[1].update.avg) / 2.0f;
-    pms["pm003Count"] = ag.round2(avg);
-    pms["channels"]["1"]["pm003Count"] = ag.round2(_pm_03_pc[0].update.avg);
-    pms["channels"]["2"]["pm003Count"] = ag.round2(_pm_03_pc[1].update.avg);
+    pms[json_prop_pm03Count] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm03Count] = ag.round2(_pm_03_pc[0].update.avg);
+    pms["channels"]["2"][json_prop_pm03Count] = ag.round2(_pm_03_pc[1].update.avg);
   } else if (utils::isValidPm(_pm_03_pc[0].update.avg)) {
-    pms["pm003Count"] = ag.round2(_pm_03_pc[0].update.avg);
-    pms["channels"]["1"]["pm003Count"] = ag.round2(_pm_03_pc[0].update.avg);
+    pms[json_prop_pm03Count] = ag.round2(_pm_03_pc[0].update.avg);
+    pms["channels"]["1"][json_prop_pm03Count] = ag.round2(_pm_03_pc[0].update.avg);
   } else if (utils::isValidPm(_pm_03_pc[1].update.avg)) {
-    pms["pm003Count"] = ag.round2(_pm_03_pc[1].update.avg);
-    pms["channels"]["2"]["pm003Count"] = ag.round2(_pm_03_pc[1].update.avg);
+    pms[json_prop_pm03Count] = ag.round2(_pm_03_pc[1].update.avg);
+    pms["channels"]["2"][json_prop_pm03Count] = ag.round2(_pm_03_pc[1].update.avg);
   }
 
   /// PM0.5 particle count
   if (utils::isValidPm03Count(_pm_05_pc[0].update.avg) &&
       utils::isValidPm03Count(_pm_05_pc[1].update.avg)) {
     float avg = (_pm_05_pc[0].update.avg + _pm_05_pc[1].update.avg) / 2.0f;
-    pms["pm005Count"] = ag.round2(avg);
-    pms["channels"]["1"]["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
-    pms["channels"]["2"]["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
+    pms[json_prop_pm05Count] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm05Count] = ag.round2(_pm_05_pc[0].update.avg);
+    pms["channels"]["2"][json_prop_pm05Count] = ag.round2(_pm_05_pc[1].update.avg);
   } else if (utils::isValidPm(_pm_05_pc[0].update.avg)) {
-    pms["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
-    pms["channels"]["1"]["pm005Count"] = ag.round2(_pm_05_pc[0].update.avg);
+    pms[json_prop_pm05Count] = ag.round2(_pm_05_pc[0].update.avg);
+    pms["channels"]["1"][json_prop_pm05Count] = ag.round2(_pm_05_pc[0].update.avg);
   } else if (utils::isValidPm(_pm_05_pc[1].update.avg)) {
-    pms["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
-    pms["channels"]["2"]["pm005Count"] = ag.round2(_pm_05_pc[1].update.avg);
+    pms[json_prop_pm05Count] = ag.round2(_pm_05_pc[1].update.avg);
+    pms["channels"]["2"][json_prop_pm05Count] = ag.round2(_pm_05_pc[1].update.avg);
   }
   /// PM1.0 particle count
   if (utils::isValidPm03Count(_pm_01_pc[0].update.avg) &&
       utils::isValidPm03Count(_pm_01_pc[1].update.avg)) {
     float avg = (_pm_01_pc[0].update.avg + _pm_01_pc[1].update.avg) / 2.0f;
-    pms["pm01Count"] = ag.round2(avg);
-    pms["channels"]["1"]["pm01Count"] = ag.round2(_pm_01_pc[0].update.avg);
-    pms["channels"]["2"]["pm01Count"] = ag.round2(_pm_01_pc[1].update.avg);
+    pms[json_prop_pm1Count] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm1Count] = ag.round2(_pm_01_pc[0].update.avg);
+    pms["channels"]["2"][json_prop_pm1Count] = ag.round2(_pm_01_pc[1].update.avg);
   } else if (utils::isValidPm(_pm_01_pc[0].update.avg)) {
-    pms["pm01Count"] = ag.round2(_pm_01_pc[0].update.avg);
-    pms["channels"]["1"]["pm01Count"] = ag.round2(_pm_01_pc[0].update.avg);
+    pms[json_prop_pm1Count] = ag.round2(_pm_01_pc[0].update.avg);
+    pms["channels"]["1"][json_prop_pm1Count] = ag.round2(_pm_01_pc[0].update.avg);
   } else if (utils::isValidPm(_pm_01_pc[1].update.avg)) {
-    pms["pm01Count"] = ag.round2(_pm_01_pc[1].update.avg);
-    pms["channels"]["2"]["pm01Count"] = ag.round2(_pm_01_pc[1].update.avg);
+    pms[json_prop_pm1Count] = ag.round2(_pm_01_pc[1].update.avg);
+    pms["channels"]["2"][json_prop_pm1Count] = ag.round2(_pm_01_pc[1].update.avg);
   }
 
   /// PM2.5 particle count
   if (utils::isValidPm03Count(_pm_25_pc[0].update.avg) &&
       utils::isValidPm03Count(_pm_25_pc[1].update.avg)) {
     float avg = (_pm_25_pc[0].update.avg + _pm_25_pc[1].update.avg) / 2.0f;
-    pms["pm25Count"] = ag.round2(avg);
-    pms["channels"]["1"]["pm25Count"] = ag.round2(_pm_25_pc[0].update.avg);
-    pms["channels"]["2"]["pm25Count"] = ag.round2(_pm_25_pc[1].update.avg);
+    pms[json_prop_pm25Count] = ag.round2(avg);
+    pms["channels"]["1"][json_prop_pm25Count] = ag.round2(_pm_25_pc[0].update.avg);
+    pms["channels"]["2"][json_prop_pm25Count] = ag.round2(_pm_25_pc[1].update.avg);
   } else if (utils::isValidPm(_pm_25_pc[0].update.avg)) {
-    pms["pm25Count"] = ag.round2(_pm_25_pc[0].update.avg);
-    pms["channels"]["1"]["pm25Count"] = ag.round2(_pm_25_pc[0].update.avg);
+    pms[json_prop_pm25Count] = ag.round2(_pm_25_pc[0].update.avg);
+    pms["channels"]["1"][json_prop_pm25Count] = ag.round2(_pm_25_pc[0].update.avg);
   } else if (utils::isValidPm(_pm_25_pc[1].update.avg)) {
-    pms["pm25Count"] = ag.round2(_pm_25_pc[1].update.avg);
-    pms["channels"]["2"]["pm25Count"] = ag.round2(_pm_25_pc[1].update.avg);
+    pms[json_prop_pm25Count] = ag.round2(_pm_25_pc[1].update.avg);
+    pms["channels"]["2"][json_prop_pm25Count] = ag.round2(_pm_25_pc[1].update.avg);
   }
 
   // NOTE: No need for particle count 5.0 and 10. When allCh is true, basically monitor using
@@ -848,40 +865,40 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
         utils::isValidTemperature(_temperature[1].update.avg)) {
 
       float temperature = (_temperature[0].update.avg + _temperature[1].update.avg) / 2.0f;
-      pms["atmp"] = ag.round2(temperature);
-      pms["channels"]["1"]["atmp"] = ag.round2(_temperature[0].update.avg);
-      pms["channels"]["2"]["atmp"] = ag.round2(_temperature[1].update.avg);
+      pms[json_prop_temp] = ag.round2(temperature);
+      pms["channels"]["1"][json_prop_temp] = ag.round2(_temperature[0].update.avg);
+      pms["channels"]["2"][json_prop_temp] = ag.round2(_temperature[1].update.avg);
 
       if (compensate) {
         // Compensate both temperature channel
         float temp = ag.pms5003t_1.compensateTemp(temperature);
         float temp1 = ag.pms5003t_1.compensateTemp(_temperature[0].update.avg);
         float temp2 = ag.pms5003t_2.compensateTemp(_temperature[1].update.avg);
-        pms["atmpCompensated"] = ag.round2(temp);
-        pms["channels"]["1"]["atmpCompensated"] = ag.round2(temp1);
-        pms["channels"]["2"]["atmpCompensated"] = ag.round2(temp2);
+        pms[json_prop_tempCompensated] = ag.round2(temp);
+        pms["channels"]["1"][json_prop_tempCompensated] = ag.round2(temp1);
+        pms["channels"]["2"][json_prop_tempCompensated] = ag.round2(temp2);
       }
 
     } else if (utils::isValidTemperature(_temperature[0].update.avg)) {
-      pms["atmp"] = ag.round2(_temperature[0].update.avg);
-      pms["channels"]["1"]["atmp"] = ag.round2(_temperature[0].update.avg);
+      pms[json_prop_temp] = ag.round2(_temperature[0].update.avg);
+      pms["channels"]["1"][json_prop_temp] = ag.round2(_temperature[0].update.avg);
 
       if (compensate) {
         // Compensate channel 1
         float temp1 = ag.pms5003t_1.compensateTemp(_temperature[0].update.avg);
-        pms["atmpCompensated"] = ag.round2(temp1);
-        pms["channels"]["1"]["atmpCompensated"] = ag.round2(temp1);
+        pms[json_prop_tempCompensated] = ag.round2(temp1);
+        pms["channels"]["1"][json_prop_tempCompensated] = ag.round2(temp1);
       }
 
     } else if (utils::isValidTemperature(_temperature[1].update.avg)) {
-      pms["atmp"] = ag.round2(_temperature[1].update.avg);
-      pms["channels"]["2"]["atmp"] = ag.round2(_temperature[1].update.avg);
+      pms[json_prop_temp] = ag.round2(_temperature[1].update.avg);
+      pms["channels"]["2"][json_prop_temp] = ag.round2(_temperature[1].update.avg);
 
       if (compensate) {
         // Compensate channel 2
         float temp2 = ag.pms5003t_2.compensateTemp(_temperature[1].update.avg);
-        pms["atmpCompensated"] = ag.round2(temp2);
-        pms["channels"]["2"]["atmpCompensated"] = ag.round2(temp2);
+        pms[json_prop_tempCompensated] = ag.round2(temp2);
+        pms["channels"]["2"][json_prop_tempCompensated] = ag.round2(temp2);
       }
     }
 
@@ -889,40 +906,40 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
     if (utils::isValidHumidity(_humidity[0].update.avg) &&
         utils::isValidHumidity(_humidity[1].update.avg)) {
       float humidity = (_humidity[0].update.avg + _humidity[1].update.avg) / 2.0f;
-      pms["rhum"] = ag.round2(humidity);
-      pms["channels"]["1"]["rhum"] = ag.round2(_humidity[0].update.avg);
-      pms["channels"]["2"]["rhum"] = ag.round2(_humidity[1].update.avg);
+      pms[json_prop_rhum] = ag.round2(humidity);
+      pms["channels"]["1"][json_prop_rhum] = ag.round2(_humidity[0].update.avg);
+      pms["channels"]["2"][json_prop_rhum] = ag.round2(_humidity[1].update.avg);
 
       if (compensate) {
         // Compensate both humidity channel
         float hum = ag.pms5003t_1.compensateHum(humidity);
         float hum1 = ag.pms5003t_1.compensateHum(_humidity[0].update.avg);
         float hum2 = ag.pms5003t_2.compensateHum(_humidity[1].update.avg);
-        pms["rhumCompensated"] = ag.round2(hum);
-        pms["channels"]["1"]["rhumCompensated"] = ag.round2(hum1);
-        pms["channels"]["2"]["rhumCompensated"] = ag.round2(hum2);
+        pms[json_prop_rhumCompensated] = ag.round2(hum);
+        pms["channels"]["1"][json_prop_rhumCompensated] = ag.round2(hum1);
+        pms["channels"]["2"][json_prop_rhumCompensated] = ag.round2(hum2);
       }
 
     } else if (utils::isValidHumidity(_humidity[0].update.avg)) {
-      pms["rhum"] = ag.round2(_humidity[0].update.avg);
-      pms["channels"]["1"]["rhum"] = ag.round2(_humidity[0].update.avg);
+      pms[json_prop_rhum] = ag.round2(_humidity[0].update.avg);
+      pms["channels"]["1"][json_prop_rhum] = ag.round2(_humidity[0].update.avg);
 
       if (compensate) {
         // Compensate humidity channel 1
         float hum1 = ag.pms5003t_1.compensateHum(_humidity[0].update.avg);
-        pms["rhumCompensated"] = ag.round2(hum1);
-        pms["channels"]["1"]["rhumCompensated"] = ag.round2(hum1);
+        pms[json_prop_rhumCompensated] = ag.round2(hum1);
+        pms["channels"]["1"][json_prop_rhumCompensated] = ag.round2(hum1);
       }
 
     } else if (utils::isValidHumidity(_humidity[1].update.avg)) {
-      pms["rhum"] = ag.round2(_humidity[1].update.avg);
-      pms["channels"]["2"]["rhum"] = ag.round2(_humidity[1].update.avg);
+      pms[json_prop_rhum] = ag.round2(_humidity[1].update.avg);
+      pms["channels"]["2"][json_prop_rhum] = ag.round2(_humidity[1].update.avg);
 
       if (compensate) {
         // Compensate humidity channel 2
         float hum2 = ag.pms5003t_2.compensateHum(_humidity[1].update.avg);
-        pms["rhumCompensated"] = ag.round2(hum2);
-        pms["channels"]["2"]["rhumCompensated"] = ag.round2(hum2);
+        pms[json_prop_rhumCompensated] = ag.round2(hum2);
+        pms["channels"]["2"][json_prop_rhumCompensated] = ag.round2(hum2);
       }
     }
 
@@ -934,21 +951,21 @@ JSONVar Measurements::buildPMS(AirGradient &ag, int ch, bool allCh, bool withTem
       if (utils::isValidPm(_pm_25[0].update.avg) &&
           utils::isValidHumidity(_humidity[0].update.avg)) {
         pm25_comp1 = ag.pms5003t_1.compensate(_pm_25[0].update.avg, _humidity[0].update.avg);
-        pms["channels"]["1"]["pm02Compensated"] = ag.round2(pm25_comp1);
+        pms["channels"]["1"][json_prop_pm25Compensated] = ag.round2(pm25_comp1);
       }
       if (utils::isValidPm(_pm_25[1].update.avg) &&
           utils::isValidHumidity(_humidity[1].update.avg)) {
         pm25_comp2 = ag.pms5003t_2.compensate(_pm_25[1].update.avg, _humidity[1].update.avg);
-        pms["channels"]["2"]["pm02Compensated"] = ag.round2(pm25_comp2);
+        pms["channels"]["2"][json_prop_pm25Compensated] = ag.round2(pm25_comp2);
       }
 
       /// Get average or one of the channel compensated value if only one channel is valid
       if (utils::isValidPm(pm25_comp1) && utils::isValidPm(pm25_comp2)) {
-        pms["pm02Compensated"] = ag.round2((pm25_comp1 + pm25_comp2) / 2.0f);
+        pms[json_prop_pm25Compensated] = ag.round2((pm25_comp1 + pm25_comp2) / 2.0f);
       } else if (utils::isValidPm(pm25_comp1)) {
-        pms["pm02Compensated"] = ag.round2(pm25_comp1);
+        pms[json_prop_pm25Compensated] = ag.round2(pm25_comp1);
       } else if (utils::isValidPm(pm25_comp2)) {
-        pms["pm02Compensated"] = ag.round2(pm25_comp2);
+        pms[json_prop_pm25Compensated] = ag.round2(pm25_comp2);
       }
     }
   }

From bb754edc515c78a519b5d7546b0232f2c22acd29 Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Fri, 1 Nov 2024 17:44:11 +0700
Subject: [PATCH 7/8] Add other sensor json key field as const

---
 src/AgValue.cpp | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/AgValue.cpp b/src/AgValue.cpp
index a54dddc..d1ea117 100644
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -20,6 +20,11 @@
 #define json_prop_tempCompensated "atmpCompensated"
 #define json_prop_rhum "rhum"
 #define json_prop_rhumCompensated "rhumCompensated"
+#define json_prop_tvoc "tvocIndex"
+#define json_prop_tvocRaw "tvocRaw"
+#define json_prop_nox "noxIndex"
+#define json_prop_noxRaw "noxRaw"
+#define json_prop_co2 "rco2"
 
 void Measurements::maxPeriod(MeasurementType type, int max) {
   switch (type) {
@@ -489,22 +494,22 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi,
 
   // CO2
   if (config.hasSensorS8 && utils::isValidCO2(_co2.update.avg)) {
-    root["rco2"] = ag.round2(_co2.update.avg);
+    root[json_prop_co2] = ag.round2(_co2.update.avg);
   }
 
   /// TVOx and NOx
   if (config.hasSensorSGP) {
     if (utils::isValidVOC(_tvoc.update.avg)) {
-      root["tvocIndex"] = ag.round2(_tvoc.update.avg);
+      root[json_prop_tvoc] = ag.round2(_tvoc.update.avg);
     }
     if (utils::isValidVOC(_tvoc_raw.update.avg)) {
-      root["tvocRaw"] = ag.round2(_tvoc_raw.update.avg);
+      root[json_prop_tvocRaw] = ag.round2(_tvoc_raw.update.avg);
     }
     if (utils::isValidNOx(_nox.update.avg)) {
-      root["noxIndex"] = ag.round2(_nox.update.avg);
+      root[json_prop_nox] = ag.round2(_nox.update.avg);
     }
     if (utils::isValidNOx(_nox_raw.update.avg)) {
-      root["noxRaw"] = ag.round2(_nox_raw.update.avg);
+      root[json_prop_noxRaw] = ag.round2(_nox_raw.update.avg);
     }
   }
 

From 3a9bb16c0933dc494615942715f81c8df443c2e6 Mon Sep 17 00:00:00 2001
From: samuelbles07 <samuelbles07@gmail.com>
Date: Fri, 1 Nov 2024 17:46:58 +0700
Subject: [PATCH 8/8] Change json key name for particle count 2.5 and 5.0

---
 docs/local-server.md | 4 ++--
 src/AgValue.cpp      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/local-server.md b/docs/local-server.md
index ad04f5e..247ec06 100644
--- a/docs/local-server.md
+++ b/docs/local-server.md
@@ -61,8 +61,8 @@ You get the following response:
 | `pm003Count`                      | Number  | Particle count 0.3um per dL                                                            |
 | `pm005Count`                      | Number  | Particle count 0.5um per dL                                                            |
 | `pm01Count`                       | Number  | Particle count 1.0um per dL                                                            |
-| `pm25Count`                       | Number  | Particle count 2.5um per dL                                                            |
-| `pm05Count`                       | Number  | Particle count 5.0um per dL (only for indoor monitor)                                  |
+| `pm02Count`                       | Number  | Particle count 2.5um per dL                                                            |
+| `pm50Count`                       | Number  | Particle count 5.0um per dL (only for indoor monitor)                                  |
 | `pm10Count`                       | Number  | Particle count 10um per dL (only for indoor monitor)                                   |
 | `atmp`                            | Number  | Temperature in Degrees Celsius                                                         |
 | `atmpCompensated`                 | Number  | Temperature in Degrees Celsius with correction applied                                 |
diff --git a/src/AgValue.cpp b/src/AgValue.cpp
index d1ea117..fb7135a 100644
--- a/src/AgValue.cpp
+++ b/src/AgValue.cpp
@@ -13,8 +13,8 @@
 #define json_prop_pm03Count "pm003Count"
 #define json_prop_pm05Count "pm005Count"
 #define json_prop_pm1Count "pm01Count"
-#define json_prop_pm25Count "pm25Count"
-#define json_prop_pm5Count "pm05Count"
+#define json_prop_pm25Count "pm02Count"
+#define json_prop_pm5Count "pm50Count"
 #define json_prop_pm10Count "pm10Count"
 #define json_prop_temp "atmp"
 #define json_prop_tempCompensated "atmpCompensated"