Diff: measurement/Potentiometer.cpp

Revision:

115:c54e9731b9de

Parent:

114:80610be056e2

Child:

117:5de54f09f754

--- a/measurement/Potentiometer.cpp	Fri May 15 14:23:31 2015 +0000
+++ b/measurement/Potentiometer.cpp	Fri May 15 15:09:19 2015 +0000
@@ -12,36 +12,48 @@
 AnalogIn analog1(A0);
 AnalogIn analog2(A1);
 
+static inline bool valueChanged(float *V0, float *V1)
+{
+        if (abs(V0[0]-V1[0]) <= abs(V0[0])*THRESHOLD_PERCENT_ANA &&
+            abs(V0[1]-V1[1]) <= abs(V0[1])*THRESHOLD_PERCENT_ANA)
+                return false;
+        else
+                return true;
+}
+
 size_t Potentiometer::read(char *buf, size_t maxLen, char *status, size_t num)
 {
         static const char *fmt = "107,%ld,%f,%f\r\n";
-        const unsigned short N = 10;
-        float data[2] = {0, 0};
-        float min[2] = {100, 100};
-        float max[2] = {0, 0};
-        // multiple sampling for data smoothing
-        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(5);
-        }
-        data[0] = (data[0]-min[0]-max[0]) / (N-2);
-        data[1] = (data[1]-min[1]-max[1]) / (N-2);
-
-        if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ANA &&
-            abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ANA) {
+        float data[2] = {(float)analog1*100, (float)analog2*100};
+        if (!valueChanged(oldValues, data)) {
                 time_t t_interval = time(NULL) - t_start;
                 if (t_interval < TIME_LIMIT_ANA) {
                         return 0;
                 } 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]);