Merge branch 'develop' into feature/root-api

This commit is contained in:
Phat Nguyen
2024-08-20 09:22:36 +07:00
committed by GitHub
26 changed files with 729 additions and 294 deletions

View File

@ -236,7 +236,7 @@ void loop() {
static void co2Update(void) {
int value = ag.s8.getCo2();
if (value >= 0) {
if (utils::isValidCO2(value)) {
measurements.CO2 = value;
getCO2FailCount = 0;
Serial.printf("CO2 (ppm): %d\r\n", measurements.CO2);
@ -244,7 +244,7 @@ static void co2Update(void) {
getCO2FailCount++;
Serial.printf("Get CO2 failed: %d\r\n", getCO2FailCount);
if (getCO2FailCount >= 3) {
measurements.CO2 = -1;
measurements.CO2 = utils::getInvalidCO2();
}
}
}
@ -519,10 +519,10 @@ static void updatePm(void) {
pmFailCount++;
Serial.printf("PMS read failed: %d\r\n", pmFailCount);
if (pmFailCount >= 3) {
measurements.pm01_1 = -1;
measurements.pm25_1 = -1;
measurements.pm10_1 = -1;
measurements.pm03PCount_1 = -1;
measurements.pm01_1 = utils::getInvalidPMS();
measurements.pm25_1 = utils::getInvalidPMS();
measurements.pm10_1 = utils::getInvalidPMS();
measurements.pm03PCount_1 = utils::getInvalidPMS();
}
}
}
@ -567,5 +567,7 @@ static void tempHumUpdate(void) {
}
} else {
Serial.println("SHT read failed");
measurements.Temperature = utils::getInvalidTemperature();
measurements.Humidity = utils::getInvalidHumidity();
}
}