Pārlūkot izejas kodu

Merge pull request #46 from qgyhd1234/8266

【修改】修改log的打印等级,延长域名转换的超时时间
朱天龙 (Armink) 6 gadi atpakaļ
vecāks
revīzija
c831488709
4 mainītis faili ar 17 papildinājumiem un 17 dzēšanām
  1. 3 3
      at_socket_ec20.c
  2. 6 6
      at_socket_esp8266.c
  3. 4 4
      at_socket_m26.c
  4. 4 4
      at_socket_sim800c.c

+ 3 - 3
at_socket_ec20.c

@@ -1499,13 +1499,13 @@ static int ec20_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, ip
     resp = at_create_resp(EC20_DNS_RESP_LEN, 0, EC20_DNS_RESP_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("EC20 set dns server failed, no memory for response object.");
+        LOG_D("EC20 set dns server failed, no memory for response object.");
         result = -RT_ENOMEM;
         goto __exit;
     }
 
     /* send "AT+QIDNSCFG=<pri_dns>[,<sec_dns>]" commond to set dns servers */
-    if (at_exec_cmd(resp, "AT+QIDNSCFG=1,\"%s\"", inet_ntoa(dns_server)) < 0)
+    if (at_exec_cmd(resp, "AT+QIDNSCFG=1,\"%s\"", inet_ntoa(*dns_server)) < 0)
     {
         result = -RT_ERROR;
         goto __exit;
@@ -1544,7 +1544,7 @@ static int ec20_netdev_ping(struct netdev *netdev, const char *host, size_t data
     resp = at_create_resp(EC20_PING_RESP_SIZE, 4, EC20_PING_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("No memory for response structure!\n");
+        LOG_D("No memory for response structure!\n");
         return -RT_ENOMEM;
     }
 

+ 6 - 6
at_socket_esp8266.c

@@ -346,7 +346,7 @@ static int esp8266_domain_resolve(const char *name, char ip[16])
     RT_ASSERT(name);
     RT_ASSERT(ip);
 
-    resp = at_create_resp(128, 0, rt_tick_from_millisecond(5000));
+    resp = at_create_resp(128, 0, rt_tick_from_millisecond(20000));
     if (!resp)
     {
         LOG_E("No memory for response structure!");
@@ -833,7 +833,7 @@ static int esp8266_netdev_set_addr_info(struct netdev *netdev, ip_addr_t *ip_add
     /* send addr info set commond "AT+CIPSTA_CUR=<ip>[,<gateway>,<netmask>]" and wait response */
     if (at_exec_cmd(resp, "AT+CIPSTA_CUR=\"%s\",\"%s\",\"%s\"", esp8266_ip_addr, esp8266_gw_addr, esp8266_netmask_addr) < 0)
     {
-        LOG_E("esp8266 set addr info failed.");
+        LOG_D("esp8266 set addr info failed.");
         result = -RT_ERROR;
     }
     else
@@ -879,9 +879,9 @@ static int esp8266_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num,
     rt_mutex_take(at_event_lock, RT_WAITING_FOREVER);
 
     /* send dns server set commond "AT+CIPDNS_CUR=<enable>[,<DNS	server0>,<DNS	server1>]" and wait response */
-    if (at_exec_cmd(resp, "AT+CIPDNS_CUR=1,\"%s\"", inet_ntoa(dns_server)) < 0)
+    if (at_exec_cmd(resp, "AT+CIPDNS_CUR=1,\"%s\"", inet_ntoa(*dns_server)) < 0)
     {
-        LOG_E("set dns server(%s) failed", inet_ntoa(dns_server));
+        LOG_E("set dns server(%s) failed", inet_ntoa(*dns_server));
         result = -RT_ERROR;
     }
     else
@@ -968,7 +968,7 @@ static int esp8266_netdev_ping(struct netdev *netdev, const char *host, size_t d
     /* send domain commond "AT+CIPDOMAIN=<domain name>" and wait response */
     if (at_exec_cmd(resp, "AT+CIPDOMAIN=\"%s\"", host) < 0)
     {
-        LOG_E("ping: send commond AT+CIPDOMAIN=<domain name> failed");
+        LOG_D("ping: send commond AT+CIPDOMAIN=<domain name> failed");
         result = -RT_ERROR;
         goto __exit;
     }
@@ -984,7 +984,7 @@ static int esp8266_netdev_ping(struct netdev *netdev, const char *host, size_t d
     /* send ping commond "AT+PING=<IP>" and wait response */
     if (at_exec_cmd(resp, "AT+PING=\"%s\"", host) < 0)
     {
-        LOG_E("ping: unknown remote server host");
+        LOG_D("ping: unknown remote server host");
         result = -RT_ERROR;
         goto __exit;
     }

+ 4 - 4
at_socket_m26.c

@@ -1058,14 +1058,14 @@ static int m26_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num, ip_
     resp = at_create_resp(M26_DNS_RESP_LEN, 0, M26_DNS_RESP_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("m26 set dns server failed, no memory for response object.");
+        LOG_D("m26 set dns server failed, no memory for response object.");
         return -RT_ENOMEM;
     }
 
     rt_mutex_take(at_event_lock, RT_WAITING_FOREVER);
 
     /* send "AT+QIDNSCFG=<pri_dns>[,<sec_dns>]" commond to set dns servers */
-    if (at_exec_cmd(resp, "AT+QIDNSCFG=\"%s\"", inet_ntoa(dns_server)) < 0)
+    if (at_exec_cmd(resp, "AT+QIDNSCFG=\"%s\"", inet_ntoa(*dns_server)) < 0)
     {
         result = -RT_ERROR;
         goto __exit;
@@ -1102,7 +1102,7 @@ static int m26_netdev_ping(struct netdev *netdev, const char *host, size_t data_
     resp = at_create_resp(M26_PING_RESP_SIZE, 5, M26_PING_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("m26 set dns server failed, no memory for response object.");
+        LOG_D("m26 set dns server failed, no memory for response object.");
         return  -RT_ENOMEM;
     }
 
@@ -1122,7 +1122,7 @@ static int m26_netdev_ping(struct netdev *netdev, const char *host, size_t data_
         if (at_resp_parse_line_args_by_kw(resp, "+QPING:", "+QPING:%d,%[^,],%d,%d,%d",
                 &response, ip_addr, &recv_data_len, &time, &ttl) <= 0)
         {
-            LOG_E("Prase \"AT+QPING\" commands resposne data error!");
+            LOG_D("Prase \"AT+QPING\" commands resposne data error!");
             result = -RT_ERROR;
             goto __exit;
         }   

+ 4 - 4
at_socket_sim800c.c

@@ -1082,13 +1082,13 @@ static int sim800c_netdev_set_dns_server(struct netdev *netdev, uint8_t dns_num,
     resp = at_create_resp(SIM800C_DNS_RESP_LEN, 0, SIM800C_DNS_RESP_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("sim800c set dns server failed, no memory for response object.");
+        LOG_D("sim800c set dns server failed, no memory for response object.");
         result = -RT_ENOMEM;
         goto __exit;
     }
 
     /* send "AT+CDNSCFG=<pri_dns>[,<sec_dns>]" commond to set dns servers */
-    if (at_exec_cmd(resp, "AT+CDNSCFG=\"%s\"", inet_ntoa(dns_server)) < 0)
+    if (at_exec_cmd(resp, "AT+CDNSCFG=\"%s\"", inet_ntoa(*dns_server)) < 0)
     {
         result = -RT_ERROR;
         goto __exit;
@@ -1142,7 +1142,7 @@ static int sim800c_netdev_ping(struct netdev *netdev, const char *host, size_t d
     resp = at_create_resp(SIM800C_PING_RESP_SIZE, 0, SIM800C_PING_TIMEO);
     if (resp == RT_NULL)
     {
-        LOG_E("sim800c set dns server failed, no memory for response object.");
+        LOG_D("sim800c set dns server failed, no memory for response object.");
         result = -RT_ERROR;
         goto __exit;
     }
@@ -1157,7 +1157,7 @@ static int sim800c_netdev_ping(struct netdev *netdev, const char *host, size_t d
     if (at_resp_parse_line_args_by_kw(resp, "+CIPPING:", "+CIPPING:%d,\"%[^\"]\",%d,%d",
              &response, ip_addr, &time, &ttl) <= 0)
     {
-        LOG_E("Prase \"AT+CIPPING\" commands resposne data error!");
+        LOG_D("Prase \"AT+CIPPING\" commands resposne data error!");
         result = -RT_ERROR;
         goto __exit;
     }