Diff: measurement/AccelerationMeasurement.cpp

Revision:

94:61d44636f020

Parent:

93:0acd11870c6a

Child:

96:5dfdc8568e9f

--- a/measurement/AccelerationMeasurement.cpp	Mon Apr 13 14:24:58 2015 +0000
+++ b/measurement/AccelerationMeasurement.cpp	Mon Apr 20 15:04:23 2015 +0000
@@ -23,7 +23,7 @@
     oldValues[0] = 0;
     oldValues[1] = 0;
     oldValues[2] = 0;
-    sendingTimer.start();
+    t_start = time(NULL);
 }
 
 bool AccelerationMeasurement::init()
@@ -54,14 +54,15 @@
 //        abs(oldValues[2]-data[2]) <= abs(oldValues[2])*THRESHOLD_PERCENT_ACCE) {
     if (((0.15>abs(data[0])) || (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ACCE)) &&
         ((0.1> abs(data[1])) || (abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ACCE))) {
-        if (sendingTimer.read() < TIME_LIMIT_ACCE) {
+        time_t t_interval = time(NULL) - t_start;
+        if (t_interval < TIME_LIMIT_ACCE) {
 //            printf("[N] Acc %f, %f, %f\r\n", data[0], data[1], data[2]);
             if (strcmp(_lcdDisplay.getThirdLine(), "")) {
                 _lcdDisplay.setThirdLine("");
             }
             return true;
         } else {
-            aDebug("Acc: Timeout at %f s.\n", sendingTimer.read());
+            aDebug("Acc: Timeout at %d s.\n", t_interval);
         }
     }
 //    printf("[Y] Acc %f, %f, %f\r\n", data[0], data[1], data[2]);
@@ -78,18 +79,18 @@
     if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(xValue)) || (!record.add(yValue)) || (!record.add(zValue)))
         return false;
 
-    float t_start = sendingTimer.read();
+    time_t t0 = time(NULL);
     if (_client.send(record) != SMARTREST_SUCCESS) {
         aWarning("Acc: Send failed.\n");
         _client.stop();
         return false;
     }
-    float t_end = sendingTimer.read();
+    time_t t1 = time(NULL);
     _client.stop();
-    aDebug("Acc: Sent in %.1f.\n", t_end-t_start);
+    aDebug("Acc: Sent in %d s.\n", t1-t0);
     oldValues[0] = data[0];
     oldValues[1] = data[1];
     oldValues[2] = data[2];
-    sendingTimer.reset();
+    t_start = time(NULL);
     return true;
 }