only send co2 sensor values if the sensor is ready; move intervals to config

Author: coding-lemur

src/config.h

@@ -1,6 +1,8 @@
 #define SCREEN_WIDTH 128 // OLED display width, in pixels
 #define SCREEN_HEIGHT 64 // OLED display height, in pixels
 
+#define READ_SENSOR_INTERVAL 60000 // in ms
+#define MQTT_UPDATE_INTERVAL 45000 // in ms
 #define PASSWORD "waaatering"
 
 int CO2_WARN_PPM = 1200;

src/main.cpp

@@ -149,8 +149,12 @@ void sendInfo()
     JsonObject co2Meter = doc.createNestedObject("co2");
     co2Meter["isPreheating"] = isPreheating;
     co2Meter["isReady"] = isCo2SensorReady;
-    co2Meter["temperature"] = lastTemperature;
-    co2Meter["ppm"] = lastCo2Value;
+
+    if (isCo2SensorReady)
+    {
+        co2Meter["temperature"] = lastTemperature;
+        co2Meter["ppm"] = lastCo2Value;
+    }
 
     String JS;
     serializeJson(doc, JS);
@@ -511,7 +515,7 @@ void loop()
         {
             appState = 2;
 
-            if (lastCo2Measurement == 0 || millis() - lastCo2Measurement >= 60000) // every minute
+            if (lastCo2Measurement == 0 || millis() - lastCo2Measurement >= READ_SENSOR_INTERVAL)
             {
                 lastTemperature = co2Sensor.getLastTemperature();
                 lastCo2Value = co2Sensor.readCO2UART();
@@ -546,7 +550,7 @@ void loop()
 
         if (isWifiConnected && isMqttConnected)
         {
-            if (lastInfoSend == 0 || millis() - lastInfoSend >= 45000) // every 45 seconds
+            if (lastInfoSend == 0 || millis() - lastInfoSend >= MQTT_UPDATE_INTERVAL)
             {
                 sendInfo(); // TODO move to async timer
             }