Diff: MbedAgent.h

Revision:

93:0acd11870c6a

Parent:

91:423177e8a401

Child:

94:61d44636f020

--- a/MbedAgent.h	Fri Mar 20 14:27:10 2015 +0000
+++ b/MbedAgent.h	Mon Apr 13 14:24:58 2015 +0000
@@ -3,7 +3,6 @@
 
 #include <stddef.h>
 #include "MDM.h"
-#include "DeviceIO.h"
 #include "RtosSmartRest.h"
 #include "SmartRestTemplate.h"
 #include "DeviceInfo.h"
@@ -19,25 +18,21 @@
 #include "AnalogMeasurement.h"
 #include "LocationUpdate.h"
 #include "OperationSupport.h"
-
-#define MBED_AGENT_HOST "management.m2m-devicecloud.com"
-//#define MBED_AGENT_HOST "developer.cumulocity.com"
-#define MBED_AGENT_PORT 80
-#define MBED_AGENT_DEVICE_IDENTIFIER "com_cumulocity_MbedAgent_1.5.2"
+#include "LCDDisplay.h"
+#include "SmartRestConf.h"
 
 class MbedAgent
 {
 public:
-    MbedAgent(DeviceIO&, MDMSerial&, DeviceInfo&, DeviceMemory&);
-    
+    MbedAgent(GPSI2C&, MDMSerial&, LCDDisplay&, DeviceInfo&, DeviceMemory&);
+
     bool init();
-    bool run();
+    int run();
+    void loop();
 
 protected:
-    void loop();
     
 private:
-    DeviceIO& _io;
     MDMSerial& _mdm;
     DeviceInfo& _deviceInfo;
     DeviceMemory& _deviceMemory;
@@ -47,7 +42,7 @@
     SmartRestTemplate _tpl;
     DeviceBootstrap _bootstrap;
     DeviceIntegration _integration;
-    DisplayInfo _displayInfo;
+    LCDDisplay& _lcdDisplay;
     ConfigurationSynchronization _configurationSynchronization;
     SignalQualityMeasurement _signalQualityMeasurement;
     TemperatureMeasurement _temperatureMeasurement;