Merge pull request #67 from airgradienthq/develop

Develop

examples/ONE_I-9PSL/ONE_I-9PSL.ino

@@ -930,6 +930,9 @@ static void webServerInit(void) {
   webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet);
   webServer.begin();
   MDNS.addService("http", "tcp", 80);
+  MDNS.addServiceTxt("http", "_tcp", "board", ag.getBoardName());
+  MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
+  MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
 
   if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
       pdTRUE) {

examples/Open_Air/Open_Air.ino

@@ -1330,6 +1330,9 @@ static void webServerInit(void) {
   webServer.on("/measures/current", HTTP_GET, webServerMeasureCurrentGet);
   webServer.begin();
   MDNS.addService("http", "tcp", 80);
+  MDNS.addServiceTxt("http", "_tcp", "board", ag.getBoardName());
+  MDNS.addServiceTxt("http", "_tcp", "serialno", getDevId());
+  MDNS.addServiceTxt("http", "_tcp", "fw_ver", ag.getVersion());
 
   if (xTaskCreate(webServerHandler, "webserver", 1024 * 4, NULL, 5, NULL) !=
       pdTRUE) {
@@ -1491,7 +1494,7 @@ static void factoryConfigReset(void) {
           ms = (uint32_t)(millis() - factoryBtnPressTime);
           if (ms > 10000) {
             ag.statusLed.setOff();
-            
+
             /** Stop MQTT task first */
             if (mqttTask) {
               vTaskDelete(mqttTask);

src/AirGradient.cpp

@@ -40,3 +40,7 @@ BoardType AirGradient::getBoardType(void) { return boardType; }
 double AirGradient::round2(double value) {
   return (int)(value * 100 + 0.5) / 100.0;
 }
+
+String AirGradient::getBoardName(void) {
+  return String(getBoardDefName(boardType));
+}

src/AirGradient.h

@@ -107,6 +107,13 @@ public:
    */
   String getVersion(void);
 
+  /**
+   * @brief Get the Board Name object
+   * 
+   * @return String 
+   */
+  String getBoardName(void);
+
   /**
    * @brief Round double value with for 2 decimal
    * 

src/Main/BoardDef.cpp

@@ -335,6 +335,19 @@ const BoardDef *getBoardDef(BoardType def) {
   return &bsps[def];
 }
 
+/**
+ * @brief Get the Board Name
+ * 
+ * @param type BoarType
+ * @return const char* 
+ */
+const char *getBoardDefName(BoardType type) {
+  if (type >= _BOARD_MAX) {
+    return NULL;
+  }
+  return bsps[type].name;
+}
+
 #if defined(ESP8266)
 #define bspPrintf(c, ...)                                                      \
   if (_debug != nullptr) {                                                     \

src/Main/BoardDef.h

@@ -83,6 +83,7 @@ struct BoardDef {
 };
 
 const BoardDef *getBoardDef(BoardType def);
+const char *getBoardDefName(BoardType type);
 void printBoardDef(Stream *_debug);
 
 #endif /** _AIR_GRADIENT_BOARD_DEF_H_ */

src/PMS/PMS5003T.cpp

@@ -197,8 +197,8 @@ float PMS5003T::getTemperature(void) {
  * @return float Percent (%)
  */
 float PMS5003T::getRelativeHumidity(void) {
-  float temp = pmsData.AMB_HUM;
-  return temp / 10.0f;
+  float hum = pmsData.AMB_HUM;
+  return correctionRelativeHumidity(hum / 10.0f);
 }
 
 /**
@@ -234,3 +234,7 @@ void PMS5003T::end(void) {
 #endif
   AgLog("De-initialize");
 }
+
+float PMS5003T::correctionRelativeHumidity(float inHum) {
+  return inHum * 1.259 + 7.34;
+}

src/PMS/PMS5003T.h

@@ -47,6 +47,7 @@ private:
   PMS::DATA pmsData;
   bool isBegin(void);
   float correctionTemperature(float inTemp);
+  float correctionRelativeHumidity(float inHum);
 };
 
 #endif /** _PMS5003T_H_ */