Remove need to supply APN settings

Author: sebromero

examples/ReceiveSMS/ReceiveSMS.ino

@@ -29,7 +29,7 @@ void setup(){
     cellular.begin();
 
     Serial.println("Connecting...");
-    cellular.connect(SECRET_GPRS_APN, SECRET_GPRS_LOGIN, SECRET_GPRS_PASSWORD, SECRET_PINNUMBER);
+    cellular.connect();
 
     // Register interrupt based callback for new SMS
     attachInterrupt(digitalPinToInterrupt(NEW_SMS_INTERRUPT_PIN), onSMSReceived, RISING);

examples/ReceiveSMS/arduino_secrets.h

@@ -43,33 +43,46 @@ void ArduinoCellular::begin() {
 
 }
 
-bool ArduinoCellular::connect(String apn, String gprsUser, String gprsPass, String pin){
+bool ArduinoCellular::connect(String apn, String username, String password, String pin){
     SimStatus simStatus = getSimStatus();
     if(simStatus == SimStatus::SIM_LOCKED && pin.length() > 0){
        unlockSIM(pin.c_str());
     }
 
     simStatus = getSimStatus();
-    if(simStatus == SimStatus::SIM_READY) {
-        if(awaitNetworkRegistration()){
-            if(connectToGPRS(apn.c_str(), gprsUser.c_str(), gprsPass.c_str())){
-                if(this->debugStream != nullptr){
-                    this->debugStream->println("Setting DNS...");
-                }
-                
-                auto response = this->sendATCommand("+QIDNSCFG=1,\"8.8.8.8\",\"8.8.4.4\"");
-                
-                if(this->debugStream != nullptr){
-                    this->debugStream->println(response);
-                }                
-                return true;
-            }
+    if(simStatus != SimStatus::SIM_READY) {
+        if(this->debugStream != nullptr){
+            this->debugStream->println("SIM not ready or incorrect PIN provided.");
+        }
+        return false;
+    }
+
+    if(!awaitNetworkRegistration()){    
+        return false;
+    }
+
+    if(apn.length() == 0){
+        if(this->debugStream != nullptr){
+            this->debugStream->println("No APN specified, not connecting to GPRS");
+        }
+        return true;       
+    }
+
+    if(connectToGPRS(apn.c_str(), username.c_str(), password.c_str())){
+        auto response = this->sendATCommand("+QIDNSCFG=1,\"8.8.8.8\",\"8.8.4.4\"");
+        
+        if(response.indexOf("OK") != -1){
+            return true;
         } else {
+            if(this->debugStream != nullptr){
+                this->debugStream->println("Failed to set DNS.");
+            }
             return false;
         }
+
     }
 
-    return false;    
+    return false;
 }
 
 

src/ArduinoCellular.cpp

@@ -95,14 +95,15 @@ class ArduinoCellular {
         void begin();
 
         /**
-         * @brief Connects to the network using the specified APN, GPRS username, and GPRS password.
+         * @brief Registers with the cellular network and connects to the Internet
+         * if the APN, GPRS username, and GPRS password are provided.
          * @param apn The Access Point Name.
-         * @param gprsUser The GPRS username.
-         * @param gprsPass The GPRS password.
+         * @param username The APN username.
+         * @param password The APN password.
          * @param pin The SIM card PIN.
          * @return True if the connection is successful, false otherwise.
          */
-        bool connect(String apn, String gprsUser, String gprsPass, String pin = "");
+        bool connect(String apn = "", String username = "", String password = "", String pin = "");
 
         /**
          * @brief Checks if the modem is registered on the network.