projects
/
mirrors
/
FD230.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
a26ab79
)
Merge #1776 into sdk650pathc0423 from refs/changes/1776/head
author
胡传军
<1224667075@qq.com>
Thu, 22 May 2025 02:00:25 +0000
(
02:00
+0000)
committer
袁清梦
<3449750381@qq.com>
Thu, 22 May 2025 02:00:25 +0000
(
02:00
+0000)
Code review from 胡传军
* refs/changes/1776/head: (12 commits squashed)
- 修改安装app回复错误指令bug
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- 提交hfp部分代码
- 修改appble处理函数
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- 修改bleservice代码编译问题
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
- 修改传输错误界面
- Merge branch 'sdk650pathc0423' of https://codeup.aliyun.com/
64191456b9581d62e8f81ac0
/FD230 into 0423
Signed-off-by: aliyun8003852482 <1224667075@qq.com>
Merged-by: Caisking <3449750381@qq.com>
link:
https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1776
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
patch
|
blob
|
history
diff --git
a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
index
314b398
..
4c6f165
100644
(file)
--- a/
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
+++ b/
code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c
@@
-8454,7
+8454,7
@@
errcode_t cancel_recv_file(uint8_t flag)
}
\r
else if(ble_read_timer_p->file_recv_stat.file_type==4)
\r
{
\r
- TRANSMIT_DATA=TRANS_BIN_
TRANSMITTING
;
\r
+ TRANSMIT_DATA=TRANS_BIN_
FAIL
;
\r
}
\r
\r
else
\r