Clean up examples

Author: sebromero

examples/HTTPClient/HTTPClient.ino

@@ -10,14 +10,7 @@ const int  port       = 80;
 ArduinoCellular cellular = ArduinoCellular();
 HttpClient client = cellular.getHTTPClient(server, port);
 
-void setup(){
-    Serial.begin(115200);
-    while (!Serial);
-    cellular.begin();
-    cellular.connect(SECRET_GPRS_APN, SECRET_GPRS_LOGIN, SECRET_GPRS_PASSWORD, SECRET_PINNUMBER);
-}
-
-void loop(){
+void getResource(){
 
   Serial.println("Making GET request...");
 
@@ -32,7 +25,27 @@ void loop(){
   Serial.println(response);
 
   client.stop();
+}
 
-  delay(5000);
+void setup(){
+    Serial.begin(115200);
+    while (!Serial);
+    // cellular.setDebugStream(Serial); // Uncomment this line to enable debug output
+    cellular.begin();
 
+    if(String(SECRET_PINNUMBER).length() > 0 && !cellular.unlockSIM(SECRET_PINNUMBER)){
+        Serial.println("Failed to unlock SIM card.");
+        while(true); // Stop here
+    }
+
+    Serial.println("Connecting...");
+    if(!cellular.connect(SECRET_GPRS_APN, SECRET_GPRS_LOGIN, SECRET_GPRS_PASSWORD)){
+        Serial.println("Failed to connect to the network.");
+        while(true); // Stop here
+    }
+    Serial.println("Connected!");
+
+    getResource();
 }
+
+void loop(){}

examples/HTTPSClient/HTTPSClient.ino

@@ -11,15 +11,7 @@ const int  port       = 443;
 ArduinoCellular cellular = ArduinoCellular();
 HttpClient client = cellular.getHTTPSClient(server, port);
 
-void setup(){
-    Serial.begin(115200);
-    while (!Serial);
- 
-    cellular.begin();
-    cellular.connect(SECRET_GPRS_APN, SECRET_GPRS_LOGIN, SECRET_GPRS_PASSWORD, SECRET_PINNUMBER);
-}
-
-void loop(){
+void getResource(){
   Serial.println("Making GET request...");
 
   client.get(resource);
@@ -33,5 +25,28 @@ void loop(){
   Serial.println(response);
 
   client.stop();
-  delay(5000);
 }
+
+void setup(){
+    Serial.begin(115200);
+    while (!Serial);
+ 
+    // cellular.setDebugStream(Serial); // Uncomment this line to enable debug output
+    cellular.begin();
+
+    if(String(SECRET_PINNUMBER).length() > 0 && !cellular.unlockSIM(SECRET_PINNUMBER)){
+        Serial.println("Failed to unlock SIM card.");
+        while(true); // Stop here
+    }
+
+    Serial.println("Connecting...");
+    if(!cellular.connect(SECRET_GPRS_APN, SECRET_GPRS_LOGIN, SECRET_GPRS_PASSWORD)){
+        Serial.println("Failed to connect to the network.");
+        while(true); // Stop here
+    }
+    Serial.println("Connected!");
+
+    getResource();
+}
+
+void loop(){}

examples/ReceiveSMS/ReceiveSMS.ino

@@ -25,8 +25,14 @@ void setup(){
     while (!Serial);
     // cellular.setDebugStream(Serial); // Uncomment this line to enable debug output
     cellular.begin();
+
+    String pinCode = ""; // If your SIM card has a PIN code, specify it here e.g. "1234"
+    if(pinCode.length() > 0 && !cellular.unlockSIM(pinCode)){
+        Serial.println("Failed to unlock SIM card.");
+        while(true); // Stop here
+    }
 
-    Serial.println("Connecting...");
+    Serial.println("Connecting to network...");
     cellular.connect();
     Serial.println("Connected!");
 

examples/SendSMS/SendSMS.ino

@@ -22,16 +22,18 @@ void setup(){
     while (!Serial);
     delay(1000); // Give the serial monitor some time to start
 
+    // cellular.setDebugStream(Serial); // Uncomment this line to enable debug output
     cellular.begin();
-    String pinCode = "1234"; // If your SIM card has a PIN code, specify it here
 
+    String pinCode = ""; // If your SIM card has a PIN code, specify it here e.g. "1234"
     if(pinCode.length() > 0 && !cellular.unlockSIM(pinCode)){
         Serial.println("Failed to unlock SIM card.");
         while(true); // Stop here
     }
 
     Serial.println("Connecting to network...");
     cellular.connect(); // APN settings are not required for sending SMS
+    Serial.println("Connected!");
 
     Serial.println("Sending SMS...");
     cellular.sendSMS("<INSERT_NUMBER_HERE>", "bleep bleep");