Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
wwsmg1
rt-thread
提交
180d0e12
R
rt-thread
项目概览
wwsmg1
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
1
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
R
rt-thread
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
180d0e12
编写于
7月 08, 2021
作者:
Comeon_fly
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
add at_utils_send virtual function
上级
e7b63ed7
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
28 addition
and
6 deletion
+28
-6
components/net/at/src/at_client.c
components/net/at/src/at_client.c
+13
-3
components/net/at/src/at_server.c
components/net/at/src/at_server.c
+5
-1
components/net/at/src/at_utils.c
components/net/at/src/at_utils.c
+10
-2
未找到文件。
components/net/at/src/at_client.c
浏览文件 @
180d0e12
...
...
@@ -8,7 +8,7 @@
* 2018-03-30 chenyong first version
* 2018-04-12 chenyong add client implement
* 2018-08-17 chenyong multiple client support
* 2021-03-17 Meco Man fix a buf of leaking memory
* 2021-03-17 Meco Man fix a buf of leaking memory
*/
#include <at.h>
...
...
@@ -28,6 +28,10 @@
static
struct
at_client
at_client_table
[
AT_CLIENT_NUM_MAX
]
=
{
0
};
extern
rt_size_t
at_utils_send
(
rt_device_t
dev
,
rt_off_t
pos
,
const
void
*
buffer
,
rt_size_t
size
);
extern
rt_size_t
at_vprintfln
(
rt_device_t
device
,
const
char
*
format
,
va_list
args
);
extern
void
at_print_raw_cmd
(
const
char
*
type
,
const
char
*
cmd
,
rt_size_t
size
);
extern
const
char
*
at_get_last_cmd
(
rt_size_t
*
cmd_size
);
...
...
@@ -392,7 +396,7 @@ int at_client_obj_wait_connect(at_client_t client, rt_uint32_t timeout)
/* Check whether it is already connected */
resp
->
buf_len
=
0
;
resp
->
line_counts
=
0
;
rt_device_write
(
client
->
device
,
0
,
"AT
\r\n
"
,
4
);
at_utils_send
(
client
->
device
,
0
,
"AT
\r\n
"
,
4
);
if
(
rt_sem_take
(
client
->
resp_notice
,
resp
->
timeout
)
!=
RT_EOK
)
continue
;
...
...
@@ -433,7 +437,13 @@ rt_size_t at_client_obj_send(at_client_t client, const char *buf, rt_size_t size
at_print_raw_cmd
(
"sendline"
,
buf
,
size
);
#endif
return
rt_device_write
(
client
->
device
,
0
,
buf
,
size
);
rt_mutex_take
(
client
->
lock
,
RT_WAITING_FOREVER
);
rt_size_t
len
=
at_utils_send
(
client
->
device
,
0
,
buf
,
size
);
rt_mutex_release
(
client
->
lock
);
return
len
;
}
static
rt_err_t
at_client_getchar
(
at_client_t
client
,
char
*
ch
,
rt_int32_t
timeout
)
...
...
components/net/at/src/at_server.c
浏览文件 @
180d0e12
...
...
@@ -38,6 +38,10 @@ static at_server_t at_server_local = RT_NULL;
static
at_cmd_t
cmd_table
=
RT_NULL
;
static
rt_size_t
cmd_num
;
extern
rt_size_t
at_utils_send
(
rt_device_t
dev
,
rt_off_t
pos
,
const
void
*
buffer
,
rt_size_t
size
);
extern
void
at_vprintf
(
rt_device_t
device
,
const
char
*
format
,
va_list
args
);
extern
void
at_vprintfln
(
rt_device_t
device
,
const
char
*
format
,
va_list
args
);
...
...
@@ -187,7 +191,7 @@ rt_size_t at_server_send(at_server_t server, const char *buf, rt_size_t size)
return
0
;
}
return
rt_device_write
(
server
->
device
,
0
,
buf
,
size
);
return
at_utils_send
(
server
->
device
,
0
,
buf
,
size
);
}
/**
...
...
components/net/at/src/at_utils.c
浏览文件 @
180d0e12
...
...
@@ -65,6 +65,14 @@ const char *at_get_last_cmd(rt_size_t *cmd_size)
return
send_buf
;
}
RT_WEAK
rt_size_t
at_utils_send
(
rt_device_t
dev
,
rt_off_t
pos
,
const
void
*
buffer
,
rt_size_t
size
)
{
return
rt_device_write
(
dev
,
pos
,
buffer
,
size
);
}
rt_size_t
at_vprintf
(
rt_device_t
device
,
const
char
*
format
,
va_list
args
)
{
last_cmd_len
=
vsnprintf
(
send_buf
,
sizeof
(
send_buf
),
format
,
args
);
...
...
@@ -75,7 +83,7 @@ rt_size_t at_vprintf(rt_device_t device, const char *format, va_list args)
at_print_raw_cmd
(
"sendline"
,
send_buf
,
last_cmd_len
);
#endif
return
at_
device
_send
(
device
,
0
,
send_buf
,
last_cmd_len
);
return
at_
utils
_send
(
device
,
0
,
send_buf
,
last_cmd_len
);
}
rt_size_t
at_vprintfln
(
rt_device_t
device
,
const
char
*
format
,
va_list
args
)
...
...
@@ -93,5 +101,5 @@ rt_size_t at_vprintfln(rt_device_t device, const char *format, va_list args)
at_print_raw_cmd
(
"sendline"
,
send_buf
,
len
);
#endif
return
at_
device
_send
(
device
,
0
,
send_buf
,
len
);
return
at_
utils
_send
(
device
,
0
,
send_buf
,
len
);
}
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录