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

Merge pull request #2361 from qgyhd1234/ymodem 

[components][ymodem]ymodem 握手阶段增加超时重试，防止数据接收不全
This commit is contained in:
Bernard Xiong 2019-02-24 23:47:17 +08:00 committed by GitHub
parent dcf52cf267 e2c0749d04
commit 4723d5d472
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/utilities/ymodem/ymodem.c
View File

@ -125,6 +125,7 @@ static rt_err_t _rym_do_handshake(
rt_size_t i;
rt_uint16_t recv_crc, cal_crc;
rt_size_t data_sz;
rt_tick_t tick;
ctx->stage = RYM_STAGE_ESTABLISHING;
/* send C every second, so the sender could know we are waiting for it. */
@ -149,8 +150,17 @@ static rt_err_t _rym_do_handshake(
return -RYM_ERR_TMO;
}
i = _rym_read_data(ctx, data_sz-1);
if (i != (data_sz-1))
/* receive all data */
i = 0;
/* automatic exit after receiving specified length data, timeout: 100ms */
tick = rt_tick_get();
while (rt_tick_get() <= (tick + rt_tick_from_millisecond(100)) && i < (data_sz-1))
{
i += _rym_read_data(ctx, data_sz - 1);
rt_thread_mdelay(5);
}
if (i != (data_sz - 1))
return -RYM_ERR_DSZ;
/* sanity check */