Merge pull request #132 from mazgch/master

Detection of modem when using serial port, CDMA version of linkmonitor

Author: bogdanm

libraries/net/cellular/CellularModem/link/LinkMonitor.cpp

@@ -33,20 +33,24 @@ using std::sscanf;
 
 LinkMonitor::LinkMonitor(ATCommandsInterface* pIf) : m_pIf(pIf), m_rssi(0), m_registrationState(REGISTRATION_STATE_UNKNOWN), m_bearer(BEARER_UNKNOWN)
 {
-
+  m_gsm = true;
 }
 
-int LinkMonitor::init()
+int LinkMonitor::init(bool gsm)
 {
-  // we need to make sure that we setup the operator selection to be in 'numeric' format.
-  // i.e. it is made up of a network and country code when returned by the modem e.g. Operator = 23415. This allows easy logic parsing for
-  // setting up other network parameters in future.
-  DBG("LinkMonitor::init() being called. This should only happen once: executinging AT+COPS=0,2");  
-  int ret = m_pIf->executeSimple("AT+COPS=0,2", NULL, DEFAULT_TIMEOUT); //Configure to set the operator string to Country Code and mobile network code
-  if(ret != OK)
+  m_gsm = gsm;
+  if (m_gsm)
   {
-    WARN(" NET_PROTOCOL error from sending the AT+COPS command to the modem. ");
-    return NET_PROTOCOL;
+    // we need to make sure that we setup the operator selection to be in 'numeric' format.
+    // i.e. it is made up of a network and country code when returned by the modem e.g. Operator = 23415. This allows easy logic parsing for
+    // setting up other network parameters in future.
+    DBG("LinkMonitor::init() being called. This should only happen once: executinging AT+COPS=0,2");  
+    int ret = m_pIf->executeSimple("AT+COPS=0,2", NULL, DEFAULT_TIMEOUT); //Configure to set the operator string to Country Code and mobile network code
+    if(ret != OK)
+    {
+      WARN(" NET_PROTOCOL error from sending the AT+COPS command to the modem. ");
+      return NET_PROTOCOL;
+    }
   }
   return OK;
 }
@@ -136,7 +140,7 @@ int LinkMonitor::getState(int* pRssi, REGISTRATION_STATE* pRegistrationState, BE
   m_rssi = 0;
   m_registrationState = REGISTRATION_STATE_UNKNOWN;
   m_bearer = BEARER_UNKNOWN;
-  int ret = m_pIf->execute("AT+CREG?;+COPS?;+CSQ", this, NULL, DEFAULT_TIMEOUT); //Configure to get registration info & get it; get signal quality
+  int ret = m_pIf->execute(m_gsm ? "AT+CREG?;+COPS?;+CSQ" : "AT+CREG?;+CSQ", this, NULL, DEFAULT_TIMEOUT); //Configure to get registration info & get it; get signal quality
   if(ret != OK)
   {
     return NET_PROTOCOL;

libraries/net/cellular/CellularModem/link/LinkMonitor.h

@@ -39,7 +39,7 @@ class LinkMonitor : protected IATCommandsProcessor
 
   /** Initialize monitor
    */
-  int init();
+  int init(bool gsm = true);
 
   /** Registration State
   */  
@@ -82,6 +82,7 @@ class LinkMonitor : protected IATCommandsProcessor
   ATCommandsInterface* m_pIf;
 
   int m_rssi;
+  bool m_gsm;
   REGISTRATION_STATE m_registrationState;
   BEARER m_bearer;
 

libraries/net/cellular/UbloxUSBModem/UbloxModem.cpp

@@ -45,6 +45,36 @@ UbloxModem::UbloxModem(IOStream* atStream, IOStream* pppStream) :
 {
 }
 
+
+class AtiProcessor : public IATCommandsProcessor
+{
+public:
+  AtiProcessor()
+  { 
+    i = 0; 
+    str[0] = '\0'; 
+  }
+  const char* getInfo(void) { return str; }
+private:
+  virtual int onNewATResponseLine(ATCommandsInterface* pInst, const char* line)
+  {
+    int l = strlen(line);
+    if (i + l + 2 > sizeof(str))
+        return NET_OVERFLOW;
+    if (i) str[i++] = ',';
+    strcat(&str[i], line);
+    i += l;
+    return OK;
+  }
+  virtual int onNewEntryPrompt(ATCommandsInterface* pInst)
+  {
+    return OK;
+  }
+protected:
+  char str[256];
+  int i;
+};
+
 class CREGProcessor : public IATCommandsProcessor
 {
 public:
@@ -309,6 +339,22 @@ int UbloxModem::init()
   }
 
   ATCommandsInterface::ATResult result;
+  AtiProcessor atiProcessor;
+  do
+  {
+    ret = m_at.execute("ATI", &atiProcessor, &result);
+  }
+  while (ret != OK);
+  {
+    const char* info = atiProcessor.getInfo();
+    DBG("Modem Identification [%s]", info);
+    if (strstr(info, "LISA-C200"))
+    {
+        m_gsm = false;    // it is CDMA modem
+        m_onePort = true; // force use of only one port
+    }
+  }
+  
   CREGProcessor cregProcessor(m_gsm);
   //Wait for network registration
   do
@@ -393,6 +439,7 @@ int UbloxModem::getLinkState(int* pRssi, LinkMonitor::REGISTRATION_STATE* pRegis
   if(!m_linkMonitorInit)
   {
     ret = m_linkMonitor.init();
+    ret = m_linkMonitor.init(m_gsm);
     if(ret)
     {
       return ret;