From a2e0dca8189404c81267c96723ba8bbfc519503d Mon Sep 17 00:00:00 2001 From: =?utf8?q?=E8=83=A1=E4=BC=A0=E5=86=9B?= <1224667075@qq.com> Date: Thu, 22 May 2025 02:00:25 +0000 Subject: [PATCH] Merge #1776 into sdk650pathc0423 from refs/changes/1776/head MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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> CR-link: https://codeup.aliyun.com/64191456b9581d62e8f81ac0/FD230/change/1776 --- code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c b/code/sdk/zhihui/services/ble_service/bleservice/bleEvent.c index 314b3988b..4c6f1652e 100644 --- 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) } else if(ble_read_timer_p->file_recv_stat.file_type==4) { - TRANSMIT_DATA=TRANS_BIN_TRANSMITTING; + TRANSMIT_DATA=TRANS_BIN_FAIL; } else -- 2.17.1