diff --git a/examples/BASIC/BASIC.ino b/examples/BASIC/BASIC.ino index 4099b71..7419f13 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,15 +513,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) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + ag.pms5003.updateFailCount(); + 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::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("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 df059b7..d842fff 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,15 +565,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) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + ag.pms5003.updateFailCount(); + 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::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("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 20be418..eec919e 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,15 +608,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) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + ag.pms5003.updateFailCount(); + 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::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("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 978c345..5f9e0fe 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 restart = false; if (ag->isOne()) { if (ag->pms5003.isFailed() == false) { measurements.pm01_1 = ag->pms5003.getPm01Ae(); @@ -1018,15 +1018,19 @@ 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) { - measurements.pm01_1 = utils::getInvalidPMS(); - measurements.pm25_1 = utils::getInvalidPMS(); - measurements.pm10_1 = utils::getInvalidPMS(); - measurements.pm03PCount_1 = utils::getInvalidPMS(); + ag->pms5003.updateFailCount(); + 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::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); + } + + if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) { + restart = true; } } } else { @@ -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 times\r\n", ag->pms5003t_1.getFailCount()); + + if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { + measurements.pm01_1 = utils::getInvalidPmValue(); + measurements.pm25_1 = utils::getInvalidPmValue(); + measurements.pm10_1 = utils::getInvalidPmValue(); + measurements.pm03PCount_1 = utils::getInvalidPmValue(); + measurements.temp_1 = utils::getInvalidTemperature(); + measurements.hum_1 = utils::getInvalidHumidity(); + } + + if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) { + restart = true; + } + } } if (configuration.hasSensorPMS2 && (ag->pms5003t_2.isFailed() == false)) { @@ -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 times\r\n", ag->pms5003t_2.getFailCount()); + + if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) { + measurements.pm01_2 = utils::getInvalidPmValue(); + measurements.pm25_2 = utils::getInvalidPmValue(); + measurements.pm10_2 = utils::getInvalidPmValue(); + measurements.pm03PCount_2 = utils::getInvalidPmValue(); + measurements.temp_2 = utils::getInvalidTemperature(); + measurements.hum_2 = utils::getInvalidHumidity(); + } + + if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) { + restart = true; + } + } } if (configuration.hasSensorPMS1 && configuration.hasSensorPMS2 && @@ -1189,6 +1219,11 @@ static void updatePm(void) { ag->sgp41.setCompensationTemperatureHumidity(temp, hum); } } + + if (restart) { + Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax()); + ESP.restart(); + } } static void sendDataToServer(void) { 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/AgValue.cpp b/src/AgValue.cpp index 05615bd..3628fbd 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_pmFirmware "firmware" + +/** + * @brief Get PMS5003 firmware version string + * + * @param fwCode + * @return String + */ +String Measurements::pms5003FirmwareVersion(int fwCode) { + return pms5003FirmwareVersionBase("PMS5003x", fwCode); +} + +/** + * @brief Get PMS5003T firmware version string + * + * @param fwCode + * @return String + */ +String Measurements::pms5003TFirmwareVersion(int fwCode) { + return pms5003FirmwareVersionBase("PMS5003x", fwCode); +} + +/** + * @brief Get firmware version string + * + * @param prefix Prefix firmware string + * @param fwCode Version code + * @return string + */ +String Measurements::pms5003FirmwareVersionBase(String prefix, int fwCode) { + return prefix + String("-") + String(fwCode); +} + String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, void *_ag, void *_config) { AirGradient *ag = (AirGradient *)_ag; @@ -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_pmFirmware] = + this->pms5003FirmwareVersion(ag->pms5003.getFirmwareVersion()); + } } if (config->hasSensorSHT) { @@ -134,6 +172,10 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->temp_1); + if (!localServer) { + root[json_prop_pmFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); + } } if (config->hasSensorPMS2) { if(utils::isValidPMS(this->pm01_2)) { @@ -171,6 +213,10 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["pm02Compensated"] = ag->pms5003t_2.compensate(this->pm25_2, this->temp_2); + if(!localServer) { + root[json_prop_pmFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); + } } } else { if (fwMode == FW_MODE_O_1P) { @@ -208,6 +254,10 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->temp_1); + if(!localServer) { + root[json_prop_pmFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); + } } else if (config->hasSensorPMS2) { if(utils::isValidPMS(this->pm01_2)) { root["pm01"] = this->pm01_2; @@ -242,6 +292,10 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->temp_1); + if(!localServer) { + root[json_prop_pmFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_2.getFirmwareVersion()); + } } } else { float val; @@ -279,6 +333,12 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["channels"]["1"]["pm02Compensated"] = ag->pms5003t_1.compensate(this->pm25_1, this->temp_1); + + // PMS5003T version + if(!localServer) { + root["channels"]["1"][json_prop_pmFirmware] = + pms5003TFirmwareVersion(ag->pms5003t_1.getFirmwareVersion()); + } } if (config->hasSensorPMS2) { float val; @@ -315,6 +375,11 @@ String Measurements::toString(bool localServer, AgFirmwareMode fwMode, int rssi, } } root["channels"]["2"]["pm02Compensated"] = ag->pms5003t_2.compensate(this->pm25_2, this->temp_2); + // PMS5003T version + if(!localServer) { + root["channels"]["2"][json_prop_pmFirmware] = + 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/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 0fb7551..014e577 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,27 @@ void PMSBase::handle() { */ bool PMSBase::isFailed(void) { return failed; } +/** + * @brief Increate number of fail + * + */ +void PMSBase::updateFailCount(void) { + if (failCount < failCountMax) { + failCount++; + } +} + +void PMSBase::resetFailCount(void) { failCount = 0; } + +/** + * @brief Get number of fail + * + * @return int + */ +int PMSBase::getFailCount(void) { return failCount; } + +int PMSBase::getFailCountMax(void) { return failCountMax; } + /** * @brief Read PMS 0.1 ug/m3 with CF = 1 PM estimates * @@ -245,6 +267,20 @@ int16_t PMSBase::getTemp(void) { return toI16(&package[24]); } */ uint16_t PMSBase::getHum(void) { return toU16(&package[26]); } +/** + * @brief Get firmware version code + * + * @return uint8_t + */ +uint8_t PMSBase::getFirmwareVersion(void) { return package[28]; } + +/** + * @brief Ge PMS5003 error code + * + * @return uint8_t + */ +uint8_t PMSBase::getErrorCode(void) { return package[29]; } + /** * @brief Convert PMS2.5 to US AQI unit * diff --git a/src/PMS/PMS.h b/src/PMS/PMS.h index 1d6c9a2..e79480e 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); @@ -26,6 +32,8 @@ public: /** For PMS5003T*/ int16_t getTemp(void); uint16_t getHum(void); + uint8_t getFirmwareVersion(void); + uint8_t getErrorCode(void); int pm25ToAQI(int pm02); int compensate(int pm25, float humidity); @@ -36,6 +44,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 46a6b8b..4734659 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; } @@ -132,6 +132,20 @@ int PMS5003::compensate(int pm25, float humidity) { return pms.compensate(pm25, humidity); } +/** + * @brief Get sensor firmware version + * + * @return int + */ +int PMS5003::getFirmwareVersion(void) { return _ver; } + +/** + * @brief Get sensor error code + * + * @return uint8_t + */ +uint8_t PMS5003::getErrorCode(void) { return pms.getErrorCode(); } + /** * @brief Check device initialized or not * @@ -175,3 +189,25 @@ void PMS5003::handle(void) { pms.handle(); } * @return false Communication timeout or sensor has removed */ bool PMS5003::isFailed(void) { return pms.isFailed(); } + +void PMS5003::updateFailCount(void) { + pms.updateFailCount(); +} + +void PMS5003::resetFailCount(void) { + pms.resetFailCount(); +} + +/** + * @brief Get number of fail count + * + * @return int + */ +int PMS5003::getFailCount(void) { return pms.getFailCount(); } + +/** + * @brief Get number of fail count max + * + * @return int + */ +int PMS5003::getFailCountMax(void) { return pms.getFailCountMax(); } diff --git a/src/PMS/PMS5003.h b/src/PMS/PMS5003.h index c99f4d8..88fda3b 100644 --- a/src/PMS/PMS5003.h +++ b/src/PMS/PMS5003.h @@ -19,15 +19,22 @@ public: void end(void); void handle(void); bool isFailed(void); + void updateFailCount(void); + void resetFailCount(void); + int getFailCount(void); + int getFailCountMax(void); int getPm01Ae(void); int getPm25Ae(void); int getPm10Ae(void); int getPm03ParticleCount(void); int convertPm25ToUsAqi(int pm25); int compensate(int pm25, float humidity); + int getFirmwareVersion(void); + uint8_t getErrorCode(void); private: bool _isBegin = false; + int _ver; BoardType _boardDef; PMSBase pms; const BoardDef *bsp; diff --git a/src/PMS/PMS5003T.cpp b/src/PMS/PMS5003T.cpp index 12b3c29..f659098 100644 --- a/src/PMS/PMS5003T.cpp +++ b/src/PMS/PMS5003T.cpp @@ -103,7 +103,7 @@ bool PMS5003T::begin(void) { return false; } #endif - + _ver = pms.getFirmwareVersion(); this->_isBegin = true; return true; } @@ -175,6 +175,20 @@ int PMS5003T::compensate(int pm25, float humidity) { return pms.compensate(pm25, humidity); } +/** + * @brief Get module(s) firmware version + * + * @return int Version code + */ +int PMS5003T::getFirmwareVersion(void) { return _ver; } + +/** + * @brief Get sensor error code + * + * @return uint8_t + */ +uint8_t PMS5003T::getErrorCode(void) { return pms.getErrorCode(); } + /** * @brief Check device initialized or not * @@ -216,3 +230,24 @@ void PMS5003T::handle(void) { pms.handle(); } */ bool PMS5003T::isFailed(void) { return pms.isFailed(); } +void PMS5003T::updateFailCount(void) { + pms.updateFailCount(); +} + +void PMS5003T::resetFailCount(void) { + pms.resetFailCount(); +} + +/** + * @brief Get fail count + * + * @return int + */ +int PMS5003T::getFailCount(void) { return pms.getFailCount(); } + +/** + * @brief Get fail count max + * + * @return int + */ +int PMS5003T::getFailCountMax(void) { return pms.getFailCountMax(); } diff --git a/src/PMS/PMS5003T.h b/src/PMS/PMS5003T.h index 057144a..a35a605 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); @@ -30,10 +34,13 @@ public: float getTemperature(void); float getRelativeHumidity(void); int compensate(int pm25, float humidity); + int getFirmwareVersion(void); + uint8_t getErrorCode(void); private: bool _isBegin = false; bool _isSleep = false; + int _ver; /** Firmware version code */ BoardType _boardDef; const BoardDef *bsp;