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

Merge pull request #17 from chenyong111/master

Browse Source 
适配 AT Client 初始化改动
This commit is contained in:
朱天龙 (Armink) 2018-08-21 13:40:09 +08:00 committed by GitHub
commit 86c1698d95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
at_socket_esp8266.c
View File

@ -528,32 +528,6 @@ static struct at_urc urc_table[] = {
{"WIFI DISCONNECT", "\r\n", urc_func},
};
/* AT client port initialization */
int at_client_port_init(void)
{
/* create current AT socket event */
at_socket_event = rt_event_create("at_sock_event", RT_IPC_FLAG_FIFO);
if (!at_socket_event)
{
LOG_E("RT AT client port initialize failed! at_sock_event create failed!");
return -RT_ENOMEM;
}
/* create current AT socket lock */
at_event_lock = rt_mutex_create("at_event_lock", RT_IPC_FLAG_FIFO);
if (!at_event_lock)
{
LOG_E("RT AT client port initialize failed! at_sock_lock create failed!");
rt_event_delete(at_socket_event);
return -RT_ENOMEM;
}
/* register URC data execution function */
at_set_urc_table(urc_table, sizeof(urc_table) / sizeof(urc_table[0]));
return RT_EOK;
}
#define AT_SEND_CMD(resp, cmd) \
do \
{ \
@ -643,6 +617,8 @@ int esp8266_net_init(void)
#else
esp8266_init_thread_entry(RT_NULL);
#endif
return RT_EOK;
}
int esp8266_ping(int argc, char **argv)
@ -708,11 +684,36 @@ static const struct at_device_ops esp8266_socket_ops = {
static int at_socket_device_init(void)
{
/* create current AT socket event */
at_socket_event = rt_event_create("at_se", RT_IPC_FLAG_FIFO);
if (at_socket_event == RT_NULL)
{
LOG_E("RT AT client port initialize failed! at_sock_event create failed!");
return -RT_ENOMEM;
}
/* create current AT socket event lock */
at_event_lock = rt_mutex_create("at_se", RT_IPC_FLAG_FIFO);
if (at_event_lock == RT_NULL)
{
LOG_E("RT AT client port initialize failed! at_sock_lock create failed!");
rt_event_delete(at_socket_event);
return -RT_ENOMEM;
}
/* initialize AT client */
at_client_init();
/* register URC data execution function */
at_set_urc_table(urc_table, sizeof(urc_table) / sizeof(urc_table[0]));
/* initialize esp8266 network */
esp8266_net_init();
/* set esp8266 AT Socket options */
at_scoket_device_register(&esp8266_socket_ops);
return 0;
return RT_EOK;
}
INIT_APP_EXPORT(at_socket_device_init);

60
at_socket_m26.c
View File

@ -613,32 +613,6 @@ static const struct at_urc urc_table[] = {
{"+QPING:", "\r\n", urc_ping_func},
};
/* AT client port initialization */
int at_client_port_init(void)
{
/* create current AT socket event */
at_socket_event = rt_event_create("at_sock_event", RT_IPC_FLAG_FIFO);
if (!at_socket_event)
{
LOG_E("AT client port initialize failed! at_sock_event create failed!");
return -RT_ENOMEM;
}
/* create current AT socket lock */
at_event_lock = rt_mutex_create("at_event_lock", RT_IPC_FLAG_FIFO);
if (!at_event_lock)
{
LOG_E("AT client port initialize failed! at_sock_lock create failed!");
rt_event_delete(at_socket_event);
return -RT_ENOMEM;
}
/* register URC data execution function */
at_set_urc_table(urc_table, sizeof(urc_table) / sizeof(urc_table[0]));
return RT_EOK;
}
#define AT_SEND_CMD(resp, resp_line, timeout, cmd) \
do \
{ \
@ -661,7 +635,6 @@ static void m26_init_thread_entry(void *parameter)
int i, qimux, qimode;
char parsed_data[10];
rt_err_t result = RT_EOK;
const char *line_buffer = RT_NULL;
resp = at_create_resp(128, 0, rt_tick_from_millisecond(300));
if (!resp)
@ -823,6 +796,8 @@ int m26_net_init(void)
#else
m26_init_thread_entry(RT_NULL);
#endif
return RT_EOK;
}
int m26_ping(int argc, char **argv)
@ -879,11 +854,11 @@ int m26_ifconfig(void)
if (at_resp_parse_line_args(resp, 2, resp_expr, resp_arg) == 1)
{
LOG_D("ip adress : %s", resp_arg);
rt_kprintf("IP address : %s\n", resp_arg);
}
else
{
LOG_E("Parse error, current line buff : %s", at_resp_get_line(resp, 2));
rt_kprintf("Parse error, current line buff : %s\n", at_resp_get_line(resp, 2));
result = RT_ERROR;
goto __exit;
}
@ -914,11 +889,36 @@ static const struct at_device_ops m26_socket_ops = {
static int at_socket_device_init(void)
{
/* create current AT socket event */
at_socket_event = rt_event_create("at_se", RT_IPC_FLAG_FIFO);
if (at_socket_event == RT_NULL)
{
LOG_E("AT client port initialize failed! at_sock_event create failed!");
return -RT_ENOMEM;
}
/* create current AT socket event lock */
at_event_lock = rt_mutex_create("at_se", RT_IPC_FLAG_FIFO);
if (at_event_lock == RT_NULL)
{
LOG_E("AT client port initialize failed! at_sock_lock create failed!");
rt_event_delete(at_socket_event);
return -RT_ENOMEM;
}
/* initialize AT client */
at_client_init();
/* register URC data execution function */
at_set_urc_table(urc_table, sizeof(urc_table) / sizeof(urc_table[0]));
/* initialize m26 network */
m26_net_init();
/* set m26 AT Socket options */
at_scoket_device_register(&m26_socket_ops);
return 0;
return RT_EOK;
}
INIT_APP_EXPORT(at_socket_device_init);