Diff: measurement/AccelerationMeasurement.cpp

Revision:

96:5dfdc8568e9f

Parent:

94:61d44636f020

Child:

100:47ea098f8a47

--- a/measurement/AccelerationMeasurement.cpp	Wed Apr 22 11:22:25 2015 +0000
+++ b/measurement/AccelerationMeasurement.cpp	Mon Apr 27 10:50:21 2015 +0000
@@ -4,20 +4,20 @@
 #include "IntegerValue.h"
 #include "FloatValue.h"
 #include "MbedClient.h"
+#include "LCDDisplay.h"
 #include "logging.h"
 
 #define THRESHOLD_PERCENT_ACCE 0.1       // Percentage cut-off for avoiding sending similar acceleration sensor data.
 // Time interval for forcing a sending even if acceleration sensor readings are constantly similar (in seconds).
 #define TIME_LIMIT_ACCE 900          
 
-AccelerationMeasurement::AccelerationMeasurement(AbstractSmartRest& client, SmartRestTemplate& tpl, 
-    long& deviceId, DeviceInfo& deviceInfo, LCDDisplay& lcdDisplay) :
+AccelerationMeasurement::AccelerationMeasurement(AbstractSmartRest& client,
+    SmartRestTemplate& tpl, long& deviceId, DeviceInfo& deviceInfo) :
     _deviceId(deviceId),
     _tpl(tpl),
     _client(client),
     _sensor(SDA,SCL),
-    _deviceInfo(deviceInfo),
-    _lcdDisplay(lcdDisplay)
+    _deviceInfo(deviceInfo)
 {
     _init = false;
     oldValues[0] = 0;
@@ -57,8 +57,8 @@
         time_t t_interval = time(NULL) - t_start;
         if (t_interval < TIME_LIMIT_ACCE) {
 //            printf("[N] Acc %f, %f, %f\r\n", data[0], data[1], data[2]);
-            if (strcmp(_lcdDisplay.getThirdLine(), "")) {
-                _lcdDisplay.setThirdLine("");
+            if (strcmp(LCDDisplay::inst().getThirdLine(), "")) {
+                LCDDisplay::inst().setThirdLine("");
             }
             return true;
         } else {
@@ -68,7 +68,7 @@
 //    printf("[Y] Acc %f, %f, %f\r\n", data[0], data[1], data[2]);
     char status[27] = {0};
     snprintf(status, 27, "Send Acc %.1f,%.1f,%.1f", data[0], data[1], data[2]);
-    _lcdDisplay.setThirdLine(status);
+    LCDDisplay::inst().setThirdLine(status);
 
     ComposedRecord record;
     IntegerValue msgId(106);