Revision 85:b49c4cfecc43, committed 2015-03-06

Comitter:

xinlei

Date:

Fri Mar 06 11:38:15 2015 +0000

Parent:

84:5dc5a50e4b06

Child:

86:a01faf58e938

Commit message:

bugfix: fixed LCD display showing signal quality behind real signal measuring.

Changed in this revision

--- a/MbedAgent.cpp	Fri Mar 06 11:20:07 2015 +0000
+++ b/MbedAgent.cpp	Fri Mar 06 11:38:15 2015 +0000
@@ -99,7 +99,6 @@
 void MbedAgent::loop()
 {
     Watchdog wdt;
-    char signal[25] = {0};
     DigitalIn joystickUp(A2);
     DigitalIn joystickDown(A3);
 //    DigitalIn joystickLeft(A4);
@@ -116,12 +115,6 @@
             _mdm.setDebug(3);
             printf("***Enabled debug mode.***\r\n");
         }
-        DeviceInfo::SignalQuality *p = _deviceInfo.signalQuality(false);
-        if (p && p->rssi)
-            snprintf(signal, sizeof(signal), "Network: %d dBm", p->rssi);
-        else
-            strncpy(signal, "Network: no coverage", sizeof(signal));
-        _displayInfo.setSecondLine(signal);
 
         _configurationSynchronization.run();
         _signalQualityMeasurement.run();

--- a/measurement/AnalogMeasurement.cpp	Fri Mar 06 11:20:07 2015 +0000
+++ b/measurement/AnalogMeasurement.cpp	Fri Mar 06 11:38:15 2015 +0000
@@ -43,9 +43,7 @@
 bool AnalogMeasurement::run()
 {
     extern bool lastSensorReadingSent;
-    float data[2] = {0, 0};
-    data[0] = _analog1.read()*100;
-    data[1] = _analog2.read()*100;
+    float data[2] = {_analog1.read()*100, _analog2.read()*100};
         
     if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_ANA &&
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_ANA) {

--- a/measurement/LocationUpdate.cpp	Fri Mar 06 11:20:07 2015 +0000
+++ b/measurement/LocationUpdate.cpp	Fri Mar 06 11:38:15 2015 +0000
@@ -54,10 +54,7 @@
         aError("No GPS data available.\r\n");
         return false;
     }
-    float data[3] = { 0.0, 0.0, 0.0 };
-    data[0] = position.altitude;
-    data[1] = position.latitude;
-    data[2] = position.longitude;
+    float data[3] = { position.altitude, position.latitude, position.longitude };
 
     if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_LOC &&
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_LOC &&

--- a/measurement/SignalQualityMeasurement.cpp	Fri Mar 06 11:20:07 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Fri Mar 06 11:38:15 2015 +0000
@@ -41,9 +41,15 @@
 bool SignalQualityMeasurement::run()
 {
     extern bool lastSensorReadingSent;
+    static char signal[25] = {0};
     DeviceInfo::SignalQuality *signalQuality;   
     if ((signalQuality = _deviceInfo.signalQuality()) == NULL)
         return false;
+    if (signalQuality && signalQuality->rssi)
+        snprintf(signal, sizeof(signal), "Network: %d dBm", signalQuality->rssi);
+    else
+        strncpy(signal, "Network: no coverage", sizeof(signal));
+    _displayInfo.setSecondLine(signal);
 
     int data[2] = {signalQuality->rssi, signalQuality->ber};
     if (abs(oldValues[0]-data[0]) <= abs(oldValues[0])*THRESHOLD_PERCENT_SIG &&

--- a/measurement/TemperatureMeasurement.cpp	Fri Mar 06 11:20:07 2015 +0000
+++ b/measurement/TemperatureMeasurement.cpp	Fri Mar 06 11:38:15 2015 +0000
@@ -45,8 +45,7 @@
         return false;
 
     extern bool lastSensorReadingSent;
-    float data = 0;
-    data = _sensor.temp();
+    float data = _sensor.temp();
 
     if (abs(oldValue-data) <= abs(oldValue)*THRESHOLD_PERCENT_TEMP) {
         if (sendingTimer.read() < TIME_LIMIT_TEMP) {