Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
BaiXuePrincess
rt-thread
提交
233b90a3
R
rt-thread
项目概览
BaiXuePrincess
/
rt-thread
与 Fork 源项目一致
Fork自
RT-Thread / rt-thread
通知
1
Star
0
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,发现更多精彩内容 >>
未验证
提交
233b90a3
编写于
9月 04, 2021
作者:
G
guo
提交者:
GitHub
9月 04, 2021
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #4998 from loogg/mlw
修复 ringblk_buf 在不使用动态内存时报错的问题以及 AT 组件优化
上级
40df71e7
f1e1b6b2
变更
3
显示空白变更内容
内联
并排
Showing
3 changed file
with
32 addition
and
20 deletion
+32
-20
components/drivers/include/ipc/ringblk_buf.h
components/drivers/include/ipc/ringblk_buf.h
+4
-1
components/drivers/src/ringblk_buf.c
components/drivers/src/ringblk_buf.c
+4
-0
components/net/at/src/at_client.c
components/net/at/src/at_client.c
+24
-19
未找到文件。
components/drivers/include/ipc/ringblk_buf.h
浏览文件 @
233b90a3
...
...
@@ -76,9 +76,12 @@ typedef struct rt_rbb *rt_rbb_t;
/* rbb (ring block buffer) API */
void
rt_rbb_init
(
rt_rbb_t
rbb
,
rt_uint8_t
*
buf
,
rt_size_t
buf_size
,
rt_rbb_blk_t
block_set
,
rt_size_t
blk_max_num
);
rt_size_t
rt_rbb_get_buf_size
(
rt_rbb_t
rbb
);
#ifdef RT_USING_HEAP
rt_rbb_t
rt_rbb_create
(
rt_size_t
buf_size
,
rt_size_t
blk_max_num
);
void
rt_rbb_destroy
(
rt_rbb_t
rbb
);
rt_size_t
rt_rbb_get_buf_size
(
rt_rbb_t
rbb
);
#endif
/* rbb block API */
rt_rbb_blk_t
rt_rbb_blk_alloc
(
rt_rbb_t
rbb
,
rt_size_t
blk_size
);
...
...
components/drivers/src/ringblk_buf.c
浏览文件 @
233b90a3
...
...
@@ -44,6 +44,8 @@ void rt_rbb_init(rt_rbb_t rbb, rt_uint8_t *buf, rt_size_t buf_size, rt_rbb_blk_t
}
RTM_EXPORT
(
rt_rbb_init
);
#ifdef RT_USING_HEAP
/**
* ring block buffer object create
*
...
...
@@ -102,6 +104,8 @@ void rt_rbb_destroy(rt_rbb_t rbb)
}
RTM_EXPORT
(
rt_rbb_destroy
);
#endif
static
rt_rbb_blk_t
find_empty_blk_in_set
(
rt_rbb_t
rbb
)
{
rt_size_t
i
;
...
...
components/net/at/src/at_client.c
浏览文件 @
233b90a3
...
...
@@ -310,7 +310,6 @@ int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr
rt_mutex_take
(
client
->
lock
,
RT_WAITING_FOREVER
);
client
->
resp_status
=
AT_RESP_OK
;
client
->
resp
=
resp
;
if
(
resp
!=
RT_NULL
)
{
...
...
@@ -318,6 +317,9 @@ int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr
resp
->
line_counts
=
0
;
}
client
->
resp
=
resp
;
rt_sem_control
(
client
->
resp_notice
,
RT_IPC_CMD_RESET
,
RT_NULL
);
va_start
(
args
,
cmd_expr
);
at_vprintfln
(
client
->
device
,
cmd_expr
,
args
);
va_end
(
args
);
...
...
@@ -327,7 +329,7 @@ int at_obj_exec_cmd(at_client_t client, at_response_t resp, const char *cmd_expr
if
(
rt_sem_take
(
client
->
resp_notice
,
resp
->
timeout
)
!=
RT_EOK
)
{
cmd
=
at_get_last_cmd
(
&
cmd_size
);
LOG_
D
(
"execute command (%.*s) timeout (%d ticks)!"
,
cmd_size
,
cmd
,
resp
->
timeout
);
LOG_
W
(
"execute command (%.*s) timeout (%d ticks)!"
,
cmd_size
,
cmd
,
resp
->
timeout
);
client
->
resp_status
=
AT_RESP_TIMEOUT
;
result
=
-
RT_ETIMEOUT
;
goto
__exit
;
...
...
@@ -381,6 +383,7 @@ int at_client_obj_wait_connect(at_client_t client, rt_uint32_t timeout)
rt_mutex_take
(
client
->
lock
,
RT_WAITING_FOREVER
);
client
->
resp
=
resp
;
rt_sem_control
(
client
->
resp_notice
,
RT_IPC_CMD_RESET
,
RT_NULL
);
start_time
=
rt_tick_get
();
...
...
@@ -426,6 +429,8 @@ int at_client_obj_wait_connect(at_client_t client, rt_uint32_t timeout)
*/
rt_size_t
at_client_obj_send
(
at_client_t
client
,
const
char
*
buf
,
rt_size_t
size
)
{
rt_size_t
len
;
RT_ASSERT
(
buf
);
if
(
client
==
RT_NULL
)
...
...
@@ -440,7 +445,7 @@ rt_size_t at_client_obj_send(at_client_t client, const char *buf, rt_size_t size
rt_mutex_take
(
client
->
lock
,
RT_WAITING_FOREVER
);
rt_size_t
len
=
at_utils_send
(
client
->
device
,
0
,
buf
,
size
);
len
=
at_utils_send
(
client
->
device
,
0
,
buf
,
size
);
rt_mutex_release
(
client
->
lock
);
...
...
@@ -480,9 +485,7 @@ static rt_err_t at_client_getchar(at_client_t client, char *ch, rt_int32_t timeo
*/
rt_size_t
at_client_obj_recv
(
at_client_t
client
,
char
*
buf
,
rt_size_t
size
,
rt_int32_t
timeout
)
{
rt_size_t
read_idx
=
0
;
rt_err_t
result
=
RT_EOK
;
char
ch
;
rt_size_t
len
=
0
;
RT_ASSERT
(
buf
);
...
...
@@ -494,28 +497,30 @@ rt_size_t at_client_obj_recv(at_client_t client, char *buf, rt_size_t size, rt_i
while
(
1
)
{
if
(
read_idx
<
size
)
{
result
=
at_client_getchar
(
client
,
&
ch
,
timeout
);
if
(
result
!=
RT_EOK
)
{
LOG_E
(
"AT Client receive failed, uart device get data error(%d)"
,
result
);
return
0
;
}
rt_size_t
read_len
;
buf
[
read_idx
++
]
=
ch
;
}
else
rt_sem_control
(
client
->
rx_notice
,
RT_IPC_CMD_RESET
,
RT_NULL
);
read_len
=
rt_device_read
(
client
->
device
,
0
,
buf
+
len
,
size
);
if
(
read_len
>
0
)
{
len
+=
read_len
;
size
-=
read_len
;
if
(
size
==
0
)
break
;
continue
;
}
if
(
rt_sem_take
(
client
->
rx_notice
,
rt_tick_from_millisecond
(
timeout
))
!=
RT_EOK
)
break
;
}
#ifdef AT_PRINT_RAW_CMD
at_print_raw_cmd
(
"urc_recv"
,
buf
,
size
);
at_print_raw_cmd
(
"urc_recv"
,
buf
,
len
);
#endif
return
read_idx
;
return
len
;
}
/**
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录