Revision 123:311fa85af2b3, committed 2015-05-29

Comitter:

xinlei

Date:

Fri May 29 12:05:01 2015 +0000

Parent:

122:3e4a1ed4bad5

Child:

124:979ab0d075de

Commit message:

measurement: revert timing to use timer to avoid negative time after long run

Changed in this revision

--- 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

--- a/measurement/Acceleration.h	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Acceleration.h	Fri May 29 12:05:01 2015 +0000
@@ -8,11 +8,11 @@
 class Acceleration: public AbstractReporter
 {
 public:
-        Acceleration(): deviceReady(false), sensor(SDA, SCL) {
+        Acceleration(): deviceReady(false), sensor(SDA, SCL), timer() {
                 oldValues[0] = 0;
                 oldValues[1] = 0;
                 oldValues[2] = 0;
-                t_start = time(NULL);
+                timer.start();
         }
         virtual ~Acceleration() {}
         virtual bool init() {
@@ -25,7 +25,7 @@
         bool deviceReady;
         MMA7660 sensor;
         float oldValues[3];
-        time_t t_start;
+        Timer timer;
 };
 
 #endif /* ACCELERATION_H */
\ No newline at end of file

--- a/measurement/Location.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Location.cpp	Fri May 29 12:05:01 2015 +0000
@@ -8,6 +8,16 @@
 // Timeout for forcing a sending even if readings are similar [seconds].
 #define TIME_LIMIT_LOC 900
 
+static inline bool valueChanged(float *V0, float *V1)
+{
+        if (abs(V0[0]-V1[0]) <= abs(V0[0])*THRESHOLD_PERCENT_LOC &&
+            abs(V0[1]-V1[1]) <= abs(V0[1])*THRESHOLD_PERCENT_LOC &&
+            abs(V0[2]-V1[2]) <= abs(V0[2])*THRESHOLD_PERCENT_LOC)
+                return false;
+        else
+                return true;
+}
+
 size_t Location::read(char *buf, size_t maxLen, char *status, size_t num)
 {
         static const char *fmt = "108,%ld,%.2f,%.6f,%.6f\r\n109,%ld,%.2f,%.6f,%.6f";
@@ -15,17 +25,13 @@
         if (!gpsTracker.position(&pos)) {
                 return 0;
         }
-        float data[3] = { pos.altitude, pos.latitude,
-                          pos.longitude };
+        float data[3] = { pos.altitude, pos.latitude, pos.longitude };
 
-        if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_LOC &&
-            abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_LOC &&
-            abs(oldValues[2]-data[2]) <= abs(oldValues[2])*THRESHOLD_PERCENT_LOC) {
-                time_t t_interval = time(NULL) - t_start;
-                if (t_interval < TIME_LIMIT_LOC) {
-                        return 0;
-                }
+        float t_interval = timer.read();
+        if (!valueChanged(oldValues, data) && t_interval < TIME_LIMIT_LOC) {
+                return 0;
         }
+
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data[0], data[1],
                             data[2], deviceID, data[0], data[1], data[2]);
         if (status) {
@@ -35,6 +41,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

--- a/measurement/Location.h	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Location.h	Fri May 29 12:05:01 2015 +0000
@@ -8,11 +8,11 @@
 class Location: public AbstractReporter
 {
 public:
-        Location(): gpsTracker() {
+        Location(): gpsTracker(), timer() {
                 oldValues[0] = 0;
                 oldValues[1] = 0;
                 oldValues[2] = 0;
-                t_start = time(NULL);
+                timer.start();
         }
         virtual ~Location() {}
         virtual bool init() { return true; }
@@ -21,7 +21,7 @@
 private:
         GPSTracker gpsTracker;
         float oldValues[3];
-        time_t t_start;
+        Timer timer;
 };
 
 #endif /* LOCATION_H */
\ No newline at end of file

--- a/measurement/Potentiometer.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Potentiometer.cpp	Fri May 29 12:05:01 2015 +0000
@@ -28,7 +28,7 @@
         float min[2] = {100, 100};
         float max[2] = {0, 0};
         // multiple sampling for data smoothing
-        const unsigned short N = 10;
+        const unsigned short N = 20;
         for (unsigned short i = 0; i < N; ++i) {
                 float d0 = (float)analog1*100;
                 float d1 = (float)analog2*100;
@@ -38,24 +38,24 @@
                 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);
+                Thread::wait(5);
         }
         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) {
-                        return 0;
-                }
+        float t_interval = timer.read();
+        if (!valueChanged(oldValues, data) && t_interval < TIME_LIMIT_ANA) {
+                return 0;
         }
 
+        if (t_interval >= TIME_LIMIT_ANA)
+            aInfo("[%f]: %f, %f (%f, %f)\n", t_interval, data[0], data[1], oldValues[0], oldValues[1]);
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data[0], data[1]);
         if (status) {
                 snprintf(status, num, "Send Poti %.1f,%.1f", data[0], data[1]);
         }
         oldValues[0] = data[0];
         oldValues[1] = data[1];
-        t_start = time(NULL);
+        timer.reset();
         return l;
 }
\ No newline at end of file

--- a/measurement/Potentiometer.h	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Potentiometer.h	Fri May 29 12:05:01 2015 +0000
@@ -7,10 +7,10 @@
 class Potentiometer: public AbstractReporter
 {
 public:
-        Potentiometer() {
+        Potentiometer(): timer() {
                 oldValues[0] = 0;
                 oldValues[1] = 0;
-                t_start = time(NULL);
+                timer.start();
         }
         virtual ~Potentiometer() {}
         virtual bool init() { return true; }
@@ -18,7 +18,7 @@
         virtual size_t read(char*, size_t, char*, size_t);
 private:
         float oldValues[2];
-        time_t t_start;
+        Timer timer;
 };
 
 #endif /* POTENTIOMETER_H */
\ No newline at end of file

--- a/measurement/Signal.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Signal.cpp	Fri May 29 12:05:01 2015 +0000
@@ -10,6 +10,14 @@
 // Timeout for forcing a sending even if readings are similar [seconds].
 #define TIME_LIMIT_SIG 900
 
+static inline bool valueChanged(int *V0, int *V1)
+{
+        if (abs(V0[0]-V1[0]) <= abs(V0[0])*THRESHOLD_PERCENT_SIG &&
+            abs(V0[1]-V1[1]) <= abs(V0[1])*THRESHOLD_PERCENT_SIG)
+                return false;
+        else
+                return true;
+}
 
 size_t Signal::read(char *buf, size_t maxLen, char *status, size_t num)
 {
@@ -28,12 +36,9 @@
                 return 0;
 
         int data[2] = { p->rssi, p->ber };
-        if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_SIG &&
-            abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_SIG) {
-                time_t t_interval = time(NULL) - t_start;
-                if (t_interval < TIME_LIMIT_SIG) {
-                        return 0;
-                }
+        float t_interval = timer.read();
+        if (!valueChanged(oldValues, data) && t_interval < TIME_LIMIT_SIG) {
+                return 0;
         }
 
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data[0], data[1]);
@@ -42,6 +47,6 @@
         }
         oldValues[0] = data[0];
         oldValues[1] = data[1];
-        t_start = time(NULL);
+        timer.reset();
         return l;
 }
\ No newline at end of file

--- a/measurement/Signal.h	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Signal.h	Fri May 29 12:05:01 2015 +0000
@@ -8,10 +8,10 @@
 class Signal: public AbstractReporter
 {
 public:
-        Signal(DeviceInfo& d): deviceInfo(d) {
+        Signal(DeviceInfo& d): deviceInfo(d), timer() {
                 oldValues[0] = 0;
                 oldValues[1] = 0;
-                t_start = time(NULL);
+                timer.start();
         }
         virtual ~Signal() {}
         virtual bool init() { return true; }
@@ -19,8 +19,8 @@
         virtual size_t read(char*, size_t, char*, size_t);
 private:
         int oldValues[2];
-        time_t t_start;
         DeviceInfo& deviceInfo;
+        Timer timer;
 };
 
 #endif /* SIGNAL_H */
\ No newline at end of file

--- a/measurement/Temperature.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Temperature.cpp	Fri May 29 12:05:01 2015 +0000
@@ -8,6 +8,14 @@
 // Timeout for forcing a sending even if readings are similar [seconds].
 #define TIME_LIMIT_TEMP 900
 
+static inline bool valueChanged(float V0, float V1)
+{
+        if (abs(V0-V1) <= abs(V0)*THRESHOLD_PERCENT_TEMP)
+                return false;
+        else
+                return true;
+}
+
 size_t Temperature::read(char *buf, size_t maxLen, char *status, size_t num)
 {
         static const char *fmt = "105,%ld,%f\r\n";
@@ -15,17 +23,15 @@
                 return 0;
 
         float data = sensor.temp();
-        if (abs(oldValue-data) <= abs(oldValue)*THRESHOLD_PERCENT_TEMP) {
-                time_t t_interval = time(NULL) - t_start;
-                if (t_interval < TIME_LIMIT_TEMP) {
-                        return 0;
-                }
+        float t_interval = timer.read();
+        if (!valueChanged(oldValue, data) && t_interval < TIME_LIMIT_TEMP) {
+                return 0;
         }
         size_t l = snprintf(buf, maxLen, fmt, deviceID, data);
         if (status) {
                 snprintf(status, num, "Send Temp %.2f", data);
         }
         oldValue = data;
-        t_start = time(NULL);
+        timer.reset();
         return l;
 }
\ No newline at end of file

--- a/measurement/Temperature.h	Wed May 27 09:22:24 2015 +0000
+++ b/measurement/Temperature.h	Fri May 29 12:05:01 2015 +0000
@@ -8,8 +8,9 @@
 class Temperature: public AbstractReporter
 {
 public:
-        Temperature(): deviceReady(false), oldValue(0), sensor(D14, D15) {
-                t_start = time(NULL);
+        Temperature(): deviceReady(false), oldValue(0),
+                timer(), sensor(D14, D15) {
+                timer.start();
         }
         virtual ~Temperature() {}
         virtual bool init() {
@@ -21,7 +22,7 @@
 private:
         bool deviceReady;
         float oldValue;
-        time_t t_start;
+        Timer timer;
         LM75B sensor;
 };
 

--- a/operation/PollThread.cpp	Wed May 27 09:22:24 2015 +0000
+++ b/operation/PollThread.cpp	Fri May 29 12:05:01 2015 +0000
@@ -36,7 +36,7 @@
 {
         int l = snprintf(buf2, sizeof(buf2), "83,%s\r\n", bayeuxId);
         l = snprintf(buf, sizeof(buf), fmtSmartRest, uri, l, buf2);
-        sock.setBlocking(300000); // Timeout after an hour
+        sock.setBlocking(300000); // Timeout after 5 minutes
         l = sock.sendAndReceive(buf, l, sizeof(buf));
         return l>0;
 }