airgradienthq/arduino
1
0
Fork 1
mirror of https://github.com/airgradienthq/arduino.git synced 2025-07-04 03:36:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

resolve review #222

Browse Source
This commit is contained in:
Phat Nguyen
2024-08-26 14:14:42 +07:00
parent e461b92c9f
commit 104d58a8c0
13 changed files with 58 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/BASIC/BASIC.ino
View File

@ -516,16 +516,16 @@ static void updatePm(void) {
ag.pms5003.resetFailCount(); ag.pms5003.resetFailCount();
} else { } else {
ag.pms5003.updateFailCount(); 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) { if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm01_1 = utils::getInvalidPmValue();
measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPmValue();
measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPmValue();
measurements.pm03PCount_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPmValue();
} }
if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { 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(); ESP.restart();
} }
} }

8
examples/BASIC/OpenMetrics.cpp
View File

@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
float _temp = utils::getInvalidTemperature(); float _temp = utils::getInvalidTemperature();
float _hum = utils::getInvalidHumidity(); float _hum = utils::getInvalidHumidity();
int pm01 = utils::getInvalidPMS(); int pm01 = utils::getInvalidPmValue();
int pm25 = utils::getInvalidPMS(); int pm25 = utils::getInvalidPmValue();
int pm10 = utils::getInvalidPMS(); int pm10 = utils::getInvalidPmValue();
int pm03PCount = utils::getInvalidPMS(); int pm03PCount = utils::getInvalidPmValue();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int ahumCompensated = utils::getInvalidHumidity();

12
examples/DiyProIndoorV3_3/DiyProIndoorV3_3.ino
View File

@ -568,16 +568,16 @@ static void updatePm(void) {
ag.pms5003.resetFailCount(); ag.pms5003.resetFailCount();
} else { } else {
ag.pms5003.updateFailCount(); 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) { if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm01_1 = utils::getInvalidPmValue();
measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPmValue();
measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPmValue();
measurements.pm03PCount_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPmValue();
} }
if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { 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(); ESP.restart();
} }
} }

8
examples/DiyProIndoorV3_3/OpenMetrics.cpp
View File

@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
float _temp = utils::getInvalidTemperature(); float _temp = utils::getInvalidTemperature();
float _hum = utils::getInvalidHumidity(); float _hum = utils::getInvalidHumidity();
int pm01 = utils::getInvalidPMS(); int pm01 = utils::getInvalidPmValue();
int pm25 = utils::getInvalidPMS(); int pm25 = utils::getInvalidPmValue();
int pm10 = utils::getInvalidPMS(); int pm10 = utils::getInvalidPmValue();
int pm03PCount = utils::getInvalidPMS(); int pm03PCount = utils::getInvalidPmValue();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int ahumCompensated = utils::getInvalidHumidity();

12
examples/DiyProIndoorV4_2/DiyProIndoorV4_2.ino
View File

@ -611,16 +611,16 @@ static void updatePm(void) {
ag.pms5003.resetFailCount(); ag.pms5003.resetFailCount();
} else { } else {
ag.pms5003.updateFailCount(); 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) { if (ag.pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm01_1 = utils::getInvalidPmValue();
measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPmValue();
measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPmValue();
measurements.pm03PCount_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPmValue();
} }
if(ag.pms5003.getFailCount() >= ag.pms5003.getFailCountMax()) { 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(); ESP.restart();
} }
} }

8
examples/DiyProIndoorV4_2/OpenMetrics.cpp
View File

@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
float _temp = utils::getInvalidTemperature(); float _temp = utils::getInvalidTemperature();
float _hum = utils::getInvalidHumidity(); float _hum = utils::getInvalidHumidity();
int pm01 = utils::getInvalidPMS(); int pm01 = utils::getInvalidPmValue();
int pm25 = utils::getInvalidPMS(); int pm25 = utils::getInvalidPmValue();
int pm10 = utils::getInvalidPMS(); int pm10 = utils::getInvalidPmValue();
int pm03PCount = utils::getInvalidPMS(); int pm03PCount = utils::getInvalidPmValue();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int ahumCompensated = utils::getInvalidHumidity();

42
examples/OneOpenAir/OneOpenAir.ino
View File

@ -1005,7 +1005,7 @@ static void updateTvoc(void) {
} }
static void updatePm(void) { static void updatePm(void) {
bool failToRestart = false; bool restart = false;
if (ag->isOne()) { if (ag->isOne()) {
if (ag->pms5003.isFailed() == false) { if (ag->pms5003.isFailed() == false) {
measurements.pm01_1 = ag->pms5003.getPm01Ae(); measurements.pm01_1 = ag->pms5003.getPm01Ae();
@ -1021,16 +1021,16 @@ static void updatePm(void) {
ag->pms5003.resetFailCount(); ag->pms5003.resetFailCount();
} else { } else {
ag->pms5003.updateFailCount(); 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) { if (ag->pms5003.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm01_1 = utils::getInvalidPmValue();
measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPmValue();
measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPmValue();
measurements.pm03PCount_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPmValue();
} }
if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) { if (ag->pms5003.getFailCount() >= ag->pms5003.getFailCountMax()) {
failToRestart = true; restart = true;
} }
} }
} else { } else {
@ -1062,19 +1062,19 @@ static void updatePm(void) {
} else { } else {
if (configuration.hasSensorPMS1) { if (configuration.hasSensorPMS1) {
ag->pms5003t_1.updateFailCount(); 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) { if (ag->pms5003t_1.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_1 = utils::getInvalidPMS(); measurements.pm01_1 = utils::getInvalidPmValue();
measurements.pm25_1 = utils::getInvalidPMS(); measurements.pm25_1 = utils::getInvalidPmValue();
measurements.pm10_1 = utils::getInvalidPMS(); measurements.pm10_1 = utils::getInvalidPmValue();
measurements.pm03PCount_1 = utils::getInvalidPMS(); measurements.pm03PCount_1 = utils::getInvalidPmValue();
measurements.temp_1 = utils::getInvalidTemperature(); measurements.temp_1 = utils::getInvalidTemperature();
measurements.hum_1 = utils::getInvalidHumidity(); measurements.hum_1 = utils::getInvalidHumidity();
} }
if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) { if (ag->pms5003t_1.getFailCount() >= ag->pms5003t_1.getFailCountMax()) {
failToRestart = true; restart = true;
} }
} }
} }
@ -1105,19 +1105,19 @@ static void updatePm(void) {
} else { } else {
if (configuration.hasSensorPMS2) { if (configuration.hasSensorPMS2) {
ag->pms5003t_2.updateFailCount(); 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) { if (ag->pms5003t_2.getFailCount() >= PMS_FAIL_COUNT_SET_INVALID) {
measurements.pm01_2 = utils::getInvalidPMS(); measurements.pm01_2 = utils::getInvalidPmValue();
measurements.pm25_2 = utils::getInvalidPMS(); measurements.pm25_2 = utils::getInvalidPmValue();
measurements.pm10_2 = utils::getInvalidPMS(); measurements.pm10_2 = utils::getInvalidPmValue();
measurements.pm03PCount_2 = utils::getInvalidPMS(); measurements.pm03PCount_2 = utils::getInvalidPmValue();
measurements.temp_2 = utils::getInvalidTemperature(); measurements.temp_2 = utils::getInvalidTemperature();
measurements.hum_2 = utils::getInvalidHumidity(); measurements.hum_2 = utils::getInvalidHumidity();
} }
if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) { if (ag->pms5003t_2.getFailCount() >= ag->pms5003t_2.getFailCountMax()) {
failToRestart = true; restart = true;
} }
} }
} }
@ -1220,8 +1220,8 @@ static void updatePm(void) {
} }
} }
if (failToRestart) { if (restart) {
Serial.printf("Restarting..."); Serial.printf("PMS failure count reach to max set %d, restarting...", ag->pms5003.getFailCountMax());
ESP.restart(); ESP.restart();
} }
} }

8
examples/OneOpenAir/OpenMetrics.cpp
View File

@ -67,10 +67,10 @@ String OpenMetrics::getPayload(void) {
float _temp = utils::getInvalidTemperature(); float _temp = utils::getInvalidTemperature();
float _hum = utils::getInvalidHumidity(); float _hum = utils::getInvalidHumidity();
int pm01 = utils::getInvalidPMS(); int pm01 = utils::getInvalidPmValue();
int pm25 = utils::getInvalidPMS(); int pm25 = utils::getInvalidPmValue();
int pm10 = utils::getInvalidPMS(); int pm10 = utils::getInvalidPmValue();
int pm03PCount = utils::getInvalidPMS(); int pm03PCount = utils::getInvalidPmValue();
int atmpCompensated = utils::getInvalidTemperature(); int atmpCompensated = utils::getInvalidTemperature();
int ahumCompensated = utils::getInvalidHumidity(); int ahumCompensated = utils::getInvalidHumidity();
if (config.hasSensorPMS1 && config.hasSensorPMS2) { if (config.hasSensorPMS1 && config.hasSensorPMS2) {

2
src/Main/utils.cpp
View File

@ -82,7 +82,7 @@ float utils::getInvalidHumidity(void) { return INVALID_HUMIDITY; }
int utils::getInvalidCO2(void) { return INVALID_CO2; } 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; } int utils::getInvalidNOx(void) { return INVALID_NOX; }

2
src/Main/utils.h
View File

@ -21,7 +21,7 @@ public:
static float getInvalidTemperature(void); static float getInvalidTemperature(void);
static float getInvalidHumidity(void); static float getInvalidHumidity(void);
static int getInvalidCO2(void); static int getInvalidCO2(void);
static int getInvalidPMS(void); static int getInvalidPmValue(void);
static int getInvalidNOx(void); static int getInvalidNOx(void);
static int getInvalidVOC(void); static int getInvalidVOC(void);
}; };

11
src/PMS/PMS.cpp
View File

@ -158,11 +158,7 @@ void PMSBase::updateFailCount(void) {
} }
} }
/** void PMSBase::resetFailCount(void) { failCount = 0; }
* @brief Reset number of fail
*
*/
void PMSBase::resetFailCount(void) {failCount = 0;}
/** /**
* @brief Get number of fail * @brief Get number of fail
@ -171,11 +167,6 @@ void PMSBase::resetFailCount(void) {failCount = 0;}
*/ */
int PMSBase::getFailCount(void) { return failCount; } int PMSBase::getFailCount(void) { return failCount; }
/**
* @brief Get maximum of fail count max
*
* @return int
*/
int PMSBase::getFailCountMax(void) { return failCountMax; } int PMSBase::getFailCountMax(void) { return failCountMax; }
/** /**

8
src/PMS/PMS5003.cpp
View File

@ -176,18 +176,10 @@ void PMS5003::handle(void) { pms.handle(); }
*/ */
bool PMS5003::isFailed(void) { return pms.isFailed(); } bool PMS5003::isFailed(void) { return pms.isFailed(); }
/**
* @brief Increate number of fail
*
*/
void PMS5003::updateFailCount(void) { void PMS5003::updateFailCount(void) {
pms.updateFailCount(); pms.updateFailCount();
} }
/**
* @brief Reset fail count
*
*/
void PMS5003::resetFailCount(void) { void PMS5003::resetFailCount(void) {
pms.resetFailCount(); pms.resetFailCount();
} }

8
src/PMS/PMS5003T.cpp
View File

@ -216,18 +216,10 @@ void PMS5003T::handle(void) { pms.handle(); }
*/ */
bool PMS5003T::isFailed(void) { return pms.isFailed(); } bool PMS5003T::isFailed(void) { return pms.isFailed(); }
/**
* @brief Increate number of fail
*
*/
void PMS5003T::updateFailCount(void) { void PMS5003T::updateFailCount(void) {
pms.updateFailCount(); pms.updateFailCount();
} }
/**
* @brief Reset fail count
*
*/
void PMS5003T::resetFailCount(void) { void PMS5003T::resetFailCount(void) {
pms.resetFailCount(); pms.resetFailCount();
} }