Diff: PyrnUSBModem.h

Revision:

2:61ac95f0af72

Parent:

1:fbf17fb09581

--- a/PyrnUSBModem.h	Fri Feb 20 17:15:55 2015 +0000
+++ b/PyrnUSBModem.h	Tue Apr 14 13:27:07 2015 +0000
@@ -3,26 +3,42 @@
 #define PYRN_USB_MODEM_H
 
 #include "mbed.h"
+
 #include "USBHost/USBHost3GModule/WANDongle.h"
 #include "USBSerialStream.h"
 #include "ATCommandsInterface.h"
 #include "PPPIPInterface.h"
 
+#include "HuaweiE372DongleInitializer.h"
+
 class PyrnUSBModem {
 private:
+    HuaweiE372DongleInitializer initialiser;
     WANDongle dongle;
+    
     USBSerialStream atStream;
     USBSerialStream pppStream;
+    
     ATCommandsInterface at;
     PPPIPInterface ppp;
+    
     bool atOpen;
+    bool simReady;
     bool pppOpen;
+    bool ipInit;  
 public:
-    PyrnUSBModem(USBHost *h);
+    PyrnUSBModem();
     bool init();
-    bool isConnected(void);
-    void testAT(void);
+    
     WANDongleSerialPort *getAtInterface(int i);
+
+    bool attached(void);
+    bool pppConnected(void);
+
+    int connect(const char* apn, const char* user, const char* password);
+    int disconnect(void);
+
+    char* getIPAddress(void);
 };
 
 #endif
\ No newline at end of file