From 812c2ab803556ea76f64bc034751b7a96dc8d4bb Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Sat, 20 Jul 2024 08:53:19 +0700 Subject: [PATCH 01/10] add PMS5003T get module firmware version code --- src/PMS/PMS.cpp | 7 +++++++ src/PMS/PMS.h | 1 + src/PMS/PMS5003T.cpp | 9 ++++++++- src/PMS/PMS5003T.h | 2 ++ 4 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp index e9a1527..8d7c957 100644 --- a/src/PMS/PMS.cpp +++ b/src/PMS/PMS.cpp @@ -245,6 +245,13 @@ uint16_t PMSBase::getTemp(void) { return toValue(&package[24]); } */ uint16_t PMSBase::getHum(void) { return toValue(&package[26]); } +/** + * @brief Get PMS500T firmware version code + * + * @return uint8_t + */ +uint8_t PMSBase::getFirmwareVersion(void) { return package[28]; } + /** * @brief Convert PMS2.5 to US AQI unit * diff --git a/src/PMS/PMS.h b/src/PMS/PMS.h index 4fa086a..6131390 100644 --- a/src/PMS/PMS.h +++ b/src/PMS/PMS.h @@ -26,6 +26,7 @@ public: /** For PMS5003T*/ uint16_t getTemp(void); uint16_t getHum(void); + uint8_t getFirmwareVersion(void); int pm25ToAQI(int pm02); diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp index f0f9a1d..296023d 100644 --- a/src/PMS/PMS5003T.cpp +++ b/src/PMS/PMS5003T.cpp @@ -102,7 +102,7 @@ bool PMS5003T::begin(void) { return false; } #endif - + _ver = pms.getFirmwareVersion(); this->_isBegin = true; return true; } @@ -161,6 +161,13 @@ float PMS5003T::getRelativeHumidity(void) { return pms.getHum()/10.0f; } +/** + * @brief Get module(s) firmware version + * + * @return int Version code + */ +int PMS5003T::getFirmwareVersion(void) { return _ver; } + /** * @brief Check device initialized or not * diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h index 2c99b7e..821d946 100644 --- a/src/PMS/PMS5003T.h +++ b/src/PMS/PMS5003T.h @@ -29,10 +29,12 @@ public: int convertPm25ToUsAqi(int pm25); float getTemperature(void); float getRelativeHumidity(void); + int getFirmwareVersion(void); private: bool _isBegin = false; bool _isSleep = false; + int _ver; /** Firmware version code */ BoardType _boardDef; const BoardDef *bsp; From 01943f594dbfe6db4de46323f7066574639595af Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Mon, 29 Jul 2024 13:20:07 +0700 Subject: [PATCH 02/10] Send PMS5003T firmware version to cloud --- src/AgValue.cpp | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/src/AgValue.cpp b/src/AgValue.cpp index b0cd3a0..02a1590 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -121,6 +121,9 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + if (!localServer) { + root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + } } if (config->hasSensorPMS2) { if(utils::isValidPMS(this->pm01_2)) { @@ -157,6 +160,9 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + if(!localServer) { + root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + } } } else { if (fwMode == FW_MODE_O_1P) { @@ -193,6 +199,9 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + if(!localServer) { + root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + } } else if (config->hasSensorPMS2) { if(utils::isValidPMS(this->pm01_2)) { root["pm01"] = this->pm01_2; @@ -226,6 +235,9 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + if(!localServer) { + root["PMS5003T_FwVer"] = ag->pms5003t_2.getFirmwareVersion(); + } } } else { float val; @@ -262,6 +274,11 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + + // PMS5003T version + if(!localServer) { + root["channels"]["1"]["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + } } if (config->hasSensorPMS2) { float val; @@ -297,6 +314,10 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } } + // PMS5003T version + if(!localServer) { + root["channels"]["2"]["PMS5003T_FwVer"] = ag->pms5003t_2.getFirmwareVersion(); + } } } } From 040bd28038328cf3925b9fd7f549bb528b2141a6 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Wed, 7 Aug 2024 08:50:43 +0700 Subject: [PATCH 03/10] Add report PMS5003 and PMS5003T firmware version --- src/AgValue.cpp | 56 +++++++++++++++++++++++++++++++++++++++----- src/AgValue.h | 3 +++ src/PMS/PMS.cpp | 9 ++++++- src/PMS/PMS.h | 1 + src/PMS/PMS5003.cpp | 16 ++++++++++++- src/PMS/PMS5003.h | 3 +++ src/PMS/PMS5003T.cpp | 7 ++++++ src/PMS/PMS5003T.h | 1 + 8 files changed, 88 insertions(+), 8 deletions(-) diff --git a/src/AgValue.cpp b/src/AgValue.cpp index 02a1590..e66c8b4 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -4,6 +4,39 @@ #include "Main/utils.h" #include "Libraries/Arduino_JSON/src/Arduino_JSON.h" +#define json_prop_pmsFirmware "pmsFirmware" + +/** + * @brief Get PMS5003 firmware version string + * + * @param fwCode + * @return String + */ +String Measurements::pms5003FirmwareVersion(int fwCode) { + return pms5003FirmwareVersionBase("PMS5003", fwCode); +} + +/** + * @brief Get PMS5003T firmware version string + * + * @param fwCode + * @return String + */ +String Measurements::pms5003TFirmwareVersion(int fwCode) { + return pms5003FirmwareVersionBase("PMS5003T", 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; @@ -33,6 +66,11 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, if (utils::isValidPMS03Count(this->pm03PCount_1)) { root["pm003Count"] = this->pm03PCount_1; } + if (!localServer) { + + root[json_prop_pmsFirmware] = + this->pms5003FirmwareVersion(ag->pms5003.getFirmwareVersion()); + } } if (config->hasSensorSHT) { @@ -122,7 +160,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if (!localServer) { - root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + root[json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } if (config->hasSensorPMS2) { @@ -161,7 +200,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + root[json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } } else { @@ -200,7 +240,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + root[json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } else if (config->hasSensorPMS2) { if(utils::isValidPMS(this->pm01_2)) { @@ -236,7 +277,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root["PMS5003T_FwVer"] = ag->pms5003t_2.getFirmwareVersion(); + root[json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion()); } } } else { @@ -277,7 +319,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, // PMS5003T version if(!localServer) { - root["channels"]["1"]["PMS5003T_FwVer"] = ag->pms5003t_1.getFirmwareVersion(); + root["channels"]["1"][json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } if (config->hasSensorPMS2) { @@ -316,7 +359,8 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } // PMS5003T version if(!localServer) { - root["channels"]["2"]["PMS5003T_FwVer"] = ag->pms5003t_2.getFirmwareVersion(); + root["channels"]["2"][json_prop_pmsFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion()); } } } diff --git a/src/AgValue.h b/src/AgValue.h index 3176482..1957828 100644 --- a/src/AgValue.h +++ b/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; diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp index 8d7c957..dcb516a 100644 --- a/src/PMS/PMS.cpp +++ b/src/PMS/PMS.cpp @@ -246,12 +246,19 @@ uint16_t PMSBase::getTemp(void) { return toValue(&package[24]); } uint16_t PMSBase::getHum(void) { return toValue(&package[26]); } /** - * @brief Get PMS500T firmware version code + * @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 * diff --git a/src/PMS/PMS.h b/src/PMS/PMS.h index 6131390..38bdb45 100644 --- a/src/PMS/PMS.h +++ b/src/PMS/PMS.h @@ -27,6 +27,7 @@ public: uint16_t getTemp(void); uint16_t getHum(void); uint8_t getFirmwareVersion(void); + uint8_t getErrorCode(void); int pm25ToAQI(int pm02); diff --git a/src/PMS/PMS5003.cpp b/src/PMS/PMS5003.cpp index 0c1ea83..7325240 100644 --- a/src/PMS/PMS5003.cpp +++ b/src/PMS/PMS5003.cpp @@ -78,7 +78,7 @@ bool PMS5003::begin(void) { return false; } #endif - + _ver = pms.getFirmwareVersion(); this->_isBegin = true; return true; } @@ -121,6 +121,20 @@ int PMS5003::getPm03ParticleCount(void) { */ int PMS5003::convertPm25ToUsAqi(int pm25) { return pms.pm25ToAQI(pm25); } +/** + * @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 * diff --git a/src/PMS/PMS5003.h b/src/PMS/PMS5003.h index cd66b07..3ed63aa 100644 --- a/src/PMS/PMS5003.h +++ b/src/PMS/PMS5003.h @@ -24,9 +24,12 @@ public: int getPm10Ae(void); int getPm03ParticleCount(void); int convertPm25ToUsAqi(int pm25); + int getFirmwareVersion(void); + uint8_t getErrorCode(void); private: bool _isBegin = false; + int _ver; BoardType _boardDef; PMSBase pms; const BoardDef *bsp; diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp index 7ea6d74..1f48ebd 100644 --- a/src/PMS/PMS5003T.cpp +++ b/src/PMS/PMS5003T.cpp @@ -171,6 +171,13 @@ float PMS5003T::getRelativeHumidity(void) { */ 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 * diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h index 821d946..0a0b1dc 100644 --- a/src/PMS/PMS5003T.h +++ b/src/PMS/PMS5003T.h @@ -30,6 +30,7 @@ public: float getTemperature(void); float getRelativeHumidity(void); int getFirmwareVersion(void); + uint8_t getErrorCode(void); private: bool _isBegin = false; From 6d0136688731d0cb18f07e2e4b64ae2e7f0b9c76 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Thu, 15 Aug 2024 08:04:30 +0700 Subject: [PATCH 04/10] change `pmsFirmare` to `firmware` --- src/AgValue.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/AgValue.cpp b/src/AgValue.cpp index e66c8b4..090e3b7 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -4,7 +4,7 @@ #include "Main/utils.h" #include "Libraries/Arduino_JSON/src/Arduino_JSON.h" -#define json_prop_pmsFirmware "pmsFirmware" +#define json_prop_pmFirmware "firmware" /** * @brief Get PMS5003 firmware version string @@ -68,7 +68,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } if (!localServer) { - root[json_prop_pmsFirmware] = + root[json_prop_pmFirmware] = this->pms5003FirmwareVersion(ag->pms5003.getFirmwareVersion()); } } @@ -160,7 +160,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if (!localServer) { - root[json_prop_pmsFirmware] = + root[json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } @@ -200,7 +200,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root[json_prop_pmsFirmware] = + root[json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } @@ -240,7 +240,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root[json_prop_pmsFirmware] = + root[json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } else if (config->hasSensorPMS2) { @@ -277,7 +277,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } if(!localServer) { - root[json_prop_pmsFirmware] = + root[json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion()); } } @@ -319,7 +319,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, // PMS5003T version if(!localServer) { - root["channels"]["1"][json_prop_pmsFirmware] = + root["channels"]["1"][json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); } } @@ -359,7 +359,7 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } // PMS5003T version if(!localServer) { - root["channels"]["2"][json_prop_pmsFirmware] = + root["channels"]["2"][json_prop_pmFirmware] = pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion()); } } From 81b13134d2a79dc4ff9c99a0bc3632042479f2ef Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Fri, 16 Aug 2024 06:42:43 +0700 Subject: [PATCH 05/10] update PM2.5 firmware prefix to `PMS5003x` --- src/AgValue.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/AgValue.cpp b/src/AgValue.cpp index 090e3b7..fc13dcb 100644 --- a/src/AgValue.cpp +++ b/src/AgValue.cpp @@ -13,7 +13,7 @@ * @return String */ String Measurements::pms5003FirmwareVersion(int fwCode) { - return pms5003FirmwareVersionBase("PMS5003", fwCode); + return pms5003FirmwareVersionBase("PMS5003x", fwCode); } /** @@ -23,7 +23,7 @@ String Measurements::pms5003FirmwareVersion(int fwCode) { * @return String */ String Measurements::pms5003TFirmwareVersion(int fwCode) { - return pms5003FirmwareVersionBase("PMS5003T", fwCode); + return pms5003FirmwareVersionBase("PMS5003x", fwCode); } /** From b049a23657cd12dbada9a2c6862a2e0e29cfeac5 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Sun, 25 Aug 2024 20:21:26 +0700 Subject: [PATCH 06/10] Restart device after PMS sensor read failed 10 times --- examples/BASIC/BASIC.ino | 14 ++-- .../DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 14 ++-- .../DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 12 ++- examples/OneOpenAir/OneOpenAir.ino | 73 ++++++++++++++----- src/PMS/PMS.cpp | 31 ++++++++ src/PMS/PMS.h | 8 ++ src/PMS/PMS5003.cpp | 30 ++++++++ src/PMS/PMS5003.h | 4 + src/PMS/PMS5003T.cpp | 29 ++++++++ src/PMS/PMS5003T.h | 4 + 10 files changed, 186 insertions(+), 33 deletions(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 4099b71..4323b13 100644 --- a/examples/BASIC/BASIC.ino +++ b/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; @@ -514,16 +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; + ag.pms5003.resetFailCount(); } else { - pmFailCount++; - Serial.printf("PMS read failed: %d\r\n", pmFailCount); - if (pmFailCount >= 3) { + ag.pms5003.updateFailCount(); + Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); + if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPMS(); } + + if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { + Serial.printf("Restarting..."); + ESP.restart(); + } } } diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index df059b7..2f4d663 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/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; @@ -566,16 +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; + ag.pms5003.resetFailCount(); } else { - pmFailCount++; - Serial.printf("PMS read failed: %d\r\n", pmFailCount); - if (pmFailCount >= 3) { + ag.pms5003.updateFailCount(); + Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); + if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPMS(); } + + if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { + Serial.printf("Restarting..."); + ESP.restart(); + } } } diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index 20be418..b29f621 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/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; @@ -609,16 +608,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; + ag.pms5003.resetFailCount(); } else { - pmFailCount++; + ag.pms5003.updateFailCount(); Serial.printf("PMS read failed: %d\r\n", pmFailCount); - if (pmFailCount >= 3) { + if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPMS(); } + + if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { + Serial.printf("Restarting..."); + ESP.restart(); + } } } diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index 978c345..a6bf7c3 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/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; @@ -1006,6 +1005,7 @@ static void updateTvoc(void) { } static void updatePm(void) { + bool failToRestart = false; if (ag->isOne()) { if (ag->pms5003.isFailed() == false) { measurements.pm01_1 = ag->pms5003.getPm01Ae(); @@ -1018,16 +1018,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; + ag->pms5003.resetFailCount(); } else { - pmFailCount++; - Serial.printf("PMS read failed: %d\r\n", pmFailCount); - if (pmFailCount >= 3) { + ag->pms5003.updateFailCount(); + Serial.printf("PMS read failed: %d\r\n", ag->pms5003.getFailCount()); + if (ag->pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPMS(); } + + if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) { + failToRestart = true; + } } } else { bool pmsResult_1 = false; @@ -1053,13 +1057,26 @@ static void updatePm(void) { ag->pms5003t_1.temperatureCompensated(measurements.temp_1)); Serial.printf("[1] Relative Humidity compensated: %f\r\n", ag->pms5003t_1.humidityCompensated(measurements.hum_1)); + + ag->pms5003t_1.resetFailCount(); } else { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); - measurements.temp_1 = utils::getInvalidTemperature(); - measurements.hum_1 = utils::getInvalidHumidity(); + if (configuration.hasSensorPMS1) { + ag->pms5003t_1.updateFailCount(); + Serial.printf("[1] PMS read failed: %d\r\n", ag->pms5003t_1.getFailCount()); + + if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { + measurements.pm01_1 = utils::getInvalidPMS(); + measurements.pm25_1 = utils::getInvalidPMS(); + measurements.pm10_1 = utils::getInvalidPMS(); + measurements.pm03PCount_1 = utils::getInvalidPMS(); + measurements.temp_1 = utils::getInvalidTemperature(); + measurements.hum_1 = utils::getInvalidHumidity(); + } + + if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) { + failToRestart = true; + } + } } if (configuration.hasSensorPMS2 && (ag->pms5003t_2.isFailed() == false)) { @@ -1080,16 +1097,29 @@ 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_2.temperatureCompensated(measurements.temp_2)); Serial.printf("[2] Relative Humidity compensated: %d\r\n", - ag->pms5003t_1.humidityCompensated(measurements.hum_2)); + ag->pms5003t_2.humidityCompensated(measurements.hum_2)); + + ag->pms5003t_2.resetFailCount(); } else { - measurements.pm01_2 = utils::getInvalidPMS(); - measurements.pm25_2 = utils::getInvalidPMS(); - measurements.pm10_2 = utils::getInvalidPMS(); - measurements.pm03PCount_2 = utils::getInvalidPMS(); - measurements.temp_2 = utils::getInvalidTemperature(); - measurements.hum_2 = utils::getInvalidHumidity(); + if (configuration.hasSensorPMS2) { + ag->pms5003t_2.updateFailCount(); + Serial.printf("[2] PMS read failed: %d\r\n", ag->pms5003t_2.getFailCount()); + + if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { + measurements.pm01_2 = utils::getInvalidPMS(); + measurements.pm25_2 = utils::getInvalidPMS(); + measurements.pm10_2 = utils::getInvalidPMS(); + measurements.pm03PCount_2 = utils::getInvalidPMS(); + measurements.temp_2 = utils::getInvalidTemperature(); + measurements.hum_2 = utils::getInvalidHumidity(); + } + + if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) { + failToRestart = true; + } + } } if (configuration.hasSensorPMS1 && configuration.hasSensorPMS2 && @@ -1189,6 +1219,11 @@ static void updatePm(void) { ag->sgp41.setCompensationTemperatureHumidity(temp, hum); } } + + if (failToRestart) { + Serial.printf("Restarting..."); + ESP.restart(); + } } static void sendDataToServer(void) { diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp index 50b3dac..0629d05 100644 --- a/src/PMS/PMS.cpp +++ b/src/PMS/PMS.cpp @@ -12,6 +12,7 @@ bool PMSBase::begin(Stream *stream) { this->stream = stream; failed = true; + failCount = 0; lastRead = 0; // To read buffer on handle without wait after 1.5sec this->stream->flush(); @@ -147,6 +148,36 @@ void PMSBase::handle() { */ bool PMSBase::isFailed(void) { return failed; } +/** + * @brief Increate number of fail + * + */ +void PMSBase::updateFailCount(void) { + if (failCount < failCountMax) { + failCount++; + } +} + +/** + * @brief Reset number of fail + * + */ +void PMSBase::resetFailCount(void) {failCount = 0;} + +/** + * @brief Get number of fail + * + * @return int + */ +int PMSBase::getFailCount(void) { return failCount; } + +/** + * @brief Get maximum of fail count max + * + * @return int + */ +int PMSBase::getFailCountMax(void) { return failCountMax; } + /** * @brief Read PMS 0.1 ug/m3 with CF = 1 PM estimates * diff --git a/src/PMS/PMS.h b/src/PMS/PMS.h index e89693f..96057d5 100644 --- a/src/PMS/PMS.h +++ b/src/PMS/PMS.h @@ -3,11 +3,17 @@ #include +#define PMS_FAIL_COUNT_SET_INVALID 3 + 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); @@ -36,6 +42,8 @@ private: int packageIndex; bool failed = false; uint32_t lastRead; + const int failCountMax = 10; + int failCount = 0; int16_t toI16(char *buf); uint16_t toU16(char* buf); diff --git a/src/PMS/PMS5003.cpp b/src/PMS/PMS5003.cpp index 8a49550..8bed516 100644 --- a/src/PMS/PMS5003.cpp +++ b/src/PMS/PMS5003.cpp @@ -175,3 +175,33 @@ void PMS5003::handle(void) { pms.handle(); } * @return false Communication timeout or sensor has removed */ bool PMS5003::isFailed(void) { return pms.isFailed(); } + +/** + * @brief Increate number of fail + * + */ +void PMS5003::updateFailCount(void) { + pms.updateFailCount(); +} + +/** + * @brief Reset fail count + * + */ +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(); } diff --git a/src/PMS/PMS5003.h b/src/PMS/PMS5003.h index aa6fcd9..8be8e8f 100644 --- a/src/PMS/PMS5003.h +++ b/src/PMS/PMS5003.h @@ -19,6 +19,10 @@ 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); diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp index 97cc9c7..b3ad9fc 100644 --- a/src/PMS/PMS5003T.cpp +++ b/src/PMS/PMS5003T.cpp @@ -216,3 +216,32 @@ void PMS5003T::handle(void) { pms.handle(); } */ bool PMS5003T::isFailed(void) { return pms.isFailed(); } +/** + * @brief Increate number of fail + * + */ +void PMS5003T::updateFailCount(void) { + pms.updateFailCount(); +} + +/** + * @brief Reset fail count + * + */ +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(); } diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h index 3d2d567..f3d58e7 100644 --- a/src/PMS/PMS5003T.h +++ b/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); From e461b92c9fe6457e07bbb1bff83048eab74c5bd8 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Sun, 25 Aug 2024 20:51:07 +0700 Subject: [PATCH 07/10] Fix build failed --- examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index b29f621..a0a42df 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -611,7 +611,7 @@ static void updatePm(void) { ag.pms5003.resetFailCount(); } else { ag.pms5003.updateFailCount(); - Serial.printf("PMS read failed: %d\r\n", pmFailCount); + Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPMS(); From 104d58a8c0b4e0fdf6de5a4ed1e2b6e39a24e55a Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Mon, 26 Aug 2024 14:14:42 +0700 Subject: [PATCH 08/10] resolve review #222 --- examples/BASIC/BASIC.ino | 12 +++--- examples/BASIC/OpenMetrics.cpp | 8 ++-- .../DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 12 +++--- examples/DiyProIndoorV3_3/OpenMetrics.cpp | 8 ++-- .../DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 12 +++--- examples/DiyProIndoorV4_2/OpenMetrics.cpp | 8 ++-- examples/OneOpenAir/OneOpenAir.ino | 42 +++++++++---------- examples/OneOpenAir/OpenMetrics.cpp | 8 ++-- src/Main/utils.cpp | 2 +- src/Main/utils.h | 2 +- src/PMS/PMS.cpp | 11 +---- src/PMS/PMS5003.cpp | 8 ---- src/PMS/PMS5003T.cpp | 8 ---- 13 files changed, 58 insertions(+), 83 deletions(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 4323b13..85ffd45 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -516,16 +516,16 @@ static void updatePm(void) { ag.pms5003.resetFailCount(); } else { ag.pms5003.updateFailCount(); - Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); + Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount()); if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + measurements.pm01_1 = utils::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("Restarting..."); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); ESP.restart(); } } diff --git a/examples/BASIC/OpenMetrics.cpp b/examples/BASIC/OpenMetrics.cpp index 3392d97..5737a10 100644 --- a/examples/BASIC/OpenMetrics.cpp +++ b/examples/BASIC/OpenMetrics.cpp @@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) { float _temp = utils::getInvalidTemperature(); float _hum = utils::getInvalidHumidity(); - int pm01 = utils::getInvalidPMS(); - int pm25 = utils::getInvalidPMS(); - int pm10 = utils::getInvalidPMS(); - int pm03PCount = utils::getInvalidPMS(); + int pm01 = utils::getInvalidPmValue(); + int pm25 = utils::getInvalidPmValue(); + int pm10 = utils::getInvalidPmValue(); + int pm03PCount = utils::getInvalidPmValue(); int atmpCompensated = utils::getInvalidTemperature(); int ahumCompensated = utils::getInvalidHumidity(); diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index 2f4d663..7ecc082 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -568,16 +568,16 @@ static void updatePm(void) { ag.pms5003.resetFailCount(); } else { ag.pms5003.updateFailCount(); - Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); + Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount()); if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + measurements.pm01_1 = utils::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("Restarting..."); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); ESP.restart(); } } diff --git a/examples/DiyProIndoorV3_3/OpenMetrics.cpp b/examples/DiyProIndoorV3_3/OpenMetrics.cpp index 3392d97..5737a10 100644 --- a/examples/DiyProIndoorV3_3/OpenMetrics.cpp +++ b/examples/DiyProIndoorV3_3/OpenMetrics.cpp @@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) { float _temp = utils::getInvalidTemperature(); float _hum = utils::getInvalidHumidity(); - int pm01 = utils::getInvalidPMS(); - int pm25 = utils::getInvalidPMS(); - int pm10 = utils::getInvalidPMS(); - int pm03PCount = utils::getInvalidPMS(); + int pm01 = utils::getInvalidPmValue(); + int pm25 = utils::getInvalidPmValue(); + int pm10 = utils::getInvalidPmValue(); + int pm03PCount = utils::getInvalidPmValue(); int atmpCompensated = utils::getInvalidTemperature(); int ahumCompensated = utils::getInvalidHumidity(); diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index a0a42df..ac78467 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -611,16 +611,16 @@ static void updatePm(void) { ag.pms5003.resetFailCount(); } else { ag.pms5003.updateFailCount(); - Serial.printf("PMS read failed: %d\r\n", ag.pms5003.getFailCount()); + Serial.printf("PMS read failed %d times\r\n", ag.pms5003.getFailCount()); if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + measurements.pm01_1 = utils::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("Restarting..."); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); ESP.restart(); } } diff --git a/examples/DiyProIndoorV4_2/OpenMetrics.cpp b/examples/DiyProIndoorV4_2/OpenMetrics.cpp index 3392d97..5737a10 100644 --- a/examples/DiyProIndoorV4_2/OpenMetrics.cpp +++ b/examples/DiyProIndoorV4_2/OpenMetrics.cpp @@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) { float _temp = utils::getInvalidTemperature(); float _hum = utils::getInvalidHumidity(); - int pm01 = utils::getInvalidPMS(); - int pm25 = utils::getInvalidPMS(); - int pm10 = utils::getInvalidPMS(); - int pm03PCount = utils::getInvalidPMS(); + int pm01 = utils::getInvalidPmValue(); + int pm25 = utils::getInvalidPmValue(); + int pm10 = utils::getInvalidPmValue(); + int pm03PCount = utils::getInvalidPmValue(); int atmpCompensated = utils::getInvalidTemperature(); int ahumCompensated = utils::getInvalidHumidity(); diff --git a/examples/OneOpenAir/OneOpenAir.ino b/examples/OneOpenAir/OneOpenAir.ino index a6bf7c3..5f9e0fe 100644 --- a/examples/OneOpenAir/OneOpenAir.ino +++ b/examples/OneOpenAir/OneOpenAir.ino @@ -1005,7 +1005,7 @@ static void updateTvoc(void) { } static void updatePm(void) { - bool failToRestart = false; + bool restart = false; if (ag->isOne()) { if (ag->pms5003.isFailed() == false) { measurements.pm01_1 = ag->pms5003.getPm01Ae(); @@ -1021,16 +1021,16 @@ static void updatePm(void) { ag->pms5003.resetFailCount(); } else { ag->pms5003.updateFailCount(); - Serial.printf("PMS read failed: %d\r\n", ag->pms5003.getFailCount()); + Serial.printf("PMS read faile %d times\r\n", ag->pms5003.getFailCount()); if (ag->pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + measurements.pm01_1 = utils::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); } if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) { - failToRestart = true; + restart = true; } } } else { @@ -1062,19 +1062,19 @@ static void updatePm(void) { } else { if (configuration.hasSensorPMS1) { ag->pms5003t_1.updateFailCount(); - Serial.printf("[1] PMS read failed: %d\r\n", ag->pms5003t_1.getFailCount()); + Serial.printf("[1] PMS read failed %d times\r\n", ag->pms5003t_1.getFailCount()); if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + 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()) { - failToRestart = true; + restart = true; } } } @@ -1105,19 +1105,19 @@ static void updatePm(void) { } else { if (configuration.hasSensorPMS2) { ag->pms5003t_2.updateFailCount(); - Serial.printf("[2] PMS read failed: %d\r\n", ag->pms5003t_2.getFailCount()); + Serial.printf("[2] PMS read failed %d times\r\n", ag->pms5003t_2.getFailCount()); if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { - measurements.pm01_2 = utils::getInvalidPMS(); - measurements.pm25_2 = utils::getInvalidPMS(); - measurements.pm10_2 = utils::getInvalidPMS(); - measurements.pm03PCount_2 = utils::getInvalidPMS(); + 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()) { - failToRestart = true; + restart = true; } } } @@ -1220,8 +1220,8 @@ static void updatePm(void) { } } - if (failToRestart) { - Serial.printf("Restarting..."); + if (restart) { + Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); ESP.restart(); } } diff --git a/examples/OneOpenAir/OpenMetrics.cpp b/examples/OneOpenAir/OpenMetrics.cpp index c458a8c..ada9871 100644 --- a/examples/OneOpenAir/OpenMetrics.cpp +++ b/examples/OneOpenAir/OpenMetrics.cpp @@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) { float _temp = utils::getInvalidTemperature(); float _hum = utils::getInvalidHumidity(); - int pm01 = utils::getInvalidPMS(); - int pm25 = utils::getInvalidPMS(); - int pm10 = utils::getInvalidPMS(); - int pm03PCount = utils::getInvalidPMS(); + int pm01 = utils::getInvalidPmValue(); + int pm25 = utils::getInvalidPmValue(); + int pm10 = utils::getInvalidPmValue(); + int pm03PCount = utils::getInvalidPmValue(); int atmpCompensated = utils::getInvalidTemperature(); int ahumCompensated = utils::getInvalidHumidity(); if (config.hasSensorPMS1 && config.hasSensorPMS2) { diff --git a/src/Main/utils.cpp b/src/Main/utils.cpp index 1c8175d..6a4d0e1 100644 --- a/src/Main/utils.cpp +++ b/src/Main/utils.cpp @@ -82,7 +82,7 @@ float utils::getInvalidHumidity(void) { return INVALID_HUMIDITY; } int utils::getInvalidCO2(void) { return INVALID_CO2; } -int utils::getInvalidPMS(void) { return INVALID_PMS; } +int utils::getInvalidPmValue(void) { return INVALID_PMS; } int utils::getInvalidNOx(void) { return INVALID_NOX; } diff --git a/src/Main/utils.h b/src/Main/utils.h index 841d5ec..a1efa93 100644 --- a/src/Main/utils.h +++ b/src/Main/utils.h @@ -21,7 +21,7 @@ public: static float getInvalidTemperature(void); static float getInvalidHumidity(void); static int getInvalidCO2(void); - static int getInvalidPMS(void); + static int getInvalidPmValue(void); static int getInvalidNOx(void); static int getInvalidVOC(void); }; diff --git a/src/PMS/PMS.cpp b/src/PMS/PMS.cpp index 0629d05..1d1ad1c 100644 --- a/src/PMS/PMS.cpp +++ b/src/PMS/PMS.cpp @@ -158,11 +158,7 @@ void PMSBase::updateFailCount(void) { } } -/** - * @brief Reset number of fail - * - */ -void PMSBase::resetFailCount(void) {failCount = 0;} +void PMSBase::resetFailCount(void) { failCount = 0; } /** * @brief Get number of fail @@ -171,11 +167,6 @@ void PMSBase::resetFailCount(void) {failCount = 0;} */ int PMSBase::getFailCount(void) { return failCount; } -/** - * @brief Get maximum of fail count max - * - * @return int - */ int PMSBase::getFailCountMax(void) { return failCountMax; } /** diff --git a/src/PMS/PMS5003.cpp b/src/PMS/PMS5003.cpp index 8bed516..73dd569 100644 --- a/src/PMS/PMS5003.cpp +++ b/src/PMS/PMS5003.cpp @@ -176,18 +176,10 @@ void PMS5003::handle(void) { pms.handle(); } */ bool PMS5003::isFailed(void) { return pms.isFailed(); } -/** - * @brief Increate number of fail - * - */ void PMS5003::updateFailCount(void) { pms.updateFailCount(); } -/** - * @brief Reset fail count - * - */ void PMS5003::resetFailCount(void) { pms.resetFailCount(); } diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp index b3ad9fc..8493504 100644 --- a/src/PMS/PMS5003T.cpp +++ b/src/PMS/PMS5003T.cpp @@ -216,18 +216,10 @@ void PMS5003T::handle(void) { pms.handle(); } */ bool PMS5003T::isFailed(void) { return pms.isFailed(); } -/** - * @brief Increate number of fail - * - */ void PMS5003T::updateFailCount(void) { pms.updateFailCount(); } -/** - * @brief Reset fail count - * - */ void PMS5003T::resetFailCount(void) { pms.resetFailCount(); } From 17238cff86bba28017bcaa73f671326721df0af6 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Mon, 26 Aug 2024 15:52:31 +0700 Subject: [PATCH 09/10] fix compile failed. --- examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino | 2 +- examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino index 7ecc082..d842fff 100644 --- a/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino +++ b/examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino @@ -577,7 +577,7 @@ static void updatePm(void) { } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax()); ESP.restart(); } } diff --git a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino index ac78467..eec919e 100644 --- a/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino +++ b/examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino @@ -620,7 +620,7 @@ static void updatePm(void) { } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax()); ESP.restart(); } } From 1afcca25a1280b55028579bebd04749d84c7b635 Mon Sep 17 00:00:00 2001 From: Phat Nguyen Date: Mon, 26 Aug 2024 15:54:41 +0700 Subject: [PATCH 10/10] Fix compile failed. --- examples/BASIC/BASIC.ino | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 85ffd45..7419f13 100644 --- a/examples/BASIC/BASIC.ino +++ b/examples/BASIC/BASIC.ino @@ -525,7 +525,7 @@ static void updatePm(void) { } if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { - Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); + Serial.printf("PMS failure count reach to max set %d, restarting...", ag.pms5003.getFailCountMax()); ESP.restart(); } }