Diff: measurement/Acceleration.cpp

Revision:

124:311fa85af2b3

Parent:

118:e831cdb799ab

Child:

137:a52821cdb108

--- a/measurement/Acceleration.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Acceleration.cpp	Fri May 29 12:05:01 2015 +0000
@@ -9,6 +9,18 @@
 // Timeout for forcing a sending even if readings are similar [seconds].
 #define TIME_LIMIT_ACCE 900
 
+static inline bool valueChanged(float *V0, float *V1)
+{
+//        if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ACCE ||
+//            abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ACCE ||
+//            abs(oldValues[2]-data[2]) <= abs(oldValues[2])*THRESHOLD_PERCENT_ACCE) {
+        if ((0.15 > abs(V1[0]) || abs(V0[0]-V1[0]) <= abs(V0[0])*THRESHOLD_PERCENT_ACCE) &&
+            (0.10 > abs(V1[1]) || abs(V0[1]-V1[1]) <= abs(V0[1])*THRESHOLD_PERCENT_ACCE))
+                return false;
+        else
+                return true;
+}
+
 size_t Acceleration::read(char *buf, size_t maxLen, char *status, size_t num)
 {
         static const char *fmt = "106,%ld,%f,%f,%f\r\n";
@@ -32,15 +44,9 @@
 //        data[1] = (data[1]-min[1]-max[1]) / (N-2);
 //        data[2] = (data[2]-min[2]-max[2]) / (N-2);
         sensor.readData(data);
-        if ((0.15 > abs(data[0]) || abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ACCE) &&
-            (0.10 > abs(data[1]) || abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ACCE)) {
-//        if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ACCE ||
-//            abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ACCE ||
-//            abs(oldValues[2]-data[2]) <= abs(oldValues[2])*THRESHOLD_PERCENT_ACCE) {
-                time_t t_interval = time(NULL) - t_start;
-                if (t_interval < TIME_LIMIT_ACCE) {
-                        return 0;
-                }
+        float t_interval = timer.read();
+        if (!valueChanged(oldValues, data) && t_interval < TIME_LIMIT_ACCE) {
+                return 0;
         }
 
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data[0], data[1], data[2]);
@@ -51,6 +57,6 @@
         oldValues[0] = data[0];
         oldValues[1] = data[1];
         oldValues[2] = data[2];
-        t_start = time(NULL);
+        timer.reset();
         return l;
 }
\ No newline at end of file