Commit ea4f090d authored by Eric Duminil's avatar Eric Duminil
Browse files

co2_sensor: 'instability', but 'unstable'

parent f0ade083
...@@ -41,7 +41,7 @@ namespace sensor { ...@@ -41,7 +41,7 @@ namespace sensor {
BOOTUP, BOOTUP,
READY, READY,
NEEDS_CALIBRATION, NEEDS_CALIBRATION,
PREPARE_CALIBRATION_INSTABLE, PREPARE_CALIBRATION_UNSTABLE,
PREPARE_CALIBRATION_STABLE, PREPARE_CALIBRATION_STABLE,
CALIBRATION CALIBRATION
}; };
...@@ -50,7 +50,7 @@ namespace sensor { ...@@ -50,7 +50,7 @@ namespace sensor {
"BOOTUP", "BOOTUP",
"READY", "READY",
"NEEDS_CALIBRATION", "NEEDS_CALIBRATION",
"PREPARE_CALIBRATION_INSTABLE", "PREPARE_CALIBRATION_UNSTABLE",
"PREPARE_CALIBRATION_STABLE", "PREPARE_CALIBRATION_STABLE",
"CALIBRATION" }; "CALIBRATION" };
state current_state = INITIAL; state current_state = INITIAL;
...@@ -133,7 +133,7 @@ namespace sensor { ...@@ -133,7 +133,7 @@ namespace sensor {
switchState(PREPARE_CALIBRATION_STABLE); switchState(PREPARE_CALIBRATION_STABLE);
} else { } else {
stable_measurements = 0; stable_measurements = 0;
switchState(PREPARE_CALIBRATION_INSTABLE); switchState(PREPARE_CALIBRATION_UNSTABLE);
} }
previous_co2 = co2; previous_co2 = co2;
return (stable_measurements == config::enough_stable_measurements); return (stable_measurements == config::enough_stable_measurements);
...@@ -148,7 +148,7 @@ namespace sensor { ...@@ -148,7 +148,7 @@ namespace sensor {
scd30.setMeasurementInterval(2); // [s] The change will only take effect after next measurement. scd30.setMeasurementInterval(2); // [s] The change will only take effect after next measurement.
Serial.println(F("Waiting until the measurements are stable for at least 2 minutes.")); Serial.println(F("Waiting until the measurements are stable for at least 2 minutes."));
Serial.println(F("It could take a very long time.")); Serial.println(F("It could take a very long time."));
switchState(PREPARE_CALIBRATION_INSTABLE); switchState(PREPARE_CALIBRATION_UNSTABLE);
} }
void calibrateAndRestart() { void calibrateAndRestart() {
...@@ -210,7 +210,7 @@ namespace sensor { ...@@ -210,7 +210,7 @@ namespace sensor {
case NEEDS_CALIBRATION: case NEEDS_CALIBRATION:
led_effects::showWaitingLED(color::magenta); led_effects::showWaitingLED(color::magenta);
break; break;
case PREPARE_CALIBRATION_INSTABLE: case PREPARE_CALIBRATION_UNSTABLE:
led_effects::showWaitingLED(color::red); led_effects::showWaitingLED(color::red);
break; break;
case PREPARE_CALIBRATION_STABLE: case PREPARE_CALIBRATION_STABLE:
...@@ -243,7 +243,7 @@ namespace sensor { ...@@ -243,7 +243,7 @@ namespace sensor {
// zero ppm but non-zero temperature and non-zero humidity. // zero ppm but non-zero temperature and non-zero humidity.
Serial.println(F("Invalid sensor data - CO2 concentration <= 0 ppm")); Serial.println(F("Invalid sensor data - CO2 concentration <= 0 ppm"));
switchState(BOOTUP); switchState(BOOTUP);
} else if ((current_state == PREPARE_CALIBRATION_INSTABLE) || (current_state == PREPARE_CALIBRATION_STABLE)) { } else if ((current_state == PREPARE_CALIBRATION_UNSTABLE) || (current_state == PREPARE_CALIBRATION_STABLE)) {
// Check for pre-calibration states first, because we do not want to // Check for pre-calibration states first, because we do not want to
// leave them before calibration is done. // leave them before calibration is done.
bool ready_for_calibration = countStableMeasurements(); bool ready_for_calibration = countStableMeasurements();
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment