Diff: MbedAgent.h

Revision:

94:61d44636f020

Parent:

93:0acd11870c6a

Child:

96:5dfdc8568e9f

--- a/MbedAgent.h	Mon Apr 13 14:24:58 2015 +0000
+++ b/MbedAgent.h	Mon Apr 20 15:04:23 2015 +0000
@@ -3,7 +3,7 @@
 
 #include <stddef.h>
 #include "MDM.h"
-#include "RtosSmartRest.h"
+#include "SmartRest.h"
 #include "SmartRestTemplate.h"
 #include "DeviceInfo.h"
 #include "DeviceMemory.h"
@@ -20,6 +20,8 @@
 #include "OperationSupport.h"
 #include "LCDDisplay.h"
 #include "SmartRestConf.h"
+#include "PollingThread.h"
+#include "ReportThread.h"
 
 class MbedAgent
 {
@@ -33,24 +35,25 @@
 protected:
     
 private:
+    long _deviceId;
     MDMSerial& _mdm;
     DeviceInfo& _deviceInfo;
     DeviceMemory& _deviceMemory;
+    LCDDisplay& _lcdDisplay;
     DeviceConfiguration _deviceConfiguration;
     ConfigurationProperties _configurationProperties;
-    RtosSmartRest _client;
+    SmartRest _client;
     SmartRestTemplate _tpl;
     DeviceBootstrap _bootstrap;
     DeviceIntegration _integration;
-    LCDDisplay& _lcdDisplay;
     ConfigurationSynchronization _configurationSynchronization;
     SignalQualityMeasurement _signalQualityMeasurement;
     TemperatureMeasurement _temperatureMeasurement;
     AccelerationMeasurement _accelerationMeasurement;
     AnalogMeasurement _analogMeasurement;
     LocationUpdate _locationUpdate;
+    OperationPool pool;
     OperationSupport _operationSupport;
-    long _deviceId;
 };
 
 #endif
\ No newline at end of file