Diff: measurement/SignalQualityMeasurement.cpp

Revision:

74:ca3001991fdc

Parent:

73:313975bfec96

Child:

76:b07effe83fb8

--- a/measurement/SignalQualityMeasurement.cpp	Tue Feb 17 16:31:30 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Wed Feb 18 10:17:29 2015 +0000
@@ -5,15 +5,15 @@
 #include "FloatValue.h"
 #include "logging.h"
 
-#define THRESHOLD_PERCENT_SIG 0.05       // Percentage cut-off for avoiding sending similar signal sensor data.
+#define THRESHOLD_PERCENT_SIG 0.01       // Percentage cut-off for avoiding sending similar signal sensor data.
 // 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, DeviceIO& io, DeviceBootstrap& bootstrap) :
-    _client(client),
+    _deviceId(deviceId),
     _tpl(tpl),
-    _deviceId(deviceId),
+    _client(client),
     _deviceInfo(deviceInfo),
     _io(io),
     _bootstrap(bootstrap)
@@ -49,14 +49,20 @@
     data[0] = signalQuality->rssi;
     data[1] = signalQuality->ber;
     char tenant[25] = {0};
-    snprintf(tenant, 25, "Tenant: %s", _bootstrap.username());
+    const char* user= _bootstrap.username();
+    int len = strchr(user, '/')-user+1+8;  // 8: length of "Tenant: ";
+    len = len <= 25 ? len : 25;
+    snprintf(tenant, len, "Tenant: %s", user);
     char signal[25] = {0};
-    snprintf(signal, 25, "Network: %d dBm", _deviceInfo.signalQuality()->rssi);
+    if (_deviceInfo.signalQuality())
+        snprintf(signal, 25, "Network: %d dBm", _deviceInfo.signalQuality()->rssi);
+    else
+        strncpy(signal, "Network: ? dBm", 25);
     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) {
+            _io.lcdPrint(tenant, signal);
             aDebug("Similar signal readings found, no sending!\r\n");
-            _io.lcdPrint(tenant, signal);
             return true;
         } else {
             aDebug("Sending timer of signal sensor timed out at %f s, a sending is forced.\r\n", sendingTimer.read());
@@ -64,7 +70,7 @@
     }    
         
     char status[25] = {0};
-    snprintf(status, 25, "Sending Poti %d,%d", (int)data[0], (int)data[1]);
+    snprintf(status, 25, "Sending dBm %d,%d", (int)data[0], (int)data[1]);
     _io.lcdPrint(tenant, signal, status);
     ComposedRecord record;
     IntegerValue msgId(104);
@@ -82,7 +88,7 @@
     }
     float t_end = sendingTimer.read();    
     _client.stop();
-    aInfo("Acceleration readings sent in %.1f.\r\n", t_end-t_start);
+    aInfo("Signal readings sent in %.1f.\r\n", t_end-t_start);
     oldValues[0] = data[0];
     oldValues[1] = data[1];
     sendingTimer.reset();