Diff: MBEDUbloxCellRadio.cpp

Revision:

14:5061a0361ab4

Parent:

13:28340983102c

Child:

16:19f597d8048f

diff -r 28340983102c -r 5061a0361ab4 MBEDUbloxCellRadio.cpp
--- a/MBEDUbloxCellRadio.cpp	Wed Apr 02 18:36:55 2014 +0000
+++ b/MBEDUbloxCellRadio.cpp	Thu Apr 03 00:50:53 2014 +0000
@@ -21,6 +21,11 @@
  
  // MBEDEndpoint support
  #include "MBEDEndpoint.h"
+ 
+ #ifdef CELLULAR_NETWORK
+ // external status fn (temp)
+ extern int getUbloxConnectStatus();
+ #endif
   
  // default constructor
  MBEDUbloxCellRadio::MBEDUbloxCellRadio(ErrorHandler *error_handler, void *endpoint,UBLOX_MODEM *modem,C027 *c027) : BaseClass(error_handler,endpoint) {
@@ -35,28 +40,8 @@
  
  // connect
  bool MBEDUbloxCellRadio::connect() {
-     if (this->m_connected == false) {
-        this->logger()->log("applying modem power...");
-        this->m_c027->mdmUsbEnable(true);
-        this->logger()->log("powering modem...");
-        this->m_c027->mdmPower(true);
-        //this->logger()->log("resetting modem...");
-        //this->m_c027->mdmReset();
-        //this->logger()->log("waking modem...");
-        //this->m_c027->mdmWakeup();
-        //this->logger()->log("waiting a bit...");
-        //Thread::wait(UBLOX_CDMA_DELAY_MS);
-        //this->logger()->log("powering modem...");
-        //this->m_modem->power(true); 
-        this->logger()->log("waiting a bit...");
-        Thread::wait(UBLOX_CDMA_DELAY_MS);
-        this->logger()->log("connecting...");
-        int ret = this->m_modem->connect("internet");
-        if(ret) this->logger()->log("cellular modem connection FAILED!");
-        else this->logger()->log("cellular modem connected!");
-        this->m_connected = true;
-    }     
-    if (this->m_connected == false) this->logger()->log("cell modem connect FAILED");
+    this->m_connected = false;
+    if (getUbloxConnectStatus() == 0) this->m_connected = true;
     return this->m_connected;
  }