From c6139baf6af2d3bd36af65a2f6f30edebe88cd7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4ppler?= <michael_kaeppler@web.de>
Date: Thu, 29 Apr 2021 14:00:44 +0200
Subject: [PATCH] co2_sensor: Drop unused state 'CALIBRATION'
---
ampel-firmware/co2_sensor.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/ampel-firmware/co2_sensor.cpp b/ampel-firmware/co2_sensor.cpp
index 8756ca0..efeec4e 100644
--- a/ampel-firmware/co2_sensor.cpp
+++ b/ampel-firmware/co2_sensor.cpp
@@ -36,7 +36,6 @@ namespace sensor {
* INVALID -> sensor does output invalid CO2 measurements (== 0 ppm)
* NEEDS_CALIBRATION -> sensor measurements are too low (< 250 ppm)
* PREPARE_CALIBRATION -> forced calibration was initiated, waiting for stable measurements
- * CALIBRATION -> the sensor does calibrate itself
*/
enum state {
INITIAL,
@@ -45,8 +44,7 @@ namespace sensor {
INVALID,
NEEDS_CALIBRATION,
PREPARE_CALIBRATION_UNSTABLE,
- PREPARE_CALIBRATION_STABLE,
- CALIBRATION
+ PREPARE_CALIBRATION_STABLE
};
const char *state_names[] = {
"INITIAL",
@@ -55,8 +53,7 @@ namespace sensor {
"INVALID",
"NEEDS_CALIBRATION",
"PREPARE_CALIBRATION_UNSTABLE",
- "PREPARE_CALIBRATION_STABLE",
- "CALIBRATION" };
+ "PREPARE_CALIBRATION_STABLE" };
state current_state = INITIAL;
void switchState(state);
@@ -172,7 +169,6 @@ namespace sensor {
}
void calibrateAndRestart() {
- switchState(CALIBRATION);
Serial.print(F("Calibrating SCD30 now..."));
scd30.setAltitudeCompensation(config::altitude_above_sea_level);
scd30.setForcedRecalibrationFactor(config::co2_calibration_level);
@@ -269,8 +265,6 @@ namespace sensor {
case PREPARE_CALIBRATION_STABLE:
led_effects::showWaitingLED(color::green);
break;
- case CALIBRATION: // Nothing to do, will restart soon.
- break;
default:
Serial.println(F("Encountered unknown sensor state")); // This should not happen.
}
--
GitLab