Diff: measurement/LocationUpdate.cpp

Revision:

84:3c8ceb12b773

Parent:

82:ca7430f50b2b

Child:

85:5dc5a50e4b06

--- a/measurement/LocationUpdate.cpp	Fri Mar 06 10:38:03 2015 +0000
+++ b/measurement/LocationUpdate.cpp	Fri Mar 06 11:10:48 2015 +0000
@@ -57,18 +57,12 @@
     data[0] = position.altitude;
     data[1] = position.latitude;
     data[2] = position.longitude;
-    DeviceInfo::SignalQuality *p = _deviceInfo.signalQuality(false);
-    char signal[25] = {0};
-    if (p && p->rssi)
-        snprintf(signal, sizeof(signal), "Network: %d dBm", p->rssi);
-    else
-        strncpy(signal, "Network: no coverage", sizeof(signal));
 
     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) {
         if (sendingTimer.read() < TIME_LIMIT_LOC) {
-            _io.lcdPrint(_displayInfo.getFirstLine(), signal);
+            _io.lcdPrint(_displayInfo.getFirstLine(), _displayInfo.getSecondLine());
             aDebug("Similar location readings found, no sending!\r\n");
             return true;
         } else {
@@ -77,7 +71,7 @@
     }
     char status[27] = {0};
     snprintf(status, 27, "Sending GPS %.1f,%.1f,%.1f", data[0], data[1], data[2]);
-    _io.lcdPrint(_displayInfo.getFirstLine(), signal, status);
+    _io.lcdPrint(_displayInfo.getFirstLine(), _displayInfo.getSecondLine(), status);
         
     Aggregator aggregator;
     ComposedRecord record1, record2;