Browse Source

fix n720 and test ok.

qiyongzhong0 5 years ago
parent
commit
58d3b4ffcc
5 changed files with 148 additions and 355 deletions
  1. 54 40
      class/n720/at_device_n720.c
  2. 2 1
      class/n720/at_device_n720.h
  3. 90 314
      class/n720/at_socket_n720.c
  4. 1 0
      inc/at_device.h
  5. 1 0
      samples/at_sample_n720.c

+ 54 - 40
class/n720/at_device_n720.c

@@ -32,7 +32,7 @@
 
 #ifdef AT_DEVICE_USING_N720
 
-#define N720_WAIT_CONNECT_TIME          10000
+#define N720_WAIT_CONNECT_TIME          15000
 #define N720_THREAD_STACK_SIZE          2048
 #define N720_THREAD_PRIORITY            (RT_THREAD_PRIORITY_MAX/2)
 
@@ -42,6 +42,11 @@ static int n720_power_on(struct at_device *device)
 
     n720 = (struct at_device_n720 *)device->user_data;
 
+    if (n720->power_ctrl)
+    {
+        (n720->power_ctrl)(1);
+        rt_thread_mdelay(2000);
+    }
     if (n720->power_pin == -1)//no power on pin
     {
         return(RT_EOK);
@@ -65,7 +70,7 @@ static int n720_power_on(struct at_device *device)
         }
     }
     
-    rt_thread_mdelay(500);
+    rt_thread_mdelay(1000);
     
     rt_pin_write(n720->power_pin, PIN_LOW);
     
@@ -79,6 +84,14 @@ static int n720_power_off(struct at_device *device)
     struct at_device_n720 *n720 = RT_NULL;
 
     n720 = (struct at_device_n720 *)device->user_data;
+    
+    if (n720->power_ctrl)
+    {
+        n720->power_status = RT_FALSE;
+        (n720->power_ctrl)(0);
+        rt_thread_mdelay(2*1000);
+        return(RT_EOK);
+    }
 
     if (n720->power_pin == -1)//no power on pin
     {
@@ -106,7 +119,7 @@ static int n720_power_off(struct at_device *device)
     }
     else
     {
-        at_obj_exec_cmd(device->client, RT_NULL, "AT+QPOWD=0");
+        at_obj_exec_cmd(device->client, RT_NULL, "$MYPOWEROFF");
         rt_thread_mdelay(5*1000);
     }
     
@@ -298,7 +311,7 @@ static int n720_netdev_set_info(struct netdev *netdev)
             goto __exit;
         }
         
-        if (at_resp_parse_line_args(resp, 2, "%s", imei) <= 0)
+        if (at_resp_parse_line_args_by_kw(resp, "+GSN:", "%*[^\"]\"%[^\"]", imei) <= 0)
         {
             LOG_E("%s device prase \"AT+GSN\" cmd error.", device->name);
             result = -RT_ERROR;
@@ -327,17 +340,15 @@ static int n720_netdev_set_info(struct netdev *netdev)
         #define IP_ADDR_SIZE_MAX    16
         char ipaddr[IP_ADDR_SIZE_MAX] = {0};
         
-        /* send "AT+CGPADDR=1" commond to get IP address */
-        if (at_obj_exec_cmd(device->client, resp, "AT+CGPADDR=1") != RT_EOK)
+        /* Get IP address */
+        if (at_obj_exec_cmd(device->client, resp, "AT$MYNETACT?") != RT_EOK)
         {
             result = -RT_ERROR;
             goto __exit;
         }
-
-        /* parse response data "+CGPADDR: 1,<IP_address>" */
-        if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*[^\"]\"%[^\"]", ipaddr) <= 0)
+        if (at_resp_parse_line_args_by_kw(resp, "$MYNETACT:", "$MYNETACT: %*[^\"]\"%[^\"]", ipaddr) <= 0)
         {
-            LOG_E("%s device \"AT+CGPADDR=1\" cmd error.", device->name);
+            LOG_E("%s device \"AT$MYNETACT?\" cmd error.", device->name);
             result = -RT_ERROR;
             goto __exit;
         }
@@ -351,27 +362,26 @@ static int n720_netdev_set_info(struct netdev *netdev)
     
     /* set network interface device dns server */
     {
-        #define DNS_ADDR_SIZE_MAX   16
+        #define DNS_ADDR_SIZE_MAX 16
         char dns_server1[DNS_ADDR_SIZE_MAX] = {0}, dns_server2[DNS_ADDR_SIZE_MAX] = {0};
-        
-        /* send "AT+QIDNSCFG=1" commond to get DNS servers address */
-        if (at_obj_exec_cmd(device->client, resp, "AT+QIDNSCFG=1") != RT_EOK)
+
+        at_resp_set_info(resp, N720_INFO_RESP_SIZE, 2, N720_INFO_RESP_TIMO);
+        /* send "AT+DNSSERVER?" commond to get DNS servers address */
+        if (at_obj_exec_cmd(device->client, resp, "AT+DNSSERVER?") < 0)
         {
             result = -RT_ERROR;
             goto __exit;
         }
 
-        /* parse response data "+QIDNSCFG: <contextID>,<pridnsaddr>,<secdnsaddr>" */
-        if (at_resp_parse_line_args_by_kw(resp, "+QIDNSCFG:", "+QIDNSCFG: 1,\"%[^\"]\",\"%[^\"]\"",
-                dns_server1, dns_server2) <= 0)
+        if (at_resp_parse_line_args_by_kw(resp, "+DNSSERVER:", "+DNSSERVER: dns1:%[^;];dns2:%s\r\n", dns_server1, dns_server2) <= 0)
         {
-            LOG_E("%s device prase \"AT+QIDNSCFG=1\" cmd error.", device->name);
+            LOG_E("Prase \"AT+DNSSERVER?\" commands resposne data error!");
             result = -RT_ERROR;
             goto __exit;
         }
 
-        LOG_D("%s device primary DNS server address: %s", device->name, dns_server1);
-        LOG_D("%s device secondary DNS server address: %s", device->name, dns_server2);
+        LOG_D("n58 device(%s) primary DNS server address: %s", device->name, dns_server1);
+        LOG_D("n58 device(%s) secondary DNS server address: %s", device->name, dns_server2);
 
         inet_aton(dns_server1, &addr);
         netdev_low_level_set_dns_server(netdev, 0, &addr);
@@ -488,7 +498,7 @@ static int n720_netdev_set_down(struct netdev *netdev)
 
 static int n720_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, ip_addr_t *dns_server)
 {
-#define N720_DNS_RESP_LEN    64
+#define N720_DNS_RESP_LEN    128
 #define N720_DNS_RESP_TIMEO  rt_tick_from_millisecond(300)
 
     int result = RT_EOK;
@@ -514,8 +524,7 @@ static int n720_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, ip
     }
 
     /* send "AT+QIDNSCFG=<pri_dns>[,<sec_dns>]" commond to set dns servers */
-    if (at_obj_exec_cmd(device->client, resp, "AT+QIDNSCFG=%d,%s", 
-        dns_num, inet_ntoa(*dns_server)) != RT_EOK)
+    if (at_obj_exec_cmd(device->client, resp, "AT+DNSSERVER=%d,%s", dns_num, inet_ntoa(*dns_server)) != RT_EOK)
     {
         result = -RT_ERROR;
         goto __exit;
@@ -565,17 +574,17 @@ static int n720_netdev_ping(struct netdev *netdev, const char *host,
     }
 
     /* send "AT+QPING=<contextID>"<host>"[,[<timeout>][,<pingnum>]]" commond to send ping request */
-    if (at_obj_exec_cmd(device->client, resp, "AT+QPING=1,%s,%d,1", host, timeout / RT_TICK_PER_SECOND) < 0)
+    if (at_obj_exec_cmd(device->client, resp, "AT+PING=1,%s,%d,1", host, timeout / RT_TICK_PER_SECOND) < 0)
     {
         result = -RT_ERROR;
         goto __exit;
     }
 
-    at_resp_parse_line_args_by_kw(resp, "+QPING:", "+QPING:%d", &response);
+    at_resp_parse_line_args_by_kw(resp, "+PING:", "+PING:%d", &response);
     /* Received the ping response from the server */
     if (response == 0)
     {
-        if (at_resp_parse_line_args_by_kw(resp, "+QPING:", "+QPING:%d,\"%[^\"]\",%d,%d,%d",
+        if (at_resp_parse_line_args_by_kw(resp, "+PING:", "+PING:%d,\"%[^\"]\",%d,%d,%d",
                                           &response, ip_addr, &recv_data_len, &ping_time, &ttl) <= 0)
         {
             result = -RT_ERROR;
@@ -673,7 +682,6 @@ static void n720_init_thread_entry(void *parameter)
 #define CPIN_RETRY                     10
 #define CSQ_RETRY                      20
 #define CGREG_RETRY                    50
-#define IPADDR_RETRY                   10
 
     int i;
     int retry_num = INIT_RETRY;
@@ -703,6 +711,7 @@ static void n720_init_thread_entry(void *parameter)
             result = -RT_ETIMEOUT;
             goto __exit;
         }
+        rt_thread_mdelay(5000);
         
         /* disable echo */
         if (at_obj_exec_cmd(device->client, resp, "ATE0") != RT_EOK)
@@ -798,37 +807,42 @@ static void n720_init_thread_entry(void *parameter)
             result = -RT_ERROR;
             goto __exit;
         }
-
+        
         if (((struct at_device_n720 *)(device->user_data))->wakeup_pin != -1)//use wakeup pin
         {
-            if (at_obj_exec_cmd(device->client, resp, "AT+QSCLK=1") != RT_EOK)// enable sleep mode fail
+            if (at_obj_exec_cmd(device->client, resp, "AT+ENPWRSAVE=1") != RT_EOK)// enable sleep mode fail
             {
                 result = -RT_ERROR;
                 goto __exit;
             }
         }
-
-        /* Close Echo the Data */
-        if (at_obj_exec_cmd(device->client, resp, "AT+QISDE=0") != RT_EOK)
+        
+        /* Activate context profile */
+        resp = at_resp_set_info(resp, RESP_SIZE, 0, rt_tick_from_millisecond(30*1000));
+        if (at_obj_exec_cmd(device->client, resp, "AT+CGATT=1") != RT_EOK)
         {
             result = -RT_ERROR;
             goto __exit;
         }
         
-        /* Deactivate context profile */
-        resp = at_resp_set_info(resp, RESP_SIZE, 0, rt_tick_from_millisecond(40*1000));
-        if (at_obj_exec_cmd(device->client, resp, "AT+QIDEACT=1") != RT_EOK)
+        /* Activate PPP */
+        resp = at_resp_set_info(resp, RESP_SIZE, 0, rt_tick_from_millisecond(30*1000));
+        if (at_obj_exec_cmd(device->client, resp, "AT$MYNETACT=0,1") != RT_EOK)
         {
             result = -RT_ERROR;
             goto __exit;
         }
         
-        /* Activate context profile */
-        resp = at_resp_set_info(resp, RESP_SIZE, 0, rt_tick_from_millisecond(150*1000));
-        if (at_obj_exec_cmd(device->client, resp, "AT+QIACT=1") != RT_EOK)
+        /* Get IP address */
+        if (at_obj_exec_cmd(device->client, resp, "AT$MYNETACT?") == RT_EOK)
         {
-            result = -RT_ERROR;
-            goto __exit;
+            char ip_str[20];
+            
+            if (at_resp_parse_line_args_by_kw(resp, "$MYNETACT:", "$MYNETACT: %*[^\"]\"%[^\"]", ip_str) <= 0)
+            {
+                result = -RT_ERROR;
+                goto __exit;
+            }
         }
 
         /* initialize successfully  */

+ 2 - 1
class/n720/at_device_n720.h

@@ -34,7 +34,7 @@ extern "C" {
 #include <at_device.h>
 
 /* The maximum number of sockets supported by the ec200x device */
-#define AT_DEVICE_N720_SOCKETS_NUM  5
+#define AT_DEVICE_N720_SOCKETS_NUM  6
 
 struct at_device_n720
 {
@@ -45,6 +45,7 @@ struct at_device_n720
     int power_status_pin;
     int wakeup_pin;
     size_t recv_line_num;
+    void (*power_ctrl)(int is_on);
     struct at_device device;
 
     void *socket_data;

+ 90 - 314
class/n720/at_socket_n720.c

@@ -19,7 +19,7 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2019-12-10     qiyongzhong  first version
+ * 2020-10-28     qiyongzhong  first version
  */
 
 #include <stdio.h>
@@ -32,7 +32,7 @@
 
 #if defined(AT_DEVICE_USING_N720) && defined(AT_USING_SOCKET)
 
-#define N720_MODULE_SEND_MAX_SIZE       1460
+#define N720_MODULE_SEND_MAX_SIZE       2000
 
 /* set real event by current socket and current state */
 #define SET_EVENT(socket, event)       (((socket + 1) << 16) | (event))
@@ -51,42 +51,6 @@ static at_evt_cb_t at_evt_cb_set[] = {
         [AT_SOCKET_EVT_CLOSED] = NULL,
 };
 
-static void at_tcp_ip_errcode_parse(int result)//TCP/IP_QIGETERROR
-{
-    switch(result)
-    {
-    case 0   : LOG_D("%d : Operation successful",         result); break;
-    case 550 : LOG_E("%d : Unknown error",                result); break;
-    case 551 : LOG_E("%d : Operation blocked",            result); break;
-    case 552 : LOG_E("%d : Invalid parameters",           result); break;
-    case 553 : LOG_E("%d : Memory not enough",            result); break;
-    case 554 : LOG_E("%d : Create socket failed",         result); break;
-    case 555 : LOG_E("%d : Operation not supported",      result); break;
-    case 556 : LOG_E("%d : Socket bind failed",           result); break;
-    case 557 : LOG_E("%d : Socket listen failed",         result); break;
-    case 558 : LOG_E("%d : Socket write failed",          result); break;
-    case 559 : LOG_E("%d : Socket read failed",           result); break;
-    case 560 : LOG_E("%d : Socket accept failed",         result); break;
-    case 561 : LOG_E("%d : Open PDP context failed",      result); break;
-    case 562 : LOG_E("%d : Close PDP context failed",     result); break;
-    case 563 : LOG_W("%d : Socket identity has been used", result); break;
-    case 564 : LOG_E("%d : DNS busy",                     result); break;
-    case 565 : LOG_E("%d : DNS parse failed",             result); break;
-    case 566 : LOG_E("%d : Socket connect failed",        result); break;
-    // case 567 : LOG_W("%d : Socket has been closed",       result); break;
-    case 567 : break;
-    case 568 : LOG_E("%d : Operation busy",               result); break;
-    case 569 : LOG_E("%d : Operation timeout",            result); break;
-    case 570 : LOG_E("%d : PDP context broken down",      result); break;
-    case 571 : LOG_E("%d : Cancel send",                  result); break;
-    case 572 : LOG_E("%d : Operation not allowed",        result); break;
-    case 573 : LOG_E("%d : APN not configured",           result); break;
-    case 574 : LOG_E("%d : Port busy",                    result); break;
-    default  : LOG_E("%d : Unknown err code",             result); break;
-    }
-}
-
-
 static int n720_socket_event_send(struct at_device *device, uint32_t event)
 {
     return (int) rt_event_send(device->socket_event, event);
@@ -130,7 +94,7 @@ static int n720_socket_close(struct at_socket *socket)
         return -RT_ENOMEM;
     }
     
-    result = at_obj_exec_cmd(device->client, resp, "AT+QICLOSE=%d", device_socket);
+    result = at_obj_exec_cmd(device->client, resp, "AT$MYNETCLOSE=%d", device_socket);
 
     at_delete_resp(resp);
 
@@ -154,13 +118,9 @@ static int n720_socket_close(struct at_socket *socket)
 static int n720_socket_connect(struct at_socket *socket, char *ip, int32_t port,
     enum at_socket_type type, rt_bool_t is_client)
 {
-    #define CONN_RETRY  2
-
-    int i = 0;
-    const char *type_str = RT_NULL;
-    uint32_t event = 0;
+    int result = 0;
+    int type_val = 0;
     at_response_t resp = RT_NULL;
-    int result = 0, event_result = 0;
     int device_socket = (int) socket->user_data;
     struct at_device *device = (struct at_device *) socket->device;
 
@@ -175,84 +135,42 @@ static int n720_socket_connect(struct at_socket *socket, char *ip, int32_t port,
     switch(type)
     {
         case AT_SOCKET_TCP:
-            type_str = "TCP";
+            type_val = 0;
             break;
         case AT_SOCKET_UDP:
-            type_str = "UDP";
+            type_val = 2;
             break;
         default:
             LOG_E("%s device socket(%d)  connect type error.", device->name, device_socket);
             return -RT_ERROR;
     }
 
-    resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
+    resp = at_create_resp(128, 0, rt_tick_from_millisecond(15*1000));
     if (resp == RT_NULL)
     {
         LOG_E("no memory for resp create.");
         return -RT_ENOMEM;
     }
-
-    for(i=0; i<CONN_RETRY; i++)
+    
+    if (at_obj_exec_cmd(device->client, resp, "AT$MYNETSRV=0,%d,%d,0,\"%s:%d\"", device_socket, type_val, ip, port) < 0)
     {
-        /* clear socket connect event */
-        event = SET_EVENT(device_socket, N720_EVENT_CONN_OK | N720_EVENT_CONN_FAIL);
-        n720_socket_event_recv(device, event, 0, RT_EVENT_FLAG_OR);
-
-        if (at_obj_exec_cmd(device->client, resp, "AT+QIOPEN=1,%d,\"%s\",\"%s\",%d,0,1", 
-                            device_socket, type_str, ip, port) < 0)
-        {
-            result = -RT_ERROR;
-            break;
-        }
-
-        /* waiting result event from AT URC, the device default connection timeout is 60 seconds*/
-        if (n720_socket_event_recv(device, SET_EVENT(device_socket, 0), 
-                                    60 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR) < 0)
-        {
-            LOG_E("%s device socket(%d) wait connect result timeout.", device->name, device_socket);
-            result = -RT_ETIMEOUT;
-            break;
-        }
-        /* waiting OK or failed result */
-        event_result = n720_socket_event_recv(device, N720_EVENT_CONN_OK | N720_EVENT_CONN_FAIL, 
-                                                1 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR);
-        if (event_result < 0)
-        {
-            LOG_E("%s device socket(%d) wait connect OK|FAIL timeout.", device->name, device_socket);
-            result = -RT_ETIMEOUT;
-            break;
-        }
-        /* check result */
-        if (event_result & N720_EVENT_CONN_OK)
-        {
-            result = RT_EOK;
-            break;
-        }
-        
-        LOG_D("%s device socket(%d) connect failed, the socket was not be closed and now will connect retry.",
-                    device->name, device_socket);
-        if (n720_socket_close(socket) < 0)
-        {
-            result = -RT_ERROR;
-            break;
-        }
+        at_delete_resp(resp);
+        LOG_E("%s device socket(%d) config params fail.", device->name, device_socket);
+        return -RT_ERROR;
     }
-
-    if (i == CONN_RETRY)
+    
+    if (at_obj_exec_cmd(device->client, resp, "AT$MYNETOPEN=%d", device_socket) < 0)
     {
+        at_delete_resp(resp);
         LOG_E("%s device socket(%d) connect failed.", device->name, device_socket);
         result = -RT_ERROR;
     }
     
-    if (resp)
-    {
-        at_delete_resp(resp);
-    }
-
-    return result;
+    at_delete_resp(resp);
+    return RT_EOK;
 }
 
-static int at_get_send_size(struct at_socket *socket, size_t *size, size_t *acked, size_t *nacked)
+static int at_get_send_size(struct at_socket *socket, size_t *nacked)
 {
     int result = 0;
     at_response_t resp = RT_NULL;
@@ -266,13 +184,13 @@ static int at_get_send_size(struct at_socket *socket, size_t *size, size_t *acke
         return -RT_ENOMEM;
     }
 
-    if (at_obj_exec_cmd(device->client, resp, "AT+QISEND=%d,0", device_socket) < 0)
+    if (at_obj_exec_cmd(device->client, resp, "AT$MYNETACK=%d", device_socket) < 0)
     {
         result = -RT_ERROR;
         goto __exit;
     }
 
-    if (at_resp_parse_line_args_by_kw(resp, "+QISEND:", "+QISEND: %d,%d,%d", size, acked, nacked) <= 0)
+    if (at_resp_parse_line_args_by_kw(resp, "$MYNETACK:", "$MYNETACK:%*d,%d,%*d", nacked) <= 0)
     {
         result = -RT_ERROR;
         goto __exit;
@@ -292,11 +210,11 @@ static int at_wait_send_finish(struct at_socket *socket, size_t settings_size)
     /* get the timeout by the input data size */
     rt_tick_t timeout = rt_tick_from_millisecond(settings_size);
     rt_tick_t last_time = rt_tick_get();
-    size_t size = 0, acked = 0, nacked = 0xFFFF;
+    size_t nacked = 0xFFFF;
 
     while (rt_tick_get() - last_time <= timeout)
     {
-        at_get_send_size(socket, &size, &acked, &nacked);
+        at_get_send_size(socket, &nacked);
         if (nacked == 0)
         {
             return RT_EOK;
@@ -345,13 +263,6 @@ static int n720_socket_send(struct at_socket *socket, const char *buff, size_t b
     /* set current socket for send URC event */
     n720->user_data = (void *) device_socket;
 
-    /* clear socket send event */
-    event = SET_EVENT(device_socket, N720_EVENT_SEND_OK | N720_EVENT_SEND_FAIL);
-    n720_socket_event_recv(device, event, 0, RT_EVENT_FLAG_OR);
-
-    /* set AT client end sign to deal with '>' sign.*/
-    at_obj_set_end_sign(device->client, '>');
-
     while (sent_size < bfsz)
     {
         if (bfsz - sent_size < N720_MODULE_SEND_MAX_SIZE)
@@ -362,62 +273,37 @@ static int n720_socket_send(struct at_socket *socket, const char *buff, size_t b
         {
             cur_pkt_size = N720_MODULE_SEND_MAX_SIZE;
         }
-
-        /* send the "AT+QISEND" commands to AT server than receive the '>' response on the first line. */
-        if (at_obj_exec_cmd(device->client, resp, "AT+QISEND=%d,%d", device_socket, (int)cur_pkt_size) < 0)
+        
+        if (at_obj_exec_cmd(device->client, resp, "AT$MYNETWRITE=%d,%d", device_socket, (int)cur_pkt_size) < 0)
         {
             result = -RT_ERROR;
             goto __exit;
         }
         
-        //rt_thread_mdelay(5);//delay at least 4ms
-        
-        /* send the real data to server or client */
-        result = (int) at_client_obj_send(device->client, buff + sent_size, cur_pkt_size);
-        if (result == 0)
+        if (at_resp_get_line_by_kw(resp, "$MYNETWRITE:") == RT_NULL)
         {
             result = -RT_ERROR;
             goto __exit;
         }
-
-        /* waiting result event from AT URC */
-        event = SET_EVENT(device_socket, 0);
-        event_result = n720_socket_event_recv(device, event, 10 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR);
-        if (event_result < 0)
-        {
-            LOG_E("%s device socket(%d) wait event timeout.", device->name, device_socket);
-            result = -RT_ETIMEOUT;
-            goto __exit;
-        }
-        /* waiting OK or failed result */
-        event = N720_EVENT_SEND_OK | N720_EVENT_SEND_FAIL;
-        event_result = n720_socket_event_recv(device, event, 1 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR);
-        if (event_result < 0)
-        {
-            LOG_E("%s device socket(%d) wait sned OK|FAIL timeout.", device->name, device_socket);
-            result = -RT_ETIMEOUT;
-            goto __exit;
-        }
-        /* check result */
-        if (event_result & N720_EVENT_SEND_FAIL)
+        
+        /* send the real data to server or client */
+        result = (int) at_client_obj_send(device->client, buff + sent_size, cur_pkt_size);
+        if (result == 0)
         {
-            LOG_E("%s device socket(%d) send failed.", device->name, device_socket);
             result = -RT_ERROR;
             goto __exit;
         }
 
         if (type == AT_SOCKET_TCP)
         {
-            //at_wait_send_finish(socket, cur_pkt_size);
-            rt_thread_mdelay(10);
+            at_wait_send_finish(socket, cur_pkt_size);
+            //rt_thread_mdelay(10);
         }
 
         sent_size += cur_pkt_size;
     }
 
 __exit:
-    /* reset the end sign for data conflict */
-    at_obj_set_end_sign(device->client, 0);
 
     rt_mutex_release(lock);
 
@@ -442,12 +328,12 @@ __exit:
  */
 static int n720_domain_resolve(const char *name, char ip[16])
 {
-    #define RESOLVE_RETRY  3
+    #define RESOLVE_RETRY 3
 
-    int i, result;
+    int i, result = RT_EOK;
+    char recv_ip[20] = {0};
     at_response_t resp = RT_NULL;
     struct at_device *device = RT_NULL;
-    struct at_device_n720 *n720 = RT_NULL;
 
     RT_ASSERT(name);
     RT_ASSERT(ip);
@@ -455,66 +341,61 @@ static int n720_domain_resolve(const char *name, char ip[16])
     device = at_device_get_first_initialized();
     if (device == RT_NULL)
     {
-        LOG_E("get first init device failed.");
+        LOG_E("get first initialization n58 device failed.");
         return -RT_ERROR;
     }
 
-    /* the maximum response time is 60 seconds, but it set to 10 seconds is convenient to use. */
-    resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
-    if (!resp)
+    /* The maximum response time is 14 seconds, affected by network status */
+    resp = at_create_resp(128, 0, 15 * RT_TICK_PER_SECOND);
+    if (resp == RT_NULL)
     {
-        LOG_E("no memory for resp create.");
+        LOG_E("no memory for n58 device(%s) response structure.", device->name);
         return -RT_ENOMEM;
     }
 
-    /* clear N720_EVENT_DOMAIN_OK */
-    n720_socket_event_recv(device, N720_EVENT_DOMAIN_OK, 0, RT_EVENT_FLAG_OR);
-    
-    n720 = (struct at_device_n720 *) device->user_data;
-    n720->socket_data = ip;
-
-    if (at_obj_exec_cmd(device->client, resp, "AT+QIDNSGIP=1,\"%s\"", name) != RT_EOK)
+    for (i = 0; i < RESOLVE_RETRY; i++)
     {
-        result = -RT_ERROR;
-        goto __exit;
-    }
+        int err_code = 0;
 
-    for(i = 0; i < RESOLVE_RETRY; i++)
-    {
-        /* waiting result event from AT URC, the device default connection timeout is 30 seconds.*/
-        if (n720_socket_event_recv(device, N720_EVENT_DOMAIN_OK, 10 * RT_TICK_PER_SECOND, RT_EVENT_FLAG_OR) < 0)
+        if (at_obj_exec_cmd(device->client, resp, "AT+DNS=%s", name) < 0)
+        {
+            result = -RT_ERROR;
+            goto __exit;
+        }
+
+        /* parse the third line of response data, get the IP address */
+        if (at_resp_parse_line_args_by_kw(resp, "+DNS:", "+DNS: %s", recv_ip) < 0)
+        {
+            rt_thread_mdelay(100);
+            /* resolve failed, maybe receive an URC CRLF */
+            continue;
+        }
+
+        if (rt_strlen(recv_ip) < 8)
         {
-            result = -RT_ETIMEOUT;
+            rt_thread_mdelay(100);
+            /* resolve failed, maybe receive an URC CRLF */
             continue;
         }
         else
         {
-            if (rt_strlen(ip) < 8)
-            {
-                rt_thread_mdelay(100);
-                /* resolve failed, maybe receive an URC CRLF */
-                result = -RT_ERROR;
-                continue;
-            }
-            else
-            {
-                result = RT_EOK;
-                break;
-            }
+            rt_thread_mdelay(10);
+            rt_strncpy(ip, recv_ip, 15);
+            ip[15] = '\0';
+            break;
         }
     }
 
- __exit:
-    n720->socket_data = RT_NULL;
+__exit:
     if (resp)
     {
         at_delete_resp(resp);
     }
 
     return result;
-
 }
 
+
 /**
  * set AT socket event notice callback
  *
@@ -529,9 +410,10 @@ static void n720_socket_set_event_cb(at_socket_evt_t event, at_evt_cb_t cb)
     }
 }
 
-static void urc_connect_func(struct at_client *client, const char *data, rt_size_t size)
+static void urc_close_func(struct at_client *client, const char *data, rt_size_t size)
 {
-    int device_socket = 0, result = 0;
+    int device_socket = 0;
+    struct at_socket *socket = RT_NULL;
     struct at_device *device = RT_NULL;
     char *client_name = client->device->parent.name;
 
@@ -544,25 +426,25 @@ static void urc_connect_func(struct at_client *client, const char *data, rt_size
         return;
     }
 
-    sscanf(data, "+QIOPEN: %d,%d", &device_socket , &result);
+    sscanf(data, "$MYURCCLOSE: %d", &device_socket);
+    /* get at socket object by device socket descriptor */
+    socket = &(device->sockets[device_socket]);
 
-    if (result == 0)
-    {
-        n720_socket_event_send(device, SET_EVENT(device_socket, N720_EVENT_CONN_OK));
-    }
-    else
+    /* notice the socket is disconnect by remote */
+    if (at_evt_cb_set[AT_SOCKET_EVT_CLOSED])
     {
-        at_tcp_ip_errcode_parse(result);
-        n720_socket_event_send(device, SET_EVENT(device_socket, N720_EVENT_CONN_FAIL));
+        at_evt_cb_set[AT_SOCKET_EVT_CLOSED](socket, AT_SOCKET_EVT_CLOSED, NULL, 0);
     }
 }
 
-static void urc_send_func(struct at_client *client, const char *data, rt_size_t size)
+static void urc_recv_func(struct at_client *client, const char *data, rt_size_t size)
 {
     int device_socket = 0;
+    struct at_socket *socket = RT_NULL;
     struct at_device *device = RT_NULL;
-    struct at_device_n720 *n720 = RT_NULL;
     char *client_name = client->device->parent.name;
+    char *send_buf = RT_NULL;
+    int len;
 
     RT_ASSERT(data && size);
 
@@ -572,48 +454,24 @@ static void urc_send_func(struct at_client *client, const char *data, rt_size_t
         LOG_E("get device(%s) failed.", client_name);
         return;
     }
-    
-    n720 = (struct at_device_n720 *) device->user_data;
-    device_socket = (int) n720->user_data;
 
-    if (rt_strstr(data, "SEND OK"))
+    if (sscanf(data, "$MYURCREAD: %d", &device_socket) <= 0)
     {
-        n720_socket_event_send(device, SET_EVENT(device_socket, N720_EVENT_SEND_OK));
+        return;
     }
-    else if (rt_strstr(data, "SEND FAIL"))
+    send_buf = (char *) rt_malloc(128);
+    if (send_buf == RT_NULL)
     {
-        n720_socket_event_send(device, SET_EVENT(device_socket, N720_EVENT_SEND_FAIL));
-    }
-}
-
-static void urc_close_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    int device_socket = 0;
-    struct at_socket *socket = RT_NULL;
-    struct at_device *device = RT_NULL;
-    char *client_name = client->device->parent.name;
-
-    RT_ASSERT(data && size);
-
-    device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL)
-    {
-        LOG_E("get device(%s) failed.", client_name);
         return;
     }
 
-    sscanf(data, "+QIURC: \"closed\",%d", &device_socket);
-    /* get at socket object by device socket descriptor */
-    socket = &(device->sockets[device_socket]);
+    rt_sprintf(send_buf, "AT$MYNETREAD=%d,%d\r\n", device_socket, N720_MODULE_SEND_MAX_SIZE);
+    at_client_obj_send(client, send_buf, strlen(send_buf));
 
-    /* notice the socket is disconnect by remote */
-    if (at_evt_cb_set[AT_SOCKET_EVT_CLOSED])
-    {
-        at_evt_cb_set[AT_SOCKET_EVT_CLOSED](socket, AT_SOCKET_EVT_CLOSED, NULL, 0);
-    }
+    rt_free(send_buf);
 }
 
-static void urc_recv_func(struct at_client *client, const char *data, rt_size_t size)
+static void read_ack_func(struct at_client *client, const char *data, rt_size_t size)
 {
     int device_socket = 0;
     rt_int32_t timeout;
@@ -633,7 +491,7 @@ static void urc_recv_func(struct at_client *client, const char *data, rt_size_t
     }
 
     /* get the current socket and receive buffer size by receive data */
-    sscanf(data, "+QIURC: \"recv\",%d,%d", &device_socket, (int *) &bfsz);
+    sscanf(data, "$MYNETREAD: %d,%d", &device_socket, &bfsz);
     /* set receive timeout by receive buffer length, not less than 10 ms */
     timeout = bfsz > 10 ? bfsz : 10;
 
@@ -678,96 +536,14 @@ static void urc_recv_func(struct at_client *client, const char *data, rt_size_t
     {
         at_evt_cb_set[AT_SOCKET_EVT_RECV](socket, AT_SOCKET_EVT_RECV, recv_buf, bfsz);
     }
-}
 
-static void urc_pdpdeact_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    int connectID = 0;
-
-    RT_ASSERT(data && size);
-
-    sscanf(data, "+QIURC: \"pdpdeact\",%d", &connectID);
-
-    LOG_E("context (%d) is deactivated.", connectID);
-}
-
-static void urc_dnsqip_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    int i = 0, j = 0;
-    char recv_ip[16] = {0};
-    int result, ip_count, dns_ttl;
-    struct at_device *device = RT_NULL;
-    struct at_device_n720 *n720 = RT_NULL;
-    char *client_name = client->device->parent.name;
-
-    RT_ASSERT(data && size);
-
-    device = at_device_get_by_name(AT_DEVICE_NAMETYPE_CLIENT, client_name);
-    if (device == RT_NULL)
-    {
-        LOG_E("get device(%s) failed.", client_name);
-        return;
-    }
-    
-    n720 = (struct at_device_n720 *) device->user_data;
-    if (n720->socket_data == RT_NULL)
-    {
-        LOG_D("%s device socket_data no config.", n720->device_name);
-        return;
-    }
-
-    for (i = 0; i < size; i++)
-    {
-        if (*(data + i) == '.')
-            j++;
-    }
-    /* There would be several dns result, we just pickup one */
-    if (j == 3)
-    {
-        sscanf(data, "+QIURC: \"dnsgip\",\"%[^\"]", recv_ip);
-        recv_ip[15] = '\0';
-
-        rt_memcpy(n720->socket_data, recv_ip, sizeof(recv_ip));
-
-        n720_socket_event_send(device, N720_EVENT_DOMAIN_OK);
-    }
-    else
-    {
-        sscanf(data, "+QIURC: \"dnsgip\",%d,%d,%d", &result, &ip_count, &dns_ttl);
-        if (result)
-        {
-            at_tcp_ip_errcode_parse(result);
-        }
-    }
-}
-
-static void urc_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    RT_ASSERT(data);
-
-    LOG_I("URC data : %.*s", size, data);
-}
-
-static void urc_qiurc_func(struct at_client *client, const char *data, rt_size_t size)
-{
-    RT_ASSERT(data && size);
-
-    switch(*(data + 9))
-    {
-    case 'c' : urc_close_func(client, data, size); break;//+QIURC: "closed"
-    case 'r' : urc_recv_func(client, data, size); break;//+QIURC: "recv"
-    case 'p' : urc_pdpdeact_func(client, data, size); break;//+QIURC: "pdpdeact"
-    case 'd' : urc_dnsqip_func(client, data, size); break;//+QIURC: "dnsgip"
-    default  : urc_func(client, data, size);      break;
-    }
 }
 
 static const struct at_urc urc_table[] =
 {
-    {"SEND OK",     "\r\n",                 urc_send_func},
-    {"SEND FAIL",   "\r\n",                 urc_send_func},
-    {"+QIOPEN:",    "\r\n",                 urc_connect_func},
-    {"+QIURC:",     "\r\n",                 urc_qiurc_func},
+    {"$MYURCCLOSE:",    "\r\n",     urc_close_func},
+    {"$MYURCREAD:",     "\r\n",     urc_recv_func},
+    {"$MYNETREAD:",     "\r\n",     read_ack_func},
 };
 
 static const struct at_socket_ops n720_socket_ops =

+ 1 - 0
inc/at_device.h

@@ -63,6 +63,7 @@ extern "C" {
 #define AT_DEVICE_CLASS_N21            0x11U
 #define AT_DEVICE_CLASS_N58            0x12U
 #define AT_DEVICE_CLASS_M5311          0X13U
+#define AT_DEVICE_CLASS_N720           0X14U
 
 /* Options and Commands for AT device control opreations */
 #define AT_DEVICE_CTRL_POWER_ON        0x01L

+ 1 - 0
samples/at_sample_n720.c

@@ -58,6 +58,7 @@ static struct at_device_n720 _dev =
     N720_SAMPLE_STATUS_PIN,
     N720_SAMPLE_WAKEUP_PIN,
     N720_SAMPLE_RECV_BUFF_LEN,
+    RT_NULL,
 };
 
 static int n720_device_register(void)