From 734dca30bc3632e57706b28ecee0e8190079849b Mon Sep 17 00:00:00 2001 From: Sietse Jonker Date: Wed, 28 Feb 2024 12:06:43 +0100 Subject: [PATCH] fixes interval and stuff --- arduino/node-code/node-code-final.ino | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/arduino/node-code/node-code-final.ino b/arduino/node-code/node-code-final.ino index f20a4a0..2dc8896 100644 --- a/arduino/node-code/node-code-final.ino +++ b/arduino/node-code/node-code-final.ino @@ -128,26 +128,26 @@ bool checkForError(){ if (!sgp.IAQmeasure()) { Serial.println("SGP30: BAD"); errorSGP30 = true; - return true; } else { Serial.println("SGP30: OK"); errorSGP30 = false; - return false; } if (isnan(temperature) || isnan(humidity)){ Serial.println("DHT11: BAD"); errorDHT11 = true; - return true; } else { Serial.println("DHT11: OK"); errorDHT11 = false; - return false; } + + return false; } // function to update when interval is met (see intervalCounter variable) void update(){ + // display sensordata on oled screen + displayData(); webSocket.sendTXT("Temp: " + String(temperature)); webSocket.sendTXT("Humi: " + String(humidity)); webSocket.sendTXT("eCO2: " + String(sgp.eCO2)); @@ -158,6 +158,8 @@ void update(){ // read dht11 sensor temperature = float(dht.readTemperature()); humidity = float(dht.readHumidity()); + + checkForError(); } // function to display data on oled screen @@ -200,15 +202,9 @@ void setup() { // loop function void loop() { - // check for errors - checkForError(); - // loop the websocket connection so it stays alive webSocket.loop(); - // display sensordata on oled screen - displayData(); - // update when interval is met if (currentMillis - lastMillis >= interval){ lastMillis = millis();