Diff: measurement/SignalQualityMeasurement.cpp

Revision:

73:313975bfec96

Parent:

72:c5709ae7b193

Child:

74:ca3001991fdc

diff -r c5709ae7b193 -r 313975bfec96 measurement/SignalQualityMeasurement.cpp
--- a/measurement/SignalQualityMeasurement.cpp	Mon Feb 16 13:15:52 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Tue Feb 17 16:31:30 2015 +0000
@@ -6,13 +6,17 @@
 #include "logging.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.
+// Time interval for forcing a sending even if analog sensor readings are constantly similar (in seconds).
+#define TIME_LIMIT_SIG 900               
 
-SignalQualityMeasurement::SignalQualityMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo) :
+SignalQualityMeasurement::SignalQualityMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, long& deviceId, 
+    DeviceInfo& deviceInfo, DeviceIO& io, DeviceBootstrap& bootstrap) :
     _client(client),
     _tpl(tpl),
     _deviceId(deviceId),
-    _deviceInfo(deviceInfo)
+    _deviceInfo(deviceInfo),
+    _io(io),
+    _bootstrap(bootstrap)
 {
     _init = false;
     oldValues[0] = 0;
@@ -44,16 +48,24 @@
     float data[2] = {0, 0};
     data[0] = signalQuality->rssi;
     data[1] = signalQuality->ber;
+    char tenant[25] = {0};
+    snprintf(tenant, 25, "Tenant: %s", _bootstrap.username());
+    char signal[25] = {0};
+    snprintf(signal, 25, "Network: %d dBm", _deviceInfo.signalQuality()->rssi);
     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) {
-            aInfo("Similar signal readings found, no sending!\r\n");
+            aDebug("Similar signal readings found, no sending!\r\n");
+            _io.lcdPrint(tenant, signal);
             return true;
         } else {
-            aInfo("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
+            aDebug("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
         } 
     }    
         
+    char status[25] = {0};
+    snprintf(status, 25, "Sending Poti %d,%d", (int)data[0], (int)data[1]);
+    _io.lcdPrint(tenant, signal, status);
     ComposedRecord record;
     IntegerValue msgId(104);
     IntegerValue devId(_deviceId);
@@ -62,16 +74,17 @@
     if ((!record.add(msgId)) || (!record.add(devId)) || (!record.add(rssi)) || (!record.add(ber)))
         return false;
 
+    float t_start = sendingTimer.read();
     if (_client.send(record) != SMARTREST_SUCCESS) {
         aError("Signal measurement failed.\r\n");
         _client.stop();
         return false;
     }
-    
+    float t_end = sendingTimer.read();    
     _client.stop();
+    aInfo("Acceleration readings sent in %.1f.\r\n", t_end-t_start);
     oldValues[0] = data[0];
     oldValues[1] = data[1];
     sendingTimer.reset();
-    aInfo("Signal quality measurement sent.\r\n");
     return true;
 }