Diff: measurement/SignalQualityMeasurement.cpp

Revision:

96:5dfdc8568e9f

Parent:

94:61d44636f020

Child:

100:47ea098f8a47

--- a/measurement/SignalQualityMeasurement.cpp	Wed Apr 22 11:22:25 2015 +0000
+++ b/measurement/SignalQualityMeasurement.cpp	Mon Apr 27 10:50:21 2015 +0000
@@ -3,6 +3,7 @@
 #include "CharValue.h"
 #include "IntegerValue.h"
 #include "FloatValue.h"
+#include "LCDDisplay.h"
 #include "logging.h"
 
 #define THRESHOLD_PERCENT_SIG 0.06       // Percentage cut-off for avoiding sending similar signal sensor data.
@@ -10,13 +11,11 @@
 #define TIME_LIMIT_SIG 900               
 
 SignalQualityMeasurement::SignalQualityMeasurement(AbstractSmartRest& client, 
-    SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo,
-    LCDDisplay& lcdDisplay) :
+    SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo) :
     _deviceId(deviceId),
     _tpl(tpl),
     _client(client),
-    _deviceInfo(deviceInfo),
-    _lcdDisplay(lcdDisplay)
+    _deviceInfo(deviceInfo)
 {
     _init = false;
     oldValues[0] = 0;
@@ -48,8 +47,8 @@
         snprintf(signal, sizeof(signal), "Network: %d dBm", signalQuality->rssi);
     else
         strncpy(signal, "Network: no coverage", sizeof(signal));
-    if (strcmp(_lcdDisplay.getSecondLine(), signal)) {
-        _lcdDisplay.setSecondLine(signal);
+    if (strcmp(LCDDisplay::inst().getSecondLine(), signal)) {
+        LCDDisplay::inst().setSecondLine(signal);
     }
 
     int data[2] = {signalQuality->rssi, signalQuality->ber};
@@ -57,8 +56,8 @@
         abs(oldValues[1]-data[1]) <= abs(oldValues[1])*THRESHOLD_PERCENT_SIG) {
         time_t t_interval = time(NULL) - t_start;
         if (t_interval < TIME_LIMIT_SIG) {
-            if (strcmp(_lcdDisplay.getThirdLine(), "")) {
-                _lcdDisplay.setThirdLine("");
+            if (strcmp(LCDDisplay::inst().getThirdLine(), "")) {
+                LCDDisplay::inst().setThirdLine("");
             }
             return true;
         } else {
@@ -68,7 +67,7 @@
 
     char status[25] = {0};
     snprintf(status, 25, "Send dBm %d,%d", data[0], data[1]);
-    _lcdDisplay.setThirdLine(status);
+    LCDDisplay::inst().setThirdLine(status);
     ComposedRecord record;
     IntegerValue msgId(104);
     IntegerValue devId(_deviceId);