Diff: measurement/Potentiometer.cpp

Revision:

117:5de54f09f754

Parent:

115:c54e9731b9de

Child:

118:e831cdb799ab

--- a/measurement/Potentiometer.cpp	Mon May 18 09:29:12 2015 +0000
+++ b/measurement/Potentiometer.cpp	Wed May 20 09:55:49 2015 +0000
@@ -24,7 +24,25 @@
 size_t Potentiometer::read(char *buf, size_t maxLen, char *status, size_t num)
 {
         static const char *fmt = "107,%ld,%f,%f\r\n";
-        float data[2] = {(float)analog1*100, (float)analog2*100};
+        float data[2] = {0, 0};
+        float min[2] = {100, 100};
+        float max[2] = {0, 0};
+        // multiple sampling for data smoothing
+        const unsigned short N = 10;
+        for (unsigned short i = 0; i < N; ++i) {
+                float d0 = (float)analog1*100;
+                float d1 = (float)analog2*100;
+                data[0] += d0;
+                data[1] += d1;
+                min[0] = min[0] <= d0 ? min[0] : d0;
+                min[1] = min[1] <= d1 ? min[1] : d1;
+                max[0] = max[0] >= d0 ? max[0] : d0;
+                max[1] = max[1] >= d1 ? max[1] : d1;
+                Thread::wait(10);
+        }
+        data[0] = (data[0]-min[0]-max[0]) / (N-2);
+        data[1] = (data[1]-min[1]-max[1]) / (N-2);
+
         if (!valueChanged(oldValues, data)) {
                 time_t t_interval = time(NULL) - t_start;
                 if (t_interval < TIME_LIMIT_ANA) {
@@ -32,28 +50,6 @@
                 } else {
                         aDebug("Poti: Timeout at %d s.\n", t_interval);
                 }
-        } else {
-                float min[2] = {100, 100};
-                float max[2] = {0, 0};
-                data[0] = 0;
-                data[1] = 0;
-                // multiple sampling for data smoothing
-                const unsigned short N = 10;
-                for (unsigned short i = 0; i < N; ++i) {
-                        float d0 = (float)analog1*100;
-                        float d1 = (float)analog2*100;
-                        data[0] += d0;
-                        data[1] += d1;
-                        min[0] = min[0] <= d0 ? min[0] : d0;
-                        min[1] = min[1] <= d1 ? min[1] : d1;
-                        max[0] = max[0] >= d0 ? max[0] : d0;
-                        max[1] = max[1] >= d1 ? max[1] : d1;
-                        Thread::wait(10);
-                }
-                data[0] = (data[0]-min[0]-max[0]) / (N-2);
-                data[1] = (data[1]-min[1]-max[1]) / (N-2);
-                if (!valueChanged(oldValues, data))
-                        return 0;
         }
 
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data[0], data[1]);