Fix preferred SMS storage for 3G

Version 1.3.3. SMS storage now works properly for 3G.  Also works for
800 and 808. Updated FONA_SMS_Response to work on 3G. Definition of
FONA_PREF_SMS_STORAGE in library is now mandatory.

Adafruit_FONA.cpp

@@ -128,7 +128,7 @@ boolean Adafruit_FONA::begin(Stream &port) {
   }
 
 #if defined(FONA_PREF_SMS_STORAGE)
-  sendCheckReply(F("AT+CPMS=\"" FONA_PREF_SMS_STORAGE "\""), ok_reply);
+    sendCheckReply(F("AT+CPMS=" FONA_PREF_SMS_STORAGE "," FONA_PREF_SMS_STORAGE "," FONA_PREF_SMS_STORAGE), ok_reply);
 #endif
 
   return true;
@@ -471,9 +471,11 @@ int8_t Adafruit_FONA::getNumSMS(void) {
   if (! sendCheckReply(F("AT+CMGF=1"), ok_reply)) return -1;
 
   // ask how many sms are stored
-  if (sendParseReply(F("AT+CPMS?"), F("\"SM\","), &numsms)) 
+  if (sendParseReply(F("AT+CPMS?"), F(FONA_PREF_SMS_STORAGE ","), &numsms)) 
     return numsms;
-  if (sendParseReply(F("AT+CPMS?"), F("\"SM_P\","), &numsms)) 
+  if (sendParseReply(F("AT+CPMS?"), F("\"SM\","), &numsms))
+    return numsms;
+  if (sendParseReply(F("AT+CPMS?"), F("\"SM_P\","), &numsms))
     return numsms;
   return -1;
 }

Adafruit_FONA.h

@@ -32,8 +32,11 @@
 #define FONA3G_A 4
 #define FONA3G_E 5
 
-// Uncomment to changed the preferred SMS storage
-//#define FONA_PREF_SMS_STORAGE "SM"
+// Set the preferred SMS storage.
+//   Use "SM" for storage on the SIM.
+//   Use "ME" for internal storage on the FONA chip
+#define FONA_PREF_SMS_STORAGE "\"SM\""
+//#define FONA_PREF_SMS_STORAGE "\"ME\""
 
 #define FONA_HEADSETAUDIO 0
 #define FONA_EXTAUDIO 1

examples/FONA_SMS_Response/FONA_SMS_Response.ino

@@ -47,7 +47,10 @@ SoftwareSerial *fonaSerial = &fonaSS;
 // Hardware serial is also possible!
 //  HardwareSerial *fonaSerial = &Serial1;
 
+// Use this for FONA 800 and 808s
 Adafruit_FONA fona = Adafruit_FONA(FONA_RST);
+// Use this one for FONA 3G
+//Adafruit_FONA_3G fona = Adafruit_FONA_3G(FONA_RST);
 
 uint8_t readline(char *buff, uint8_t maxbuff, uint16_t timeout = 0);
 
@@ -72,16 +75,19 @@ void setup() {
   if (imeiLen > 0) {
     Serial.print("SIM card IMEI: "); Serial.println(imei);
   }
-
+
+  fonaSerial->print("AT+CNMI=2,1\r\n");  //set up the FONA to send a +CMTI notification when an SMS is received
+
   Serial.println("FONA Ready");
 }
 
 
-char fonaInBuffer[64];          //for notifications from the FONA
+char fonaNotificationBuffer[64];          //for notifications from the FONA
+char smsBuffer[250];
 
 void loop() {
 
-  char* bufPtr = fonaInBuffer;    //handy buffer pointer
+  char* bufPtr = fonaNotificationBuffer;    //handy buffer pointer
 
   if (fona.available())      //any data available from the FONA?
   {
@@ -92,14 +98,14 @@ void loop() {
       *bufPtr = fona.read();
       Serial.write(*bufPtr);
       delay(1);
-    } while ((*bufPtr++ != '\n') && (fona.available()) && (++charCount < (sizeof(fonaInBuffer)-1)));
+    } while ((*bufPtr++ != '\n') && (fona.available()) && (++charCount < (sizeof(fonaNotificationBuffer)-1)));
 
     //Add a terminal NULL to the notification string
     *bufPtr = 0;
-    
+
     //Scan the notification string for an SMS received notification.
     //  If it's an SMS message, we'll get the slot number in 'slot'
-    if (1 == sscanf(fonaInBuffer, "+CMTI: \"SM\",%d", &slot)) {
+    if (1 == sscanf(fonaNotificationBuffer, "+CMTI: " FONA_PREF_SMS_STORAGE ",%d", &slot)) {
       Serial.print("slot: "); Serial.println(slot);
 
       char callerIDbuffer[32];  //we'll store the SMS sender number in here
@@ -109,7 +115,13 @@ void loop() {
         Serial.println("Didn't find SMS message in slot!");
       }
       Serial.print(F("FROM: ")); Serial.println(callerIDbuffer);
-
+
+        // Retrieve SMS value.
+        uint16_t smslen;
+        if (fona.readSMS(slot, smsBuffer, 250, &smslen)) { // pass in buffer and max len!
+          Serial.println(smsBuffer);
+        }
+
       //Send back an automatic response
       Serial.println("Sending reponse...");
       if (!fona.sendSMS(callerIDbuffer, "Hey, I got your text!")) {
@@ -124,7 +136,8 @@ void loop() {
       if (fona.deleteSMS(slot)) {
         Serial.println(F("OK!"));
       } else {
-        Serial.println(F("Couldn't delete"));
+        Serial.print(F("Couldn't delete SMS in slot ")); Serial.println(slot);
+        fona.print(F("AT+CMGD=?\r\n"));
       }
     }
   }