Diff: main.cpp

Revision:

4:5638a7186930

Parent:

3:4041e2cc0f19

Child:

5:5254d0016504

--- a/main.cpp	Fri Apr 05 07:32:43 2019 +0000
+++ b/main.cpp	Tue Sep 17 01:06:45 2019 +0000
@@ -19,11 +19,9 @@
  *
  */
 
-
 #include <string>
 #include "mbed.h"
 
-
 #define RET_OK                      1
 #define RET_NOK                     -1
 #define DEBUG_ENABLE                1
@@ -33,21 +31,21 @@
 
 #define MAX_BUF_SIZE                1024
 
-#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 AMM592_APN_PROTOCOL_IPv4      1
+#define AMM592_APN_PROTOCOL_IPv6      2
+#define AMM592_DEFAULT_TIMEOUT        1000
+#define AMM592_CONNECT_TIMEOUT        15000
+#define AMM592_SEND_TIMEOUT           500
+#define AMM592_RECV_TIMEOUT           500
 
-#define BG96_APN_PROTOCOL           BG96_APN_PROTOCOL_IPv6
-#define BG96_DEFAULT_BAUD_RATE      115200
-#define BG96_PARSER_DELIMITER       "\r\n"
+#define AMM592_APN_PROTOCOL           AMM592_APN_PROTOCOL_IPv6
+#define AMM592_DEFAULT_BAUD_RATE      115200
+#define AMM592_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_AMM592      "AMM592"
+#define DEVNAME                     CATM1_DEVICE_NAME_AMM592
 
 #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__);}
@@ -64,47 +62,40 @@
 #define MBED_CONF_IOTSHIELD_SENSOR_TEMP             A1
 
 /* Debug message settings */
-#define BG96_PARSER_DEBUG           DEBUG_DISABLE
+#define AMM592_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);
-int8_t getImeiNumber_BG96(char * imei);
+int8_t setEchoStatus_AMM592(int onoff);
+int8_t getUsimStatus_AMM592(void);
+int8_t getNetworkStatus_AMM592(void);
+int8_t checknSetApn_AMM592(const char * apn);
 
 // Functions: DNS
-int8_t getIpAddressByName_BG96(const char * name, char * ipstr);
+int8_t getIpAddressByName_AMM592(const char * name);
 
 // 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 getIpAddress_AMM592(char * ipstr);
 
 // Functions: TCP/UDP Socket service
-int8_t sockOpenConnect_BG96(const char * type, const char * addr, int port);
-int8_t sockClose_BG96(void);
-int8_t sendData_BG96(char * data, int len);
-int8_t checkRecvData_BG96(void);
-int8_t recvData_BG96(char * data, int * len);
-
+int8_t sockOpenConnect_AMM592(int socket_id, int socket_type, int data_type, const char * addr, int port);
+int8_t sockClose_AMM592(void);
+int8_t sendData_AMM592(int socket_id, int data_type, char * data, int len);
+int8_t recvData_AMM592(int socket_id, int data_type, int * len, char * data);
 
 Serial pc(USBTX, USBRX); // tx, rx
 
 UARTSerial *_serial;
 ATCmdParser *_parser;
 
-DigitalOut _RESET_BG96(MBED_CONF_IOTSHIELD_CATM1_RESET);
-DigitalOut _PWRKEY_BG96(MBED_CONF_IOTSHIELD_CATM1_PWRKEY);
+DigitalOut _RESET_AMM592(MBED_CONF_IOTSHIELD_CATM1_RESET);
+DigitalOut _PWRKEY_AMM592(MBED_CONF_IOTSHIELD_CATM1_PWRKEY);
 
 // Destination (Remote Host)
 // IP address and Port number
-char dest_ip[] = "222.xxx.xxx.xxx";
-int  dest_port = 50001;
-
+char dest_ip[] = "222.98.173.228";
+int  dest_port = 5000;
 
 void serialPcInit(void)
 {
@@ -122,30 +113,30 @@
     _parser = new ATCmdParser(_serial);    
     _parser->debug_on(debug_en);
     _parser->set_delimiter(delimiter);    
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+    _parser->set_timeout(AMM592_DEFAULT_TIMEOUT);
 }
 
 void catm1DeviceInit(void)
 {
     serialDeviceInit(   MBED_CONF_IOTSHIELD_CATM1_TX, 
                         MBED_CONF_IOTSHIELD_CATM1_RX, 
-                        BG96_DEFAULT_BAUD_RATE);
+                        AMM592_DEFAULT_BAUD_RATE);
                         
-    serialAtParserInit( BG96_PARSER_DELIMITER, 
-                        BG96_PARSER_DEBUG);
+    serialAtParserInit( AMM592_PARSER_DELIMITER, 
+                        AMM592_PARSER_DEBUG);
 }
 
-void catm1DeviceReset_BG96(void)
+void catm1DeviceReset_AMM592(void)
 {
-    _RESET_BG96 = 1;
-    _PWRKEY_BG96 = 1;
+    _RESET_AMM592 = 1;
+    _PWRKEY_AMM592 = 1;
     wait_ms(300);
     
-    _RESET_BG96 = 0;
-    _PWRKEY_BG96 = 0;
+    _RESET_AMM592 = 0;
+    _PWRKEY_AMM592 = 0;
     wait_ms(400);
     
-    _RESET_BG96 = 1;    
+    _RESET_AMM592 = 1;    
     wait_ms(1000);
 }
 
@@ -160,7 +151,7 @@
     
     myprintf("Waiting for Cat.M1 Module Ready...\r\n");
     
-    catm1DeviceReset_BG96();
+    catm1DeviceReset_AMM592();
     
     waitCatM1Ready();
     
@@ -171,77 +162,93 @@
     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: TCP Client Send & Recv");
     myprintf("=================================================\r\n");
     
-    setEchoStatus_BG96(OFF);
+    setEchoStatus_AMM592(OFF);
    
-    getUsimStatus_BG96();
-    
-    getNetworkStatus_BG96();
+    getUsimStatus_AMM592();
     
-    checknSetApn_BG96(CATM1_APN_SKT);
+    getNetworkStatus_AMM592();
+    
+    checknSetApn_AMM592(CATM1_APN_SKT);
+
    
-    setContextActivate_BG96();
-        
-#if 0    
     // DNS Sample
     const char dest_domain[] = "www.google.com";
-    char ipstr[50];
-    if(getIpAddressByName_BG96(dest_domain, ipstr)) {
-        myprintf("DNS: %s [%s]\r\n", ipstr, dest_domain);
+    
+    if(getIpAddressByName_AMM592(dest_domain)) {
+        myprintf("DNSQUERY successful\r\n");
     } else {
         myprintf("DNS: failed\r\n");
     }
-#endif    
 
+    
+    //Convert IP to HEX
+    //64:ff9b:: is standard SK prefix
+    int i=1;
+    char * pch;
+    char _dest_ip[20]="64:ff9b::";
+    char temp[4];
+    pch = strtok(dest_ip, ".");
+    while(pch!=NULL) {
+        if (i!=2) {
+            sprintf(temp, "%x\0", atoi(pch));
+            strcat(_dest_ip, temp);
+            i++;
+        }
+        else {
+            sprintf(temp, "%x:\0", atoi(pch));
+            strcat(_dest_ip, temp);
+            i++;
+        }
+        pch = strtok(NULL, ".");
+    }
+    
     // TCP Client: Send and Receive
-    myprintf("TCP Client Start - Connect to %s:%d\r\n", dest_ip, dest_port);
+    myprintf("TCP Client Start - Connect to Remote Host \r\n");
     
-    if(sockOpenConnect_BG96("TCP", dest_ip, dest_port) == RET_OK) {
+    if(sockOpenConnect_AMM592(0,0,0, _dest_ip, dest_port) == RET_OK) {
         myprintf("sockOpenConnect: success\r\n");
         
-        char sendbuf[] = "Hello Cat.M1\r\n";         
-        if(sendData_BG96(sendbuf, strlen(sendbuf))) {
+        char sendbuf[] = "Hello Cat.M1";         
+        if(sendData_AMM592(0, 0, sendbuf, strlen(sendbuf))) {
             myprintf("dataSend [%d] %s\r\n", strlen(sendbuf), sendbuf);
         }
         
     } else {
         myprintf("sockOpen: failed\r\n");
         
-        if(sockClose_BG96() == RET_OK) {
+        if(sockClose_AMM592() == RET_OK) {
             myprintf("sockClose: success\r\n");
         }
     }    
     
     _parser->debug_on(DEBUG_DISABLE);
-    
+
     while(1)
     {
-        if(checkRecvData_BG96() == RET_OK) {
-            // Data received
             char recvbuf[100] = {0, };
             int recvlen = 0;
             
-            if(recvData_BG96(recvbuf, &recvlen) == RET_OK) {
+            if(recvData_AMM592(0, 0, &recvlen, recvbuf) == RET_OK) {
                 myprintf("dataRecv [%d] %s\r\n", recvlen, recvbuf);
                 
                 // Loopback: Resend received data to TCP server
-                sendData_BG96(recvbuf, recvlen);
-                myprintf("dataSend [%d] %s\r\n", recvlen, recvbuf);
+                //sendData_AMM592(0, 0, recvbuf, recvlen);
+                //myprintf("dataSend [%d] %s\r\n", recvlen, recvbuf);
                 
                 char * ptr = strstr(recvbuf, "exit");
                 if(ptr != 0) break;
-            }
-        }
-        
+            }       
     }
-    
-    if(sockClose_BG96() == RET_OK) {
+
+    if(sockClose_AMM592() == RET_OK) {
         myprintf("sockClose: success\r\n");
     }
-    setContextDeactivate_BG96(); 
+ 
+    
 }
 
 // ----------------------------------------------------------------
@@ -252,20 +259,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("AMM592 ready\r\n");
             return ;
         }
         else if(_parser->send("AT") && _parser->recv("OK"))
         {
-            myprintf("BG96 already available\r\n");
+            myprintf("AMM592 already available\r\n");
             return ;
         }        
     }        
 }
 
-int8_t setEchoStatus_BG96(bool onoff)
+int8_t setEchoStatus_AMM592(int onoff)
 {
     int8_t ret = RET_NOK;
     char _buf[10];        
@@ -281,7 +288,7 @@
     return ret;
 }
  
-int8_t getUsimStatus_BG96(void)
+int8_t getUsimStatus_AMM592(void)
 {
     int8_t ret = RET_NOK;
     
@@ -295,260 +302,155 @@
     return ret;
 }
 
-int8_t getNetworkStatus_BG96(void)
+int8_t getNetworkStatus_AMM592(void)
 {
-    int8_t ret = RET_NOK;    
+  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")) {
-        devlog("Network Status: limited\r\n");
-        ret = RET_OK;    
+        nsi = true;
+    } else if (_parser->send("AT@NSI") && _parser->recv("@NSI: \"LIMITED\"") && _parser->recv("OK")) {
+        devlog("Network Status: limited\r\n");   
     } 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_AMM592(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));
+   bool cgdccont = false, cgatt = false;
+    int8_t ret = RET_NOK;
     
     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;
-        }
+    //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;
     }
-    
-    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)
-{
-    int8_t ret = RET_NOK;
-    if(_parser->send("AT+QGMR") && _parser->recv("%s\n", version) && _parser->recv("OK"))
-    {   
+    if (cgdccont && cgatt){
         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;
-    } 
+    devlog("APN Check Done\r\n");
+        
     return ret;
 }
 
-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
-        ); 
-
-    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 getIpAddressByName_AMM592(const char * name)
 {
     int8_t ret = RET_NOK;
-    
-    _parser->send("AT+QIACT=1");    
-    if(_parser->recv("OK")) {
-        devlog("Activate a PDP Context\r\n");
-        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;
+    if( _parser->send("AT@DNSQ6=%s", name)&& _parser->recv("OK"))
+        ret = RET_OK;       
     
-    _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;
-    } 
-    return ret;
+    return ret;           
 }
 
 // ----------------------------------------------------------------
 // Functions: TCP/UDP socket service
 // ----------------------------------------------------------------
-
-int8_t sockOpenConnect_BG96(const char * type, const char * addr, int port)
+int8_t sockOpenConnect_AMM592(int socket_id, int socket_type, int data_type, const char * addr, int port)
 {
     int8_t ret = RET_NOK;  
-    int err = 1;
+    int err = 0;
     int id = 0;
     
     bool done = false;
     Timer t;
     
-    _parser->set_timeout(BG96_CONNECT_TIMEOUT);
+    _parser->set_timeout(AMM592_CONNECT_TIMEOUT);
     
-    if((strcmp(type, "TCP") != 0) && (strcmp(type, "UDP") != 0)) {        
+    if((socket_type != 0) && (socket_type != 1)) {        
         return RET_NOK;
     }
 
     t.start();
-    
-    _parser->send("AT+QIOPEN=1,%d,\"%s\",\"%s\",%d", id, type, addr, port);
+    //devlog("AT@SOCKOPEN6=%d,%d,%d,%s,%d", socket_id, socket_type, data_type, addr, port);
+    _parser->send("AT@SOCKOPEN6=%d,%d,%d,%s,%d", socket_id, socket_type, data_type, addr, port);
     do {        
-        done = (_parser->recv("+QIOPEN: %d,%d", &id, &err) && (err == 0));        
-    } while(!done && t.read_ms() < BG96_CONNECT_TIMEOUT);
+        done = (_parser->recv("@SOCKOPEN6:%d,%d", &id, &err) && (err == 0)); 
+    } while(!done && t.read_ms() < AMM592_CONNECT_TIMEOUT);
+    
+   if(done) ret = RET_OK;
 
-    if(done) ret = RET_OK;
-
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);    
+    _parser->set_timeout(AMM592_DEFAULT_TIMEOUT);    
     _parser->flush();
     
     return ret;
 }
 
-int8_t sockClose_BG96(void)
+int8_t sockClose_AMM592(void)
 {
     int8_t ret = RET_NOK;
     int id = 0;
     
-    _parser->set_timeout(BG96_CONNECT_TIMEOUT);
+    _parser->set_timeout(AMM592_CONNECT_TIMEOUT);
     
-    if(_parser->send("AT+QICLOSE=%d", id) && _parser->recv("OK")) {
+    if(_parser->send("AT@SOCKCLOSE6=%d", id) && _parser->recv("OK")) {
         ret = RET_OK;        
     }
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+    _parser->set_timeout(AMM592_DEFAULT_TIMEOUT);
     
     return ret;
 }
-
-int8_t sendData_BG96(char * data, int len)
+int8_t sendData_AMM592(int socket_id, int data_type, char * data, int len)
 {
     int8_t ret = RET_NOK;
     int id = 0;
     bool done = false;
+    int err = 0;
+    int lencom=0;
+    Timer t;
     
-    _parser->set_timeout(BG96_SEND_TIMEOUT);
+    _parser->set_timeout(AMM592_SEND_TIMEOUT);
+    t.start();
     
-    _parser->send("AT+QISEND=%d,%ld", id, len);
-    if( !done && _parser->recv(">") )
-        done = (_parser->write(data, len) <= 0);
+    _parser->send("AT@SOCKSND6=%d,%d,\"%s\"", socket_id, data_type, data);
+ 
+   do {        
+        done = (_parser->recv("@SOCKSND6:%d,%d,%d", &id, &lencom, &err)  && (err == 0)); 
+        } while(!done && t.read_ms() < AMM592_CONNECT_TIMEOUT);
 
-    if( !done )
-        done = _parser->recv("SEND OK");    
-    
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+    _parser->set_timeout(AMM592_DEFAULT_TIMEOUT);
     
     return ret;
 }
 
-int8_t checkRecvData_BG96(void)
+int8_t recvData_AMM592(int socket_id, int data_type, int * len, char * data)
 {
     int8_t ret = RET_NOK;
-    int id = 0;
-    char cmd[20];
+    int recvCount = 0;
+    int socketid, datatype;
     
-    bool received = false;
-
-    sprintf(cmd, "+QIURC: \"recv\",%d", id);
-    _parser->set_timeout(1);
-    received = _parser->recv(cmd);
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);
+     _parser->set_timeout(AMM592_RECV_TIMEOUT);   
     
-    if(received) ret = RET_OK;    
-    return ret;
-}
-
-int8_t recvData_BG96(char * data, int * len)
-{
-    int8_t ret = RET_NOK;
-    int id = 0;
-    int recvCount = 0;
-    
-    _parser->set_timeout(BG96_RECV_TIMEOUT);   
-     
-    if( _parser->send("AT+QIRD=%d", id) && _parser->recv("+QIRD:%d\r\n",&recvCount) ) {
+    if( _parser->recv("@SOCKRCV6=%d,%d,%d,",&socketid, &datatype, &recvCount) ) {
         if(recvCount > 0) {
-            _parser->getc();
             _parser->read(data, recvCount);
-            if(_parser->recv("OK")) {
-                ret = RET_OK;
-            } else {
-                recvCount = 0;
-            }
-        }        
+            ret = RET_OK;
+         }        
     }
-    _parser->set_timeout(BG96_DEFAULT_TIMEOUT);    
+    _parser->set_timeout(AMM592_DEFAULT_TIMEOUT);    
     _parser->flush();
     
     *len = recvCount;
         
     return ret;
-}
+}
\ No newline at end of file