Revision 3:52c6ebd1c8ee, committed 2019-09-17

Comitter:

vikshin

Date:

Tue Sep 17 00:58:54 2019 +0000

Parent:

2:957b12467039

Commit message:

Initial release

Changed in this revision

--- a/main.cpp	Mon Mar 25 07:52:59 2019 +0000
+++ b/main.cpp	Tue Sep 17 00:58:54 2019 +0000
@@ -19,7 +19,6 @@
  *
  */
 
-
 #include <string>
 #include "mbed.h"
 
@@ -31,22 +30,22 @@
 #define OFF                         0
 
 #define MAX_BUF_SIZE                1024
+#define AMM592_DEFAULT_TIMEOUT        1000
+#define AM592_APN_PROTOCOL_IPv4      1
+#define AM592_APN_PROTOCOL_IPv6      2
+#define AM592_DEFAULT_TIMEOUT        1000
+#define AM592_CONNECT_TIMEOUT        15000
+#define AM592_SEND_TIMEOUT           500
+#define AM592_RECV_TIMEOUT           500
 
-#define BG96_APN_PROTOCOL_IPv4      1
-#define BG96_APN_PROTOCOL_IPv6      2
-#define BG96_DEFAULT_TIMEOUT        1000
-#define BG96_CONNECT_TIMEOUT        15000
-#define BG96_SEND_TIMEOUT           500
-#define BG96_RECV_TIMEOUT           500
-
-#define BG96_APN_PROTOCOL           BG96_APN_PROTOCOL_IPv6
-#define BG96_DEFAULT_BAUD_RATE      115200
-#define BG96_PARSER_DELIMITER       "\r\n"
+#define AM592_APN_PROTOCOL           AM592_APN_PROTOCOL_IPv6
+#define AM592_DEFAULT_BAUD_RATE      115200
+#define AM592_PARSER_DELIMITER       "\r\n"
 
 #define CATM1_APN_SKT               "lte-internet.sktelecom.com"
 
-#define CATM1_DEVICE_NAME_BG96      "BG96"
-#define DEVNAME                     CATM1_DEVICE_NAME_BG96
+#define CATM1_DEVICE_NAME_AM592      "AM592"
+#define DEVNAME                     CATM1_DEVICE_NAME_AM592
 
 #define devlog(f_, ...)             if(CATM1_DEVICE_DEBUG == DEBUG_ENABLE) { pc.printf("\r\n[%s] ", DEVNAME);  pc.printf((f_), ##__VA_ARGS__); }
 #define myprintf(f_, ...)           {pc.printf("\r\n[MAIN] ");  pc.printf((f_), ##__VA_ARGS__);}
@@ -63,37 +62,30 @@
 #define MBED_CONF_IOTSHIELD_SENSOR_TEMP             A1
 
 /* Debug message settings */
-#define BG96_PARSER_DEBUG           DEBUG_DISABLE
+#define AM592_PARSER_DEBUG           DEBUG_DISABLE
 #define CATM1_DEVICE_DEBUG          DEBUG_ENABLE 
 
 // Functions: Module Status
 void waitCatM1Ready(void);
-int8_t setEchoStatus_BG96(bool onoff);
-int8_t getUsimStatus_BG96(void);
-int8_t getNetworkStatus_BG96(void);
-int8_t checknSetApn_BG96(const char * apn);
-int8_t getFirmwareVersion_BG96(char * version);
-
-// Functions: PDP context
-int8_t setContextActivate_BG96(void);   // Activate a PDP Context
-int8_t setContextDeactivate_BG96(void); // Deactivate a PDP Context
-int8_t getIpAddress_BG96(char * ipstr);
+int8_t setEchoStatus_AM592(int onoff);
+int8_t getUsimStatus_AM592(void);
+int8_t getNetworkStatus_AM592(void);
+int8_t checknSetApn_AM592(const char * apn);
 
 // Functions: Ping test
-void printPingToHost_BG96(char * host, int timeout, int pingnum);
+void printPingToHost_AM592(char * host, int pingnum);
 
 // Example: Ping destinations
-char ping_dest_1st[] = "8.8.8.8";
-char ping_dest_2nd[] = "www.google.com";
-
+char ping_dest_1st[] = "2001:4860:4860::8888";
+char ping_dest_2nd[] = "ipv6.google.com";
 
 Serial pc(USBTX, USBRX);    // USB debug
 
 UARTSerial *_serial;        // Cat.M1 module    
 ATCmdParser *_parser;
 
-DigitalOut _RESET_BG96(MBED_CONF_IOTSHIELD_CATM1_RESET);
-DigitalOut _PWRKEY_BG96(MBED_CONF_IOTSHIELD_CATM1_PWRKEY);
+DigitalOut _RESET_AM592(MBED_CONF_IOTSHIELD_CATM1_RESET);
+DigitalOut _PWRKEY_AM592(MBED_CONF_IOTSHIELD_CATM1_PWRKEY);
 
 void serialPcInit(void)
 {
@@ -111,30 +103,30 @@
     _parser = new ATCmdParser(_serial);    
     _parser->debug_on(debug_en);
     _parser->set_delimiter(delimiter);    
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+    _parser->set_timeout(AM592_DEFAULT_TIMEOUT);
 }
 
 void catm1DeviceInit(void)
 {
     serialDeviceInit(   MBED_CONF_IOTSHIELD_CATM1_TX, 
                         MBED_CONF_IOTSHIELD_CATM1_RX, 
-                        BG96_DEFAULT_BAUD_RATE);
+                        AM592_DEFAULT_BAUD_RATE);
                         
-    serialAtParserInit( BG96_PARSER_DELIMITER, 
-                        BG96_PARSER_DEBUG);
+    serialAtParserInit( AM592_PARSER_DELIMITER, 
+                        AM592_PARSER_DEBUG);
 }
 
-void catm1DeviceReset_BG96(void)
+void catm1DeviceReset_AM592(void)
 {
-    _RESET_BG96 = 1;
-    _PWRKEY_BG96 = 1;
+    _RESET_AM592 = 1;
+    _PWRKEY_AM592 = 1;
     wait_ms(300);
     
-    _RESET_BG96 = 0;
-    _PWRKEY_BG96 = 0;
+    _RESET_AM592 = 0;
+    _PWRKEY_AM592 = 0;
     wait_ms(400);
     
-    _RESET_BG96 = 1;    
+    _RESET_AM592 = 1;    
     wait_ms(1000);
 }
 
@@ -149,40 +141,38 @@
     
     myprintf("Waiting for Cat.M1 Module Ready...\r\n");
     
-    catm1DeviceReset_BG96();
+    catm1DeviceReset_AM592();
+    
+    wait_ms(5000);
     
     waitCatM1Ready();
-    
-    wait_ms(5000);
             
     myprintf("System Init Complete\r\n");
         
     myprintf("WIZnet IoT Shield for Arm MBED");
     myprintf("LTE Cat.M1 Version");
     myprintf("=================================================");
-    myprintf(">> Target Board: WIoT-QC01 (Quectel BG96)");
+    myprintf(">> Target Board: WIoT-AM01 (AM Telecom AMM592)");
     myprintf(">> Sample Code: Ping Test");
     myprintf("=================================================\r\n");
     
-    setEchoStatus_BG96(OFF);
+    setEchoStatus_AM592(0);
    
-    getUsimStatus_BG96();
+    getUsimStatus_AM592();
     
-    getNetworkStatus_BG96();
+    getNetworkStatus_AM592();
     
-    checknSetApn_BG96(CATM1_APN_SKT);
-    
-    setContextActivate_BG96();  
+    checknSetApn_AM592(CATM1_APN_SKT);
+
     
     myprintf("[Ping] Host: %s\r\n", ping_dest_1st);
-    printPingToHost_BG96(ping_dest_1st, 2, 4);    
+    printPingToHost_AM592(ping_dest_1st, 4);    
     
     wait_ms(2000);
     
     myprintf("[Ping] Host: %s\r\n", ping_dest_2nd);
-    printPingToHost_BG96(ping_dest_2nd, 2, 4);
-        
-    setContextDeactivate_BG96(); 
+    printPingToHost_AM592(ping_dest_2nd, 4);
+
 }
 
 // ----------------------------------------------------------------
@@ -193,20 +183,20 @@
 {
     while(1) 
     {   
-        if(_parser->recv("RDY")) 
+        if(_parser->recv("@NOTI:34,AMT_BOOT_ALERT") && _parser->recv("@NETSTI:3") ) 
         {
-            myprintf("BG96 ready\r\n");
+            myprintf("AM592 ready\r\n");
             return ;
         }
         else if(_parser->send("AT") && _parser->recv("OK"))
         {
-            myprintf("BG96 already available\r\n");
+            myprintf("AM592 already available\r\n");
             return ;
         }        
     }        
 }
 
-int8_t setEchoStatus_BG96(bool onoff)
+int8_t setEchoStatus_AM592(int onoff)
 {
     int8_t ret = RET_NOK;
     char _buf[10];        
@@ -222,7 +212,7 @@
     return ret;
 }
  
-int8_t getUsimStatus_BG96(void)
+int8_t getUsimStatus_AM592(void)
 {
     int8_t ret = RET_NOK;
     
@@ -236,154 +226,55 @@
     return ret;
 }
 
-int8_t getNetworkStatus_BG96(void)
+int8_t getNetworkStatus_AM592(void)
 {
     int8_t ret = RET_NOK;    
+    bool cereg = false, nsi = false;
+    int n, stat;
+
+    if(_parser->send("AT+CEREG?") && _parser->recv("+CEREG: %d, %d", &n, &stat) && _parser->recv("OK")){
+        if ((n==0 || n==1) && stat==1){
+            cereg = true;
+        }
+    }
     
-    if(_parser->send("AT+QCDS") && _parser->recv("+QCDS: \"SRV\"") && _parser->recv("OK")) {
+    if(_parser->send("AT@NSI") && _parser->recv("@NSI:%d,\"IN SRV\"") && _parser->recv("OK")) {
         devlog("Network Status: attached\r\n");
-        ret = RET_OK;
-    } else if (_parser->send("AT+QCDS") && _parser->recv("+QCDS: \"LIMITED\"") && _parser->recv("OK")) {
+        nsi = true;
+    } else if (_parser->send("AT@NSI") && _parser->recv("@NSI: \"LIMITED\"") && _parser->recv("OK")) {
         devlog("Network Status: limited\r\n");
-        ret = RET_OK;    
+        nsi = true;    
     } else { 
         devlog("Network Status: Error\r\n");        
     }
+    
+    if (cereg && nsi){
+        ret = RET_OK;
+    }
     return ret;
 }
 
-int8_t checknSetApn_BG96(const char * apn) // Configure Parameters of a TCP/IP Context
+int8_t checknSetApn_AM592(const char * apn) // Configure Parameters of a TCP/IP Context
 {       
-    char resp_str[100];
-    
-    uint16_t i = 0;
-    char * search_pt;
-    
-    memset(resp_str, 0, sizeof(resp_str));
-    
-    devlog("Checking APN...\r\n");
-    
-    _parser->send("AT+QICSGP=1");
-    
-    while(1)
-    {
-        _parser->read(&resp_str[i++], 1);        
-        search_pt = strstr(resp_str, "OK\r\n");
-        if (search_pt != 0)
-        {
-            break;
-        }
-    }
-    
-    search_pt = strstr(resp_str, apn);
-    if (search_pt == 0)
-    {
-        devlog("Mismatched APN: %s\r\n", resp_str);
-        devlog("Storing APN %s...\r\n", apn);
-        if(!(_parser->send("AT+QICSGP=1,%d,\"%s\",\"\",\"\",0", BG96_APN_PROTOCOL, apn) && _parser->recv("OK")))
-        {
-            return RET_NOK; // failed
-        }
-    }    
-    devlog("APN Check Done\r\n");
-        
-    return RET_OK;
-}
-
-int8_t getFirmwareVersion_BG96(char * version)
-{
+    bool cgdccont = false, cgatt = false;
     int8_t ret = RET_NOK;
     
-    if(_parser->send("AT+QGMR") && _parser->recv("%s\n", version) && _parser->recv("OK"))
-    {           
-        ret = RET_OK;
-    } 
-    return ret;
-}
-
-int8_t getImeiNumber_BG96(char * imei)
-{
-    int8_t ret = RET_NOK;    
-    
-    if(_parser->send("AT+CGSN") && _parser->recv("%s\n", imei) && _parser->recv("OK"))
-    { 
-        ret = RET_OK;
-    } 
-    return ret;
-}
-
-// ----------------------------------------------------------------
-// Functions: Cat.M1 DNS
-// ----------------------------------------------------------------
-
-int8_t getIpAddressByName_BG96(const char * name, char * ipstr)
-{
-    char buf2[50];
-    bool ok;
-    int  err, ipcount, dnsttl;
-
-    int8_t ret = RET_NOK;
-
-    ok = ( _parser->send("AT+QIDNSGIP=1,\"%s\"", name)
-            && _parser->recv("OK") 
-            && _parser->recv("+QIURC: \"dnsgip\",%d,%d,%d", &err, &ipcount, &dnsttl) 
-            && err==0 
-            && ipcount > 0
-        ); 
+    devlog("Checking APN...\r\n");
+    //APN setting
+    if (_parser->send("AT+CGDCONT=1,\"IPV4V6\",\"%s\"", apn) && _parser->recv("OK")){
+        cgdccont = true;
+    }
+    //Attach setting
+    if (_parser->send("AT+CGATT?") && _parser->recv("+CGATT: 1") &&_parser->recv("OK")){
+        cgatt = true;
+    }
 
-    if( ok ) {        
-        _parser->recv("+QIURC: \"dnsgip\",\"%[^\"]\"", ipstr);       //use the first DNS value
-        for( int i=0; i<ipcount-1; i++ )
-            _parser->recv("+QIURC: \"dnsgip\",\"%[^\"]\"", buf2);   //and discrard the rest  if >1 
-            
-        ret = RET_OK;    
-    }        
-    return ret;           
-}
-
-// ----------------------------------------------------------------
-// Functions: Cat.M1 PDP context activate / deactivate
-// ----------------------------------------------------------------
-
-int8_t setContextActivate_BG96(void) // Activate a PDP Context
-{
-    int8_t ret = RET_NOK;
-    
-    _parser->send("AT+QIACT=1");    
-    if(_parser->recv("OK")) {
-        devlog("Activate a PDP Context\r\n");
+    if (cgdccont && cgatt){
         ret = RET_OK;
-    } else { 
-        devlog("PDP Context Activation failed\r\n");        
     }
-    return ret;
-}
 
-int8_t setContextDeactivate_BG96(void) // Deactivate a PDP Context
-{
-    int8_t ret = RET_NOK;
-    
-    _parser->send("AT+QIDEACT=1");    
-    if(_parser->recv("OK")) {
-        devlog("Deactivate a PDP Context\r\n");
-        ret = RET_OK;
-    } else { 
-        devlog("PDP Context Deactivation failed\r\n");        
-    }
-    return ret;
-}
-
-
-int8_t getIpAddress_BG96(char * ipstr) // IPv4 or IPv6
-{
-    int8_t ret = RET_NOK;    
-    int id, state, type; // not used    
-
-    _parser->send("AT+QIACT?");
-    if(_parser->recv("+QIACT: %d,%d,%d,\"%[^\"]\"", &id, &state, &type, ipstr)
-        && _parser->recv("OK")) {        
-        ret = RET_OK;
-    } 
+    devlog("APN Check Done\r\n");
+        
     return ret;
 }
 
@@ -391,31 +282,27 @@
 // Functions: Cat.M1 Ping test
 // ----------------------------------------------------------------
 
-void printPingToHost_BG96(char * host, int timeout, int pingnum)
+void printPingToHost_AM592(char * host, int pingnum)
 {   
-    int i;
-    char resp_str[50] = {0, };
-    
-    if((timeout < 1) || (timeout > 255)) {
-        devlog("Ping timeout range is 1-255, and the default value is 4 (unit: sec)\r\n");
-        return;
-    }
+    Timer t;
     
     if((pingnum < 1) || (pingnum > 10)) {
         devlog("The maximum number of sending Ping request range is 1-10, and the default value is 4\r\n");
         return;
     }
-       
-    _parser->set_timeout((1000 * timeout) + 2000);
-    
-    if(_parser->send("AT+QPING=%d,\"%s\",%d,%d", 1, host, timeout, pingnum) && _parser->recv("OK")) {        
-        for(i = 0; i < (pingnum); i++) {            
-            _parser->recv("+QPING: %s\n", resp_str);
-            devlog("%s: %s\r\n", host, resp_str);
+   
+    _parser->set_timeout((1000 * pingnum) + 2000);
+   
+    if(_parser->send("AT@PING6=\"%s -c %d\"", host, pingnum) && _parser->recv("OK"))
+    {
+        t.start();
+        while (t.read_ms()<((1000*pingnum)+2000))
+        {
+            pc.printf("%c", _parser->getc());
         }
-        
+        t.stop(); t.reset();   
     }
     
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+    _parser->set_timeout(AM592_DEFAULT_TIMEOUT);
     _parser->flush();
-}
+}
\ No newline at end of file