murmur/TT12-MCU
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

packFile bug修复

Browse Source
This commit is contained in:
CSSC-WORK\murmur 2023-09-13 14:56:34 +08:00
parent 15f9cf693b
commit 185dd63cf8
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
applications/core.c
View File

@ -442,8 +442,7 @@ static void upSendFile_thread_entry(void *parameter)
} }
LOG_D("ready to send '%s---%d'",f->fname,f->index); LOG_D("ready to send '%s---%d'",f->fname,f->index);
static rt_uint8_t len =0; uint8_t len = pack_File(f->fname, 0, d, s);
len = pack_File(f->fname, 0, d, s);
for (size_t i = 0; i < len; i++) { for (size_t i = 0; i < len; i++) {
LOG_HEX("msg",27,d[i],s[i]); LOG_HEX("msg",27,d[i],s[i]);
} }

4
applications/ttmsg/ttmsg.c
View File

@ -294,6 +294,7 @@ rt_uint8_t pack_File(const char *fin, rt_uint8_t flag, const rt_uint8_t (*dout)[
} }
//更新算法，改用特定大小依次读取文件，弃用一次性全部读入文件 //更新算法，改用特定大小依次读取文件，弃用一次性全部读入文件
// static uint8_t row =0;
uint8_t row = (file_size / flen) + (file_size % flen > 0 ? 1 : 0); uint8_t row = (file_size / flen) + (file_size % flen > 0 ? 1 : 0);
cfg.fallpiece[0] = row; cfg.fallpiece[0] = row;
@ -346,7 +347,8 @@ rt_uint8_t pack_File(const char *fin, rt_uint8_t flag, const rt_uint8_t (*dout)[
close(fd_in); close(fd_in);
} }
return row; // return row;
return cfg.fallpiece[0];
} }