Revision 99:514e67a69ad6, committed 2015-02-25

Comitter:

phsfan

Date:

Wed Feb 25 14:34:13 2015 +0000

Parent:

98:1b851249d70b

Commit message:

supported SMS

Changed in this revision

--- a/AbitUSBModem.cpp	Wed Feb 18 15:32:57 2015 +0000
+++ b/AbitUSBModem.cpp	Wed Feb 25 14:34:13 2015 +0000
@@ -34,7 +34,7 @@
 #include "Socket.h"
 
 AbitUSBModem::AbitUSBModem () :
-   m_dongle(),                         // Construct WANDongle: USB interface with two serial channels to the modem (USBSerialStream objects)
+   m_dongle(),                         // Construct AbitUSBModem: USB interface with two serial channels to the modem (USBSerialStream objects)
    m_pppStream((IUSBHostSerial&)m_dongle), // PPP connections are managed via another serial channel.
    m_at(&m_pppStream),                  // Construct ATCommandsInterface with the AT serial channel
    m_sms(&m_at),                       // Construct SMSInterface with the ATCommandsInterface

--- a/sms/SMSInterface.cpp	Wed Feb 18 15:32:57 2015 +0000
+++ b/sms/SMSInterface.cpp	Wed Feb 25 14:34:13 2015 +0000
@@ -33,11 +33,13 @@
 #include <cstring>
 
 #define DEFAULT_TIMEOUT 10000
+#define SHORT_MAIL_CODE "128145000013"
 
 SMSInterface::SMSInterface(ATCommandsInterface* pIf) : m_pIf(pIf), m_msg(NULL), m_maxMsgLength(0), m_msisdn(NULL)
 {
   DBG("registering sms");
   m_pIf->registerEventsHandler(this); //Add us to the unsolicited result codes handlers
+  m_caller[0] = 0;
 }
 
 int SMSInterface::init()
@@ -51,6 +53,12 @@
   {
     return NET_PROTOCOL;
   }
+  //Enable caller id
+  ret = m_pIf->executeSimple("AT#B1", NULL, DEFAULT_TIMEOUT);
+  if(ret != OK)
+  {
+    return NET_PROTOCOL;
+  }
 
   DBG("Initialization done");
   return OK;
@@ -69,7 +77,7 @@
   //Send command
   char cmd[300];
   // set S register
-  strcpy(cmd, "ATS202=128145000013");
+  strcpy(cmd, "ATS202=" SHORT_MAIL_CODE);
   for (int i = 0; i < strlen(message); i ++) {
     std::sprintf(&cmd[strlen(cmd)], "%03d", (unsigned char)message[i]);
   }
@@ -108,6 +116,9 @@
   {
     return NET_INVALID; //Buffer too short
   }
+  if (m_caller[0] == 0) {
+    return NET_INVALID; //No sms
+  }
 
   int ret;
 
@@ -120,7 +131,7 @@
   m_maxMsgLength = maxLength;
 
   DBG("Get SMS");
-  //List command
+  //Show register
   char cmd[32] = "ATS211?";
   ret = m_pIf->execute(cmd, this, NULL, DEFAULT_TIMEOUT);
   if( ret != OK )
@@ -135,7 +146,8 @@
     WARN("State variable is not 'SMS_CMD_PROCESSED' - returning 'NET_EMPTY'");
   }
 
-  m_msisdn[0] = 0;
+  strcpy(m_msisdn, m_caller);
+  m_caller[0] = 0;
   m_state = SMS_IDLE;
 
   return OK;
@@ -147,18 +159,22 @@
   if(m_state == SMS_SEND_CMD_SENT)
   {
     if( strncmp(line, "ALERT", 5) == 0 ) {
-      DBG("SM sent");
+      DBG("SM send ALERT");
       m_state = SMS_CMD_PROCESSED;
     } else
     if( strncmp(line, "BUSY", 5) == 0 ) {
-      DBG("SM sent");
+      DBG("SM send BUSY");
       m_state = SMS_CMD_BUSY;
+    } else
+    if( strncmp(line, "NO CARRIER", 10) == 0 ) {
+      DBG("SM send NO CARRIER");
+      m_state = SMS_IDLE;
     }
   }
   else if(m_state == SMS_GET_CMD_SENT)
   {
-    DBG("Header: %s", line);
-    if( strncmp(line, "128145000013", 12) == 0 ) {
+    DBG("SM recv: %s", line);
+    if( strncmp(line, SHORT_MAIL_CODE, 12) == 0 ) { // light mail code
       int j = 0, c = 0, len = 0;
       for (int i = 12; i < strlen(line); i ++) {
         c = (c * 10) + (line[i] - '0');
@@ -172,6 +188,7 @@
         }
       }
       m_msg[len] = 0;
+      DBG("message '%s'", m_msg);
       m_state = SMS_CMD_PROCESSED;
     }
   }
@@ -227,6 +244,26 @@
 
 /*virtual*/ bool SMSInterface::isATCodeHandled(const char* atCode) //Is this AT code handled
 {
+    if(m_state == SMS_IDLE) {
+        if( strncmp(atCode, "RING", 4) == 0 ) {
+            m_caller[0] = 0;
+            DBG("RING");
+            m_state = SMS_RING;
+        }
+        return true;
+    } else
+    if(m_state == SMS_RING) {
+        if( strncmp(atCode, "ID=", 3) == 0 ) {
+            strncpy(m_caller, &atCode[3], sizeof(m_caller));
+            m_caller[11] = 0;
+            DBG("ID %s", m_caller);
+        } else
+        if( strncmp(atCode, "NO CARRIER", 10) == 0 ) {
+            DBG("NO CARRIER");
+            m_state = SMS_IDLE;
+        }
+        return true;
+    }
     return false;
 }
 

--- a/sms/SMSInterface.h	Wed Feb 18 15:32:57 2015 +0000
+++ b/sms/SMSInterface.h	Wed Feb 25 14:34:13 2015 +0000
@@ -78,8 +78,9 @@
   char* m_msg;
   size_t m_maxMsgLength;
   char* m_msisdn;
+  char m_caller[12];
 
-  enum { SMS_IDLE, SMS_SEND_CMD_SENT, SMS_GET_CMD_SENT, SMS_CMD_BUSY, SMS_CMD_PROCESSED } m_state;
+  enum { SMS_IDLE, SMS_SEND_CMD_SENT, SMS_GET_CMD_SENT, SMS_RING, SMS_CMD_BUSY, SMS_CMD_PROCESSED } m_state;
 };
 
 #endif /* SMSINTERFACE_H_ */

--- a/ussd/USSDInterface.cpp	Wed Feb 18 15:32:57 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,198 +0,0 @@
-/* USSDInterface.cpp */
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#define __DEBUG__ 0
-#ifndef __MODULE__
-#define __MODULE__ "USSDInterface.cpp"
-#endif
-
-#include "core/fwk.h"
-
-#include "USSDInterface.h"
-
-#include <cstdio>
-
-#define DEFAULT_TIMEOUT 10000
-#define USSD_TIMEOUT 15000
-
-USSDInterface::USSDInterface(ATCommandsInterface* pIf) : m_pIf(pIf), m_responseMtx(), m_responseSphre(1), m_result(NULL), m_maxResultLength(0)
-{
-  m_responseSphre.wait(0); //Take ownership of the semaphore
-  DBG("events handler reg ussd");
-  m_pIf->registerEventsHandler(this); //Add us to the unsolicited result codes handlers
-}
-
-int USSDInterface::init()
-{
-  DBG("Initialization done");
-  return OK;
-}
-
-int USSDInterface::send(const char* command, char* result, size_t maxLength)
-{
-  if (strlen(command) > 20) //Prevent buffer overflow XXX shouldn't this be 19 as the AT+CUSD=1,"" is 12
-  {
-    return NET_TOOSMALL;
-  }
-
-  m_responseMtx.lock();
-  m_result = result;
-  m_maxResultLength = maxLength;
-  m_responseMtx.unlock();
-
-  m_responseSphre.wait(0); //Make sure there is not a pending result that needs to be discarded
-
-  DBG("Send USSD command & register for unsolicited result codes");
-  //Send USSD command to the network
-  char cmd[32];
-  std::sprintf(cmd, "AT+CUSD=1,\"%s\"", command);
-  int ret = m_pIf->execute(cmd, this, NULL, DEFAULT_TIMEOUT);
-  if( ret != OK )
-  {
-    return NET_PROTOCOL;
-  }
-  
-  //Did we already get a response (3GPP rev < 6) ?
-
-  //Now wait for response
-  int res = m_responseSphre.wait(USSD_TIMEOUT);
-
-  //Reset data
-  m_responseMtx.lock();
-  m_result = NULL;
-  m_maxResultLength = 0;
-  m_responseMtx.unlock();
-
-  if(res <= 0)
-  {
-    DBG("No result received");
-    ret = m_pIf->executeSimple("AT+CUSD=2", NULL, DEFAULT_TIMEOUT); //Cancel command
-    if( ret != OK )
-    {
-      return NET_PROTOCOL;
-    }
-    return NET_TIMEOUT;
-  }
-
-  DBG("Result received: %s", result);
-
-  return OK;
-}
-
-/*virtual*/ int USSDInterface::onNewATResponseLine(ATCommandsInterface* pInst, const char* line)
-{
-  const char* pSemicol = strchr(line, ':');
-  if( ( (pSemicol - line) != strlen("+CUSD") ) || ( memcmp(line, "+CUSD", strlen("+CUSD")) != 0) )
-  {
-    WARN("Unknown code");
-    return OK;
-  }
-
-  const char* pData = NULL;
-  if( pSemicol != NULL ) //Split the identifier & the result code (if it exists)
-  {
-    pData = pSemicol + 1;
-    if(pData[0]==' ')
-    {
-      pData++; //Suppress whitespace
-    }
-    processResult(pData);
-  }
-  return OK;
-}
-
-/*virtual*/ int USSDInterface::onNewEntryPrompt(ATCommandsInterface* pInst)
-{
-  return OK;
-}
-
-/*virtual*/ bool USSDInterface::isATCodeHandled(const char* atCode) //Is this AT code handled
-{
-  DBG("AT code is %s", atCode);
-  if( strcmp("+CUSD", atCode) == 0 )
-  {
-    return true;
-  }
-
-  DBG("Not handled");
-  return false;
-}
-
-/*virtual*/ void USSDInterface::onDispatchStart()
-{
-
-
-}
-
-/*virtual*/ void USSDInterface::onDispatchStop()
-{
-
-}
-
-/*virtual*/ char* USSDInterface::getEventsEnableCommand()
-{
-  return NULL; //No need to disable events here
-}
-
-/*virtual*/ char* USSDInterface::getEventsDisableCommand()
-{
-  return NULL; //No need to re-enable events here
-}
-
-/*virtual*/ void USSDInterface::onEvent(const char* atCode, const char* evt)
-{
-  if( strcmp("+CUSD", atCode) != 0 )
-  {
-    WARN("Wrong AT Code");
-    return; //Not supported
-  }
-
-  processResult(evt);
-}
-
-void USSDInterface::processResult(const char* data)
-{
-  char* pStart = (char*) strchr(data,'\"');
-  if(pStart==NULL)
-  {
-    WARN("Could not find opening quote");
-    return; //Invalid/incomplete response
-  }
-  pStart++; //Point to first char of response
-  char* pEnd = (char*) strchr(pStart,'\"');
-  if(pEnd==NULL)
-  {
-    WARN("Could not find closing quote");
-    return; //Invalid/incomplete response
-  }
-  m_responseMtx.lock();
-  if(m_maxResultLength == 0) //No pending command
-  {
-    WARN("No pending command");
-    m_responseMtx.unlock();
-    return;
-  }
-  size_t cpyLen = MIN( pEnd - pStart, m_maxResultLength - 1 );
-  DBG("cpyLen: %d",cpyLen);
-  memcpy((void*)m_result, pStart, cpyLen);
-  m_result[cpyLen] = '\0';
-  DBG("Got USSD response: %s", m_result);
-  m_responseMtx.unlock();
-  m_responseSphre.release(); //Signal user thread that response is ready
-}

--- a/ussd/USSDInterface.h	Wed Feb 18 15:32:57 2015 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,80 +0,0 @@
-/* USSDInterface.h */
-/* Copyright (C) 2012 mbed.org, MIT License
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
- * and associated documentation files (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge, publish, distribute,
- * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all copies or
- * substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
- * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
- * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-
-#ifndef USSDINTERFACE_H_
-#define USSDINTERFACE_H_
-
-#include "core/fwk.h"
-
-#include "rtos.h"
-
-#include "at/ATCommandsInterface.h"
-
-/** Component to send/receive Unstructured Supplementary Service Data (USSD)
- *
- */
-class USSDInterface : protected IATCommandsProcessor, IATEventsHandler
-{
-public:
-  /** Create USSDInterface instance
-     @param pIf Pointer to the ATCommandsInterface instance to use
-   */
-  USSDInterface(ATCommandsInterface* pIf);
-
-  /** Initialize interface
-   Configure USSD commands & register for USSD-related unsolicited result codes
-  */
-  int init();
-
-  /** Send a USSD command & wait for its result
-    @param command The command to send
-    @param result Buffer in which to store the result
-    @param maxLength Maximum result length that can be stored in buffer (including null-terminating character)
-    @return 0 on success, error code on failure
-  */
-  int send(const char* command, char* result, size_t maxLength);
-
-protected:
-  //IATCommandsProcessor, needed for implementations of 3GGP standard < r06
-  virtual int onNewATResponseLine(ATCommandsInterface* pInst, const char* line);
-  virtual int onNewEntryPrompt(ATCommandsInterface* pInst);
-  
-  //IATEventsHandler, needed for implementations of 3GGP standard >= r06
-  virtual bool isATCodeHandled(const char* atCode); //Is this AT code handled
-  virtual void onDispatchStart();
-  virtual void onDispatchStop();
-  virtual char* getEventsEnableCommand();
-  virtual char* getEventsDisableCommand();
-  virtual void onEvent(const char* atCode, const char* evt);
-
-private:
-  void processResult(const char* data);
-
-  ATCommandsInterface* m_pIf;
-  Mutex m_responseMtx; //To protect concurrent accesses btw the user's thread and the AT thread
-  Semaphore m_responseSphre;
-
-  //Result
-  volatile char* m_result;
-  volatile size_t m_maxResultLength;
-
-};
-
-
-#endif /* USSDINTERFACE_H_ */