Run new astyle formatter against all the examples

libraries/GSM/examples/Tools/BandManagement/BandManagement.ino

@@ -1,24 +1,24 @@
 /*
  Band Management
- 
+
  This sketch, for the Arduino GSM shield, checks the band
- currently configured in the modem and allows you to change 
+ currently configured in the modem and allows you to change
  it.
- 
+
  Please check http://www.worldtimezone.com/gsm.html
  Usual configurations:
  Europe, Africa, Middle East: E-GSM(900)+DCS(1800)
  USA, Canada, South America: GSM(850)+PCS(1900)
  Mexico: PCS(1900)
  Brazil: GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)
- 
- 
+
+
  Circuit:
- * GSM shield 
- 
+ * GSM shield
+
  created 12 June 2012
  by Javier Zorzano, Scott Fitzgerald
- 
+
  This example is in the public domain.
  */
 
@@ -35,18 +35,18 @@ void setup()
   while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
-  
+
   // Beginning the band manager restarts the modem
   Serial.println("Restarting modem...");
   band.begin();
   Serial.println("Modem restarted.");
-  
+
 };
 
 
 void loop()
 {
-  // Get current band 
+  // Get current band
   String bandName = band.getBand(); // Get and print band name
   Serial.print("Current band:");
   Serial.println(bandName);
@@ -54,25 +54,25 @@ void loop()
   String newBandName;
   newBandName = askUser();
   // Tell the user what we are about to do…
-  Serial.print("\nConfiguring band "); 
-  Serial.println(newBandName); 
-  // Change the band 
-  boolean operationSuccess; 
-  operationSuccess = band.setBand(newBandName); 
-  // Tell the user if the operation was OK 
-  if(operationSuccess)
-  { 
+  Serial.print("\nConfiguring band ");
+  Serial.println(newBandName);
+  // Change the band
+  boolean operationSuccess;
+  operationSuccess = band.setBand(newBandName);
+  // Tell the user if the operation was OK
+  if (operationSuccess)
+  {
     Serial.println("Success");
-  } 
+  }
   else
-  { 
+  {
     Serial.println("Error while changing band");
-  } 
-   
-  if(operationSuccess)
-  { 
-    while(true); 
-  } 
+  }
+
+  if (operationSuccess)
+  {
+    while (true);
+  }
 }
 
 // This function offers the user different options
@@ -80,41 +80,41 @@ void loop()
 // The user selects one
 String askUser()
 {
-  String newBand; 
-  Serial.println("Select band:"); 
-  // Print the different options 
-  Serial.println("1 : E-GSM(900)"); 
-  Serial.println("2 : DCS(1800)"); 
-  Serial.println("3 : PCS(1900)"); 
-  Serial.println("4 : E-GSM(900)+DCS(1800) ex: Europe"); 
-  Serial.println("5 : GSM(850)+PCS(1900) Ex: USA, South Am."); 
-  Serial.println("6 : GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)"); 
-  
-  // Empty the incoming buffer 
-  while(Serial.available()) 
-  Serial.read(); 
-  
-  // Wait for an answer, just look at the first character 
-  while(!Serial.available()); 
-  char c= Serial.read(); 
-  if(c=='1')
-    newBand=GSM_MODE_EGSM; 
-  else if(c=='2')
-    newBand=GSM_MODE_DCS; 
-  else if(c=='3')
-    newBand=GSM_MODE_PCS; 
-  else if(c=='4')
-    newBand=GSM_MODE_EGSM_DCS; 
-  else if(c=='5')
-    newBand=GSM_MODE_GSM850_PCS; 
-  else if(c=='6')
-    newBand=GSM_MODE_GSM850_EGSM_DCS_PCS; 
+  String newBand;
+  Serial.println("Select band:");
+  // Print the different options
+  Serial.println("1 : E-GSM(900)");
+  Serial.println("2 : DCS(1800)");
+  Serial.println("3 : PCS(1900)");
+  Serial.println("4 : E-GSM(900)+DCS(1800) ex: Europe");
+  Serial.println("5 : GSM(850)+PCS(1900) Ex: USA, South Am.");
+  Serial.println("6 : GSM(850)+E-GSM(900)+DCS(1800)+PCS(1900)");
+
+  // Empty the incoming buffer
+  while (Serial.available())
+    Serial.read();
+
+  // Wait for an answer, just look at the first character
+  while (!Serial.available());
+  char c = Serial.read();
+  if (c == '1')
+    newBand = GSM_MODE_EGSM;
+  else if (c == '2')
+    newBand = GSM_MODE_DCS;
+  else if (c == '3')
+    newBand = GSM_MODE_PCS;
+  else if (c == '4')
+    newBand = GSM_MODE_EGSM_DCS;
+  else if (c == '5')
+    newBand = GSM_MODE_GSM850_PCS;
+  else if (c == '6')
+    newBand = GSM_MODE_GSM850_EGSM_DCS_PCS;
   else
-    newBand="GSM_MODE_UNDEFINED";
+    newBand = "GSM_MODE_UNDEFINED";
   return newBand;
 }
 
- 
+
 
 
 

libraries/GSM/examples/Tools/GsmScanNetworks/GsmScanNetworks.ino

@@ -1,23 +1,23 @@
 /*
- 
+
  GSM Scan Networks
- 
+
  This example prints out the IMEI number of the modem,
- then checks to see if it's connected to a carrier. If so, 
+ then checks to see if it's connected to a carrier. If so,
  it prints the phone number associated with the card.
  Then it scans for nearby networks and prints out their signal strengths.
- 
+
  Circuit:
- * GSM shield 
+ * GSM shield
  * SIM card
- 
+
  Created 8 Mar 2012
  by Tom Igoe, implemented by Javier Carazo
  Modified 4 Feb 2013
  by Scott Fitzgerald
- 
+
  http://arduino.cc/en/Tutorial/GSMToolsGsmScanNetworks
- 
+
  This example code is part of the public domain
  */
 
@@ -48,15 +48,15 @@ void setup()
 
   Serial.println("GSM networks scanner");
   scannerNetworks.begin();
-  
+
   // connection state
   boolean notConnected = true;
-  
+
   // Start GSM shield
   // If your SIM has PIN, pass it as a parameter of begin() in quotes
-  while(notConnected)
+  while (notConnected)
   {
-    if(gsmAccess.begin(PINNUMBER)==GSM_READY)
+    if (gsmAccess.begin(PINNUMBER) == GSM_READY)
       notConnected = false;
     else
     {
@@ -64,13 +64,13 @@ void setup()
       delay(1000);
     }
   }
-  
+
   // get modem parameters
   // IMEI, modem unique identifier
   Serial.print("Modem IMEI: ");
   IMEI = modemTest.getIMEI();
-  IMEI.replace("\n","");
-  if(IMEI != NULL)
+  IMEI.replace("\n", "");
+  if (IMEI != NULL)
     Serial.println(IMEI);
 }
 
@@ -79,11 +79,11 @@ void loop()
   // scan for existing networks, displays a list of networks
   Serial.println("Scanning available networks. May take some seconds.");
   Serial.println(scannerNetworks.readNetworks());
-  
-    // currently connected carrier
+
+  // currently connected carrier
   Serial.print("Current carrier: ");
   Serial.println(scannerNetworks.getCurrentCarrier());
-    
+
   // returns strength and ber
   // signal strength in 0-31 scale. 31 means power > 51dBm
   // BER is the Bit Error Rate. 0-7 scale. 99=not detectable

libraries/GSM/examples/Tools/PinManagement/PinManagement.ino

@@ -1,19 +1,19 @@
 /*
- 
- This example enables you to change or remove the PIN number of 
+
+ This example enables you to change or remove the PIN number of
  a SIM card inserted into a GSM shield.
- 
+
  Circuit:
  * GSM shield
  * SIM card
- 
+
  Created 12 Jun 2012
  by David del Peral
- 
- This example code is part of the public domain 
- 
+
+ This example code is part of the public domain
+
  http://arduino.cc/en/Tutorial/GSMToolsPinManagement
- 
+
  */
 
 // libraries
@@ -39,32 +39,32 @@ void setup()
   while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
-  
+
   Serial.println("Change PIN example\n");
   PINManager.begin();
-  
+
   // check if the SIM have pin lock
-  while(!auth){
+  while (!auth) {
     int pin_query = PINManager.isPIN();
-    if(pin_query == 1)
+    if (pin_query == 1)
     {
       // if SIM is locked, enter PIN code
       Serial.print("Enter PIN code: ");
       user_input = readSerial();
       // check PIN code
-      if(PINManager.checkPIN(user_input) == 0)
+      if (PINManager.checkPIN(user_input) == 0)
       {
         auth = true;
         PINManager.setPINUsed(true);
         Serial.println(oktext);
       }
       else
-      {  
+      {
         // if PIN code was incorrected
         Serial.println("Incorrect PIN. Remember that you have 3 opportunities.");
       }
     }
-    else if(pin_query == -1)
+    else if (pin_query == -1)
     {
       // PIN code is locked, user must enter PUK code
       Serial.println("PIN locked. Enter PUK code: ");
@@ -72,7 +72,7 @@ void setup()
       Serial.print("Now, enter a new PIN code: ");
       user_input = readSerial();
       // check PUK code
-      if(PINManager.checkPUK(puk, user_input) == 0)
+      if (PINManager.checkPUK(puk, user_input) == 0)
       {
         auth = true;
         PINManager.setPINUsed(true);
@@ -84,32 +84,32 @@ void setup()
         Serial.println("Incorrect PUK or invalid new PIN. Try again!.");
       }
     }
-    else if(pin_query == -2)
+    else if (pin_query == -2)
     {
       // the worst case, PIN and PUK are locked
       Serial.println("PIN & PUK locked. Use PIN2/PUK2 in a mobile phone.");
-      while(true);
+      while (true);
     }
     else
     {
-      // SIM does not requires authetication 
+      // SIM does not requires authetication
       Serial.println("No pin necessary.");
       auth = true;
     }
   }
-  
+
   // start GSM shield
   Serial.print("Checking register in GSM network...");
-  if(PINManager.checkReg() == 0)
+  if (PINManager.checkReg() == 0)
     Serial.println(oktext);
   // if you are connect by roaming
-  else if(PINManager.checkReg() == 1)
-    Serial.println("ROAMING " + oktext);  
+  else if (PINManager.checkReg() == 1)
+    Serial.println("ROAMING " + oktext);
   else
   {
     // error connection
     Serial.println(errortext);
-    while(true);
+    while (true);
   }
 }
 
@@ -118,19 +118,19 @@ void loop()
   // Function loop implements pin management user menu
   // Only if you SIM use pin lock, you can change PIN code
   // user_op variables save user option
-  
+
   Serial.println("Choose an option:\n1 - On/Off PIN.");
-  if(PINManager.getPINUsed())
+  if (PINManager.getPINUsed())
     Serial.println("2 - Change PIN.");
   String user_op = readSerial();
-  if(user_op == "1")
+  if (user_op == "1")
   {
     Serial.println("Enter your PIN code:");
     user_input = readSerial();
     // activate/deactivate PIN lock
     PINManager.switchPIN(user_input);
   }
-  else if(user_op == "2" & PINManager.getPINUsed())
+  else if (user_op == "2" & PINManager.getPINUsed())
   {
     Serial.println("Enter your actual PIN code:");
     String oldPIN = readSerial();
@@ -152,7 +152,7 @@ void loop()
 String readSerial()
 {
   String text = "";
-  while(1)
+  while (1)
   {
     while (Serial.available() > 0)
     {
@@ -161,7 +161,7 @@ String readSerial()
       {
         return text;
       }
-      if(inChar!='\r')
+      if (inChar != '\r')
         text += inChar;
     }
   }

libraries/GSM/examples/Tools/TestGPRS/TestGPRS.ino

@@ -1,20 +1,20 @@
 /*
- 
+
  This sketch test the GSM shield's ability to connect to a
- GPERS network. It asks for APN information through the 
+ GPERS network. It asks for APN information through the
  serial monitor and tries to connect to arduino.cc.
- 
+
  Circuit:
  * GSM shield attached
  * SIM card with data plan
- 
+
  Created 18 Jun 2012
  by David del Peral
- 
+
  This example code is part of the public domain
- 
+
  http://arduino.cc/en/Tutorial/GSMToolsTestGPRS
- 
+
  */
 
 // libraries
@@ -55,53 +55,53 @@ void setup()
 void loop()
 {
   use_proxy = false;
-  
+
   // start GSM shield
   // if your SIM has PIN, pass it as a parameter of begin() in quotes
   Serial.print("Connecting GSM network...");
-  if(gsmAccess.begin(PINNUMBER)!=GSM_READY)
+  if (gsmAccess.begin(PINNUMBER) != GSM_READY)
   {
     Serial.println(errortext);
-    while(true);
+    while (true);
   }
   Serial.println(oktext);
-  
+
   // read APN introduced by user
   char apn[50];
   Serial.print("Enter your APN: ");
   readSerial(apn);
   Serial.println(apn);
-  
+
   // Read APN login introduced by user
   char login[50];
   Serial.print("Now, enter your login: ");
   readSerial(login);
   Serial.println(login);
-  
+
   // read APN password introduced by user
   char password[20];
   Serial.print("Finally, enter your password: ");
   readSerial(password);
-  
+
   // attach GPRS
   Serial.println("Attaching to GPRS with your APN...");
-  if(gprsAccess.attachGPRS(apn, login, password)!=GPRS_READY)
+  if (gprsAccess.attachGPRS(apn, login, password) != GPRS_READY)
   {
     Serial.println(errortext);
   }
-  else{
-      
+  else {
+
     Serial.println(oktext);
-    
+
     // read proxy introduced by user
     char proxy[100];
     Serial.print("If your carrier uses a proxy, enter it, if not press enter: ");
     readSerial(proxy);
     Serial.println(proxy);
-    
+
     // if user introduced a proxy, asks him for proxy port
     int pport;
-    if(proxy[0] != '\0'){
+    if (proxy[0] != '\0') {
       // read proxy port introduced by user
       char proxyport[10];
       Serial.print("Enter the proxy port: ");
@@ -111,61 +111,61 @@ void loop()
       use_proxy = true;
       Serial.println(proxyport);
     }
-    
+
     // connection with arduino.cc and realize HTTP request
     Serial.print("Connecting and sending GET request to arduino.cc...");
     int res_connect;
-    
+
     // if use a proxy, connect with it
-    if(use_proxy)
+    if (use_proxy)
       res_connect = client.connect(proxy, pport);
     else
       res_connect = client.connect(url, 80);
-    
+
     if (res_connect)
     {
       // make a HTTP 1.0 GET request (client sends the request)
       client.print("GET ");
-      
+
       // if use a proxy, the path is arduino.cc URL
-      if(use_proxy)
+      if (use_proxy)
         client.print(urlproxy);
       else
         client.print(path);
-        
+
       client.println(" HTTP/1.0");
       client.println();
       Serial.println(oktext);
-    } 
+    }
     else
     {
       // if you didn't get a connection to the server
       Serial.println(errortext);
     }
     Serial.print("Receiving response...");
-    
+
     boolean test = true;
-    while(test)
+    while (test)
     {
-      // if there are incoming bytes available 
+      // if there are incoming bytes available
       // from the server, read and check them
       if (client.available())
       {
         char c = client.read();
         response += c;
-        
+
         // cast response obtained from string to char array
-        char responsechar[response.length()+1];
-        response.toCharArray(responsechar, response.length()+1);
-        
+        char responsechar[response.length() + 1];
+        response.toCharArray(responsechar, response.length() + 1);
+
         // if response includes a "200 OK" substring
-        if(strstr(responsechar, "200 OK") != NULL){
+        if (strstr(responsechar, "200 OK") != NULL) {
           Serial.println(oktext);
           Serial.println("TEST COMPLETE!");
           test = false;
         }
       }
-      
+
       // if the server's disconnected, stop the client:
       if (!client.connected())
       {
@@ -184,7 +184,7 @@ void loop()
 int readSerial(char result[])
 {
   int i = 0;
-  while(1)
+  while (1)
   {
     while (Serial.available() > 0)
     {
@@ -194,7 +194,7 @@ int readSerial(char result[])
         result[i] = '\0';
         return 0;
       }
-      if(inChar!='\r')
+      if (inChar != '\r')
       {
         result[i] = inChar;
         i++;

libraries/GSM/examples/Tools/TestModem/TestModem.ino

@@ -1,21 +1,21 @@
 /*
- 
- This example tests to see if the modem of the 
- GSM shield is working correctly. You do not need 
+
+ This example tests to see if the modem of the
+ GSM shield is working correctly. You do not need
  a SIM card for this example.
- 
+
  Circuit:
- * GSM shield attached 
- 
+ * GSM shield attached
+
  Created 12 Jun 2012
  by David del Peral
  modified 21 Nov 2012
  by Tom Igoe
- 
+
  http://arduino.cc/en/Tutorial/GSMToolsTestModem
- 
+
  This sample code is part of the public domain
- 
+
  */
 
 // libraries
@@ -34,10 +34,10 @@ void setup()
   while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
-  
+
   // start modem test (reset and check response)
   Serial.print("Starting modem test...");
-  if(modem.begin()) 
+  if (modem.begin())
     Serial.println("modem.begin() succeeded");
   else
     Serial.println("ERROR, no modem answer.");
@@ -48,9 +48,9 @@ void loop()
   // get modem IMEI
   Serial.print("Checking IMEI...");
   IMEI = modem.getIMEI();
-  
+
   // check IMEI response
-  if(IMEI != NULL)
+  if (IMEI != NULL)
   {
     // show IMEI in serial monitor
     Serial.println("Modem's IMEI: " + IMEI);
@@ -58,7 +58,7 @@ void loop()
     Serial.print("Resetting modem...");
     modem.begin();
     // get and check IMEI one more time
-    if(modem.getIMEI() != NULL)
+    if (modem.getIMEI() != NULL)
     {
       Serial.println("Modem is functoning properly");
     }
@@ -72,6 +72,6 @@ void loop()
     Serial.println("Error: Could not get IMEI");
   }
   // do nothing:
-  while(true);
+  while (true);
 }
 

libraries/GSM/examples/Tools/TestWebServer/TestWebServer.ino

@@ -1,22 +1,22 @@
 /*
   Basic Web Server
- 
+
  A simple web server that replies with nothing, but prints the client's request
  and the server IP address.
 
  Circuit:
  * GSM shield attached
- 
- created 
+
+ created
  by David Cuartielles
  modified 21 Nov 2012
  by Tom Igoe
- 
+
  http://arduino.cc/en/Tutorial/GSMToolsTestWebServer
- 
+
  This example code is part of the public domain
  */
- #include <GSM.h>
+#include <GSM.h>
 
 // PIN Number
 #define PINNUMBER ""
@@ -33,7 +33,7 @@ GSM gsmAccess;     // include a 'true' parameter for debug enabled
 GSMServer server(80); // port 80 (http default)
 
 // timeout
-const unsigned long __TIMEOUT__ = 10*1000;
+const unsigned long __TIMEOUT__ = 10 * 1000;
 
 void setup()
 {
@@ -49,10 +49,10 @@ void setup()
 
   // Start GSM shield
   // If your SIM has PIN, pass it as a parameter of begin() in quotes
-  while(!connected)
+  while (!connected)
   {
-    if((gsmAccess.begin(PINNUMBER)==GSM_READY) &
-        (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD)==GPRS_READY))
+    if ((gsmAccess.begin(PINNUMBER) == GSM_READY) &
+        (gprs.attachGPRS(GPRS_APN, GPRS_LOGIN, GPRS_PASSWORD) == GPRS_READY))
       connected = true;
     else
     {
@@ -72,14 +72,14 @@ void setup()
   Serial.println(LocalIP);
 }
 
-void loop(){
+void loop() {
   GSMClient client = server.available();
-  
- if (client) {
-   if (client.available()) {
-    Serial.write(client.read()); 
-   }
-}
+
+  if (client) {
+    if (client.available()) {
+      Serial.write(client.read());
+    }
+  }
 
 }