GSM: Backported library from IDE 1.5.x

Fixes #2343

Author: cmaglie

build/shared/revisions.txt

@@ -1,4 +1,9 @@
 
+ARDUINO 1.0.7
+
+[libraries]
+* Backported GSM from IDE 1.5.x
+
 ARDUINO 1.0.6 - 2014.09.16
 
 [core]

libraries/GSM/GSM3ShieldV1AccessProvider.cpp

@@ -6,8 +6,8 @@
 #define __TOUTMODEMCONFIGURATION__ 5000//equivalent to 30000 because of time in interrupt routine.
 #define __TOUTAT__ 1000
 
-char _command_AT[] PROGMEM = "AT";
-char _command_CGREG[] PROGMEM = "AT+CGREG?";
+const char _command_AT[] PROGMEM = "AT";
+const char _command_CGREG[] PROGMEM = "AT+CGREG?";
 
 
 GSM3ShieldV1AccessProvider::GSM3ShieldV1AccessProvider(bool debug)

libraries/GSM/GSM3ShieldV1BaseProvider.cpp

@@ -12,7 +12,7 @@ int GSM3ShieldV1BaseProvider::ready()
 	return theGSM3ShieldV1ModemCore.getCommandError();
 };
 
-void GSM3ShieldV1BaseProvider::prepareAuxLocate(PROGMEM prog_char str[], char auxLocate[])
+void GSM3ShieldV1BaseProvider::prepareAuxLocate(PGM_P str, char auxLocate[])
 {
 	int i=0;
 	char c;

libraries/GSM/GSM3ShieldV1BaseProvider.h

@@ -54,7 +54,7 @@ class GSM3ShieldV1BaseProvider
 		@param str			PROGMEN
 		@param auxLocate	Buffer where to locate strings
 	*/
-	void prepareAuxLocate(PROGMEM prog_char str[], char auxLocate[]);
+	void prepareAuxLocate(PGM_P str, char auxLocate[]);
 
 	/** Manages modem response
 		@param from 		Initial byte of buffer
@@ -70,4 +70,4 @@ class GSM3ShieldV1BaseProvider
 
 };
 
-#endif
+#endif

libraries/GSM/GSM3ShieldV1DataNetworkProvider.cpp

@@ -1,8 +1,8 @@
 #include <GSM3ShieldV1DataNetworkProvider.h>
 #include <Arduino.h>
 
-char _command_CGATT[] PROGMEM = "AT+CGATT=";
-char _command_SEPARATOR[] PROGMEM = "\",\"";
+const char _command_CGATT[] PROGMEM = "AT+CGATT=";
+const char _command_SEPARATOR[] PROGMEM = "\",\"";
 
 //Attach GPRS main function.	
 GSM3_NetworkStatus_t GSM3ShieldV1DataNetworkProvider::attachGPRS(char* apn, char* user_name, char* password, bool synchronous)

libraries/GSM/GSM3ShieldV1ModemCore.cpp

@@ -75,7 +75,7 @@ void GSM3ShieldV1ModemCore::closeCommand(int code)
 }
 
 //Generic command (stored in flash).
-void GSM3ShieldV1ModemCore::genericCommand_rq(PROGMEM prog_char str[], bool addCR)
+void GSM3ShieldV1ModemCore::genericCommand_rq(PGM_P str, bool addCR)
 {
 	theBuffer().flush();
 	writePGM(str, addCR);	
@@ -157,7 +157,7 @@ void GSM3ShieldV1ModemCore::openCommand(GSM3ShieldV1BaseProvider* provider, GSM3
 
 };
 
-size_t GSM3ShieldV1ModemCore::writePGM(PROGMEM prog_char str[], bool CR)
+size_t GSM3ShieldV1ModemCore::writePGM(PGM_P str, bool CR)
 {
 	int i=0;
 	char c;

libraries/GSM/GSM3ShieldV1ModemCore.h

@@ -167,7 +167,7 @@ class GSM3ShieldV1ModemCore : public GSM3SoftSerialMgr, public Print
 			@param CR			Carriadge return adding automatically
 			@return size
 		 */
-		virtual size_t writePGM(PROGMEM prog_char str[], bool CR=true);
+		virtual size_t writePGM(PGM_P str, bool CR=true);
 
 		/** Establish debug mode
 			@param db			Boolean that indicates debug on or off
@@ -182,24 +182,18 @@ class GSM3ShieldV1ModemCore : public GSM3SoftSerialMgr, public Print
 		 */		
 		bool genericParse_rsp(bool& rsp, char* string=0, char* string2=0);
 
-		/** Generates a generic AT command request from PROGMEM prog_char buffer
+		/** Generates a generic AT command request from PROGMEM buffer
 			@param str			Buffer with AT command
 			@param addCR		Carriadge return adding automatically
 		 */
-		void genericCommand_rq(PROGMEM prog_char str[], bool addCR=true);
+		void genericCommand_rq(PGM_P str, bool addCR=true);
 
 		/** Generates a generic AT command request from a simple char buffer
 			@param str			Buffer with AT command
 			@param addCR		Carriadge return adding automatically
 		 */
 		void genericCommand_rqc(const char* str, bool addCR=true);		
 
-		/** Generates a generic AT command request from characters buffer
-			@param str			Buffer with AT command
-			@param addCR		Carriadge return adding automatically
-		 */
-		void genericCommand_rq(const char* str, bool addCR=true);		
-		
 		/** Returns the circular buffer
 			@return circular buffer
 		 */
@@ -257,4 +251,4 @@ class GSM3ShieldV1ModemCore : public GSM3SoftSerialMgr, public Print
 
 extern GSM3ShieldV1ModemCore theGSM3ShieldV1ModemCore;
 
-#endif
+#endif

libraries/GSM/GSM3ShieldV1ModemVerification.cpp

@@ -69,7 +69,7 @@ String GSM3ShieldV1ModemVerification::getIMEI()
 	modemResponse.toCharArray(res_to_compare, modemResponse.length());
 	if(strstr(res_to_compare,"OK") == NULL)
 	{	
-		return NULL;
+		return String(NULL);
 	}
 	else
 	{

libraries/GSM/GSM3ShieldV1MultiClientProvider.cpp

@@ -1,7 +1,7 @@
 #include <GSM3ShieldV1MultiClientProvider.h>
 #include <GSM3ShieldV1ModemCore.h>
 
-char _command_MultiQISRVC[] PROGMEM = "AT+QISRVC=";
+const char _command_MultiQISRVC[] PROGMEM = "AT+QISRVC=";
 
 #define __TOUTFLUSH__ 10000
 

libraries/GSM/GSM3ShieldV1MultiServerProvider.cpp

@@ -4,7 +4,7 @@
 
 #define __NCLIENTS_MAX__ 3
 
-char _command_QILOCIP[] PROGMEM = "AT+QILOCIP";
+const char _command_QILOCIP[] PROGMEM = "AT+QILOCIP";
 
 GSM3ShieldV1MultiServerProvider::GSM3ShieldV1MultiServerProvider()
 {

libraries/GSM/GSM3ShieldV1ScanNetworks.cpp

@@ -63,7 +63,7 @@ String GSM3ShieldV1ScanNetworks::getCurrentCarrier()
 		String final_result = ptr_token;
 		return final_result;
 	}else{
-		return NULL;
+		return String(NULL);
 	}
 }
 
@@ -82,7 +82,7 @@ String GSM3ShieldV1ScanNetworks::getSignalStrength()
 		final_result.trim();
 		return final_result;
 	}else{
-		return NULL;
+		return String(NULL);
 	}
 }
 

libraries/GSM/examples/GsmWebClient/GsmWebClient.ino

@@ -1,19 +1,19 @@
 /*
   Web client
- 
+
  This sketch connects to a website through a GSM shield. Specifically,
- this example downloads the URL "http://arduino.cc/asciilogo.txt" and 
+ this example downloads the URL "http://arduino.cc/asciilogo.txt" and
  prints it to the Serial monitor.
- 
+
  Circuit:
  * GSM shield attached to an Arduino
  * SIM card with a data plan
- 
+
  created 8 Mar 2012
  by Tom Igoe
- 
+
  http://arduino.cc/en/Tutorial/GSMExamplesWebClient
- 
+
  */
 
 // libraries
@@ -30,7 +30,7 @@
 // initialize the library instance
 GSMClient client;
 GPRS gprs;
-GSM gsmAccess; 
+GSM gsmAccess;
 
 // URL, path & port (for example: arduino.cc)
 char server[] = "arduino.cc";
@@ -51,10 +51,10 @@ void setup()
 
   // After starting the modem with GSM.begin()
   // attach the shield to the GPRS network with the APN, login and password
-  while(notConnected)
+  while (notConnected)
   {
-    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))
       notConnected = false;
     else
     {
@@ -77,7 +77,7 @@ void setup()
     client.println(server);
     client.println("Connection: close");
     client.println();
-  } 
+  }
   else
   {
     // if you didn't get a connection to the server:
@@ -87,7 +87,7 @@ void setup()
 
 void loop()
 {
-  // if there are incoming bytes available 
+  // if there are incoming bytes available
   // from the server, read them and print them:
   if (client.available())
   {
@@ -103,7 +103,7 @@ void loop()
     client.stop();
 
     // do nothing forevermore:
-    for(;;)
+    for (;;)
       ;
   }
 }

libraries/GSM/examples/GsmWebServer/GsmWebServer.ino

@@ -1,13 +1,13 @@
 /*
  GSM Web Server
- 
+
  A simple web server that shows the value of the analog input pins.
  using a GSM shield.
 
  Circuit:
  * GSM shield attached
  * Analog inputs attached to pins A0 through A5 (optional)
- 
+
  created 8 Mar 2012
  by Tom Igoe
  */
@@ -30,7 +30,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()
 {
@@ -39,29 +39,29 @@ void setup()
   while (!Serial) {
     ; // wait for serial port to connect. Needed for Leonardo only
   }
-  
+
   // 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) &
-        (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))
       notConnected = false;
     else
     {
       Serial.println("Not connected");
       delay(1000);
     }
   }
-  
+
   Serial.println("Connected to GPRS network");
-  
+
   // start server
   server.begin();
-  
+
   //Get IP.
   IPAddress LocalIP = gprs.getIPAddress();
   Serial.println("Server IP address=");
@@ -77,21 +77,21 @@ void loop() {
 
 
   if (client)
-  {  
+  {
     while (client.connected())
     {
       if (client.available())
       {
         Serial.println("Receiving request!");
         bool sendResponse = false;
-        while(char c=client.read()) {
+        while (char c = client.read()) {
           if (c == '\n') sendResponse = true;
         }
 
-     // if you've gotten to the end of the line (received a newline
-     // character) 
-       if (sendResponse)
-       {
+        // if you've gotten to the end of the line (received a newline
+        // character)
+        if (sendResponse)
+        {
           // send a standard http response header
           client.println("HTTP/1.1 200 OK");
           client.println("Content-Type: text/html");
@@ -103,7 +103,7 @@ void loop() {
             client.print(analogChannel);
             client.print(" is ");
             client.print(analogRead(analogChannel));
-            client.println("<br />");       
+            client.println("<br />");
           }
           client.println("</html>");
           //necessary delay