function 3 in 1

solarpump/temperature.ino

@@ -39,6 +39,48 @@ UPDATESTATE t1up(float* temp) {
   return SUCCESS;
 }
 
+struct temperatureSensor
+{
+    float tempValue;
+    uint32_t prevTime;
+    uint32_t currentTime;
+    uint32_t errorTime;
+    DHT sensorClass;
+};
+
+temperatureSensor t1down{ 0.0, 0,0 ,0, DHT(T1DOWN, DHT11) };
+temperatureSensor t2up{ 0.0, 0,0 ,0, DHT(T2UP, DHT11) };
+temperatureSensor t2down{ 0.0, 0,0 ,0, DHT(T2DOWN, DHT11) };
+
+UPDATESTATE temperatureSensor(temperatureSensor& sensor)
+{
+    sensor.currentTime = millis();
+    if (sensor.currentTime - sensor.prevTime < TEMPUPDATETIME)
+    {
+        return UNCHANGED;
+    }
+    float tmpTemperature = sensor.sensorClass.readTemperature();
+    if (isnan(tmpTemperature))
+    {
+        if(sensor.errorTime)
+        {
+            if (sensor.currentTime - sensor.errorTime > ERRORTIME)
+            {
+                return LONG_TIME_ERROR;
+            }
+        }
+        else
+        {
+            return ERROR;
+        }
+    }
+
+    sensor.tempValue = tmpTemperature;
+    sensor.errorTime = 0;
+    sensor.prevTime = sensor.currentTime;
+    return SUCCESS;
+}
+
 // DOWN temperature for solar system 1
 static DHT dhtT1down(T1DOWN, DHT11);
 UPDATESTATE t1down(float* temp) {
@@ -127,4 +169,3 @@ void temperatureBegin(void) {
   dhtT2up.begin();
   dhtT2down.begin();
 }
\ No newline at end of file
-