libs/at_device
libs
/
at_device
4
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #111 from qiyongzhong0/fix_me3616 

fix bug of me3616
This commit is contained in:
ChenYong 2020-04-26 09:31:48 +08:00 committed by GitHub
parent d21fd8fec8 027bd8e880
commit 96a75fe146
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
class/me3616/at_device_me3616.c
View File

@ -336,7 +336,7 @@ static int me3616_netdev_set_info(struct netdev *netdev)
} }
/* parse response data "+CGPADDR: 1,<IP_address>" */ /* parse response data "+CGPADDR: 1,<IP_address>" */
if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*d,\"%s\"", ipaddr) <= 0) if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*[^\"]\"%[^\"]", ipaddr) <= 0)
{ {
LOG_E("%s device \"AT+CGPADDR=1\" cmd error.", device->name); LOG_E("%s device \"AT+CGPADDR=1\" cmd error.", device->name);
result = -RT_ERROR; result = -RT_ERROR;
@ -553,6 +553,12 @@ static struct netdev *me3616_netdev_add(const char *netdev_name)
#define HWADDR_LEN 8 #define HWADDR_LEN 8
struct netdev *netdev = RT_NULL; struct netdev *netdev = RT_NULL;
netdev = netdev_get_by_name(netdev_name);
if(netdev != RT_NULL)
{
return(netdev);
}
netdev = (struct netdev *)rt_calloc(1, sizeof(struct netdev)); netdev = (struct netdev *)rt_calloc(1, sizeof(struct netdev));
if (netdev == RT_NULL) if (netdev == RT_NULL)
{ {
@ -656,7 +662,7 @@ static void me3616_init_thread_entry(void *parameter)
result = -RT_ERROR; result = -RT_ERROR;
goto __exit; goto __exit;
} }
at_resp_parse_line_args_by_kw(resp, "+IPR:", "+IPR: %d", &i); at_resp_parse_line_args_by_kw(resp, "+IPR:", "+IPR: %d\r", &i);
LOG_D("%s device baudrate %d", device->name, i); LOG_D("%s device baudrate %d", device->name, i);
/* get module version */ /* get module version */
@ -748,7 +754,7 @@ static void me3616_init_thread_entry(void *parameter)
char ipaddr[IP_ADDR_SIZE_MAX] = {0}; char ipaddr[IP_ADDR_SIZE_MAX] = {0};
/* parse response data "+CGPADDR: 1,<IP_address>" */ /* parse response data "+CGPADDR: 1,<IP_address>" */
if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*d,%s", ipaddr) > 0) if (at_resp_parse_line_args_by_kw(resp, "+CGPADDR:", "+CGPADDR: %*[^\"]\"%[^\"]", ipaddr) > 0)
{ {
LOG_D("%s device IP address: %s", device->name, ipaddr); LOG_D("%s device IP address: %s", device->name, ipaddr);
break; break;