Small refactor

ampel-firmware.ino

@@ -121,16 +121,7 @@ void loop() {
   /**
    * GET DATA
    */
-  bool freshData = sensor::scd30.dataAvailable(); // Alternative : close to time-step AND dataAvailable, to avoid asking the sensor too often.
-
-  if (freshData) {
-    //TODO: Move to co2_sensor.cpp
-    //TODO: Save count of stable measurements
-    //TODO: Compare time to previous measurements, check that it's not too far away from config::measurement_interval
-    sensor::co2 = sensor::scd30.getCO2();
-    sensor::temperature = sensor::scd30.getTemperature();
-    sensor::humidity = sensor::scd30.getHumidity();
-  }
+  bool freshData = sensor::updateDataIfAvailable();
 
   //NOTE: Data is available, but it's sometimes erroneous: the sensor outputs zero ppm but non-zero temperature and non-zero humidity.
   if (sensor::co2 <= 0) {

co2_sensor.cpp

@@ -66,6 +66,18 @@ namespace sensor {
     Serial.println(config::auto_calibrate_sensor ? "ON." : "OFF.");
   }
 
+  bool updateDataIfAvailable() {
+    //TODO: Save count of stable measurements
+    //TODO: Compare time to previous measurements, check that it's not too far away from config::measurement_interval
+    if (scd30.dataAvailable()) {
+      co2 = scd30.getCO2();
+      temperature = scd30.getTemperature();
+      humidity = scd30.getHumidity();
+      return true;
+    }
+    return false;
+  }
+
   void waitUntilMeasurementsAreStable() {
     //TODO: Refactor completely, in order to avoid very long loop?
     /** From the sensor documentation:

co2_sensor.h

@@ -24,6 +24,7 @@ namespace sensor {
   extern String timestamp;
 
   void initialize();
+  bool updateDataIfAvailable();
   void startCalibrationProcess();
 }
 #endif