libs/rt-thread
libs
/
rt-thread
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[net][at] Add AT Client Error LOG for multiple clients

This commit is contained in:
chenyong 2018-08-31 17:24:26 +08:00
parent 33a5cf15ee
commit 02c1f0c621
2 changed files with 37 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
components/net/at/include/at.h
View File

@ -31,7 +31,8 @@
#ifdef __cplusplus
extern "C" {
#endif
#define AT_SW_VERSION "1.0.0"
#define AT_SW_VERSION "1.0.1"
#define AT_SW_VERSION_NUM 0x10000
#define DBG_ENABLE

43
components/net/at/src/at_client.c
View File

@ -290,9 +290,14 @@ int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr
rt_err_t result = RT_EOK;
const char *cmd = RT_NULL;
RT_ASSERT(client);
RT_ASSERT(cmd_expr);
if (client == RT_NULL)
{
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return -RT_ERROR;
}
rt_mutex_take(client->lock, RT_WAITING_FOREVER);
client->resp_status = AT_RESP_OK;
@ -348,8 +353,8 @@ int at_client_obj_wait_connect(at_client_t client, rt_uint32_t timeout)
if (client == RT_NULL)
{
LOG_E("Input AT Client is NULL, please create or get AT Client!");
return RT_NULL;
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return -RT_ERROR;
}
resp = at_create_resp(16, 0, rt_tick_from_millisecond(500));
@ -400,13 +405,19 @@ int at_client_obj_wait_connect(at_client_t client, rt_uint32_t timeout)
* @param buf send data buffer
* @param size send fixed data size
*
* @return send data size
* @return >0: send data size
* =0: send failed
*/
rt_size_t at_client_obj_send(at_client_t client, const char *buf, rt_size_t size)
{
RT_ASSERT(client);
RT_ASSERT(buf);
if (client == RT_NULL)
{
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return 0;
}
#ifdef AT_PRINT_RAW_CMD
at_print_raw_cmd("send", buf, size);
#endif
@ -436,16 +447,22 @@ static char at_client_getchar(at_client_t client)
*
* @note this function can only be used in execution function of URC data
*
* @return success receive data size
* @return >0: receive data size
* =0: receive failed
*/
rt_size_t at_client_obj_recv(at_client_t client, char *buf, rt_size_t size)
{
rt_size_t read_idx = 0;
char ch;
RT_ASSERT(client);
RT_ASSERT(buf);
if (client == RT_NULL)
{
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return 0;
}
while (1)
{
if (read_idx < size)
@ -475,7 +492,11 @@ rt_size_t at_client_obj_recv(at_client_t client, char *buf, rt_size_t size)
*/
void at_obj_set_end_sign(at_client_t client, char ch)
{
RT_ASSERT(client);
if (client == RT_NULL)
{
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return;
}
client->end_sign = ch;
}
@ -491,6 +512,12 @@ void at_obj_set_urc_table(at_client_t client, const struct at_urc *urc_table, rt
{
rt_size_t idx;
if (client == RT_NULL)
{
LOG_E("input AT Client object is NULL, please create or get AT Client object!");
return;
}
for (idx = 0; idx < table_sz; idx++)
{
RT_ASSERT(urc_table[idx].cmd_prefix);