Diff: measurement/SignalQualityMeasurement.cpp

Revision:

71:063c45e99578

Parent:

56:4d6e34f1589d

Child:

72:c5709ae7b193

--- a/measurement/SignalQualityMeasurement.cpp	Tue Feb 10 20:52:13 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Mon Feb 16 09:17:30 2015 +0000
@@ -4,6 +4,9 @@
 #include "IntegerValue.h"
 #include "FloatValue.h"
 
+#define THRESHOLD_PERCENT_SIG 0.05       // Percentage cut-off for avoiding sending similar signal sensor data.
+#define TIME_LIMIT_SIG 900               // Time interval for forcing a sending even if signal sensor readings are constantly similar.
+
 SignalQualityMeasurement::SignalQualityMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo) :
     _client(client),
     _tpl(tpl),
@@ -11,6 +14,9 @@
     _deviceInfo(deviceInfo)
 {
     _init = false;
+    oldValues[0] = 0;
+    oldValues[1] = 0;
+    sendingTimer.start();    
 }
 
 bool SignalQualityMeasurement::init()
@@ -34,6 +40,19 @@
     if ((signalQuality = _deviceInfo.signalQuality()) == NULL)
         return false;
         
+    float data[2] = {0, 0};
+    data[0] = signalQuality->rssi;
+    data[1] = signalQuality->ber;
+    if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_SIG &&
+        abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_SIG) {
+        if (sendingTimer.read() < TIME_LIMIT_SIG) {
+            printf("Similar signal readings found, no sending!\r\n");
+            return true;
+        } else {
+            printf("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
+        } 
+    }    
+        
     ComposedRecord record;
     IntegerValue msgId(104);
     IntegerValue devId(_deviceId);
@@ -47,6 +66,11 @@
         _client.stop();
         return false;
     }
+    
     _client.stop();
+    oldValues[0] = data[0];
+    oldValues[1] = data[1];
+    sendingTimer.reset();
+    printf("Signal quality measurement sent.\r\n");
     return true;
 }