huahua/can_bootloader
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复时间

Browse Source
This commit is contained in:
sunbeam 2022-10-05 09:17:27 +08:00
parent b33dab5399
commit 68d5ffba4b
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
default.aproj
View File

@ -5,21 +5,21 @@
<folder name="窗体文件" path="dlg" comment="目录" embed="true" local="false" ignored="false"/>
<folder name="user" path="user" embed="true" comment="目录" local="false" ignored="false">
<file name="CanThread.aardio" path="user\CanThread.aardio" comment="user\CanThread.aardio"/>
<file name="Diag22code.aardio" path="user\Diag22code.aardio" comment="user\Diag22code.aardio"/>
<file name="Diag10code.aardio" path="user\Diag10code.aardio" comment="user\Diag10code.aardio"/>
<file name="Diag28code.aardio" path="user\Diag28code.aardio" comment="user\Diag28code.aardio"/>
<file name="Diag85code.aardio" path="user\Diag85code.aardio" comment="user\Diag85code.aardio"/>
<file name="Diag7Fcode.aardio" path="user\Diag7Fcode.aardio" comment="user\Diag7Fcode.aardio"/>
<file name="Diag11code.aardio" path="user\Diag11code.aardio" comment="user\Diag11code.aardio"/>
<file name="Diag22code.aardio" path="user\Diag22code.aardio" comment="user\Diag22code.aardio"/>
<file name="Diag27code.aardio" path="user\Diag27code.aardio" comment="user\Diag27code.aardio"/>
<file name="DiagBootcode.aardio" path="user\DiagBootcode.aardio" comment="user\DiagBootcode.aardio"/>
<file name="securety.aardio" path="user\securety.aardio" comment="user\securety.aardio"/>
<file name="Diag28code.aardio" path="user\Diag28code.aardio" comment="user\Diag28code.aardio"/>
<file name="Diag2Ecode.aardio" path="user\Diag2Ecode.aardio" comment="user\Diag2Ecode.aardio"/>
<file name="Diag31code.aardio" path="user\Diag31code.aardio" comment="user\Diag31code.aardio"/>
<file name="Diag34code.aardio" path="user\Diag34code.aardio" comment="user\Diag34code.aardio"/>
<file name="Diag36code.aardio" path="user\Diag36code.aardio" comment="user\Diag36code.aardio"/>
<file name="S19Decode.aardio" path="user\S19Decode.aardio" comment="user\S19Decode.aardio"/>
<file name="Diag37code.aardio" path="user\Diag37code.aardio" comment="user\Diag37code.aardio"/>
<file name="Diag11code.aardio" path="user\Diag11code.aardio" comment="user\Diag11code.aardio"/>
<file name="Diag7Fcode.aardio" path="user\Diag7Fcode.aardio" comment="user\Diag7Fcode.aardio"/>
<file name="Diag85code.aardio" path="user\Diag85code.aardio" comment="user\Diag85code.aardio"/>
<file name="DiagBootcode.aardio" path="user\DiagBootcode.aardio" comment="user\DiagBootcode.aardio"/>
<file name="GeelySecurety.aardio" path="user\GeelySecurety.aardio" comment="user\GeelySecurety.aardio"/>
<file name="S19Decode.aardio" path="user\S19Decode.aardio" comment="user\S19Decode.aardio"/>
<file name="securety.aardio" path="user\securety.aardio" comment="user\securety.aardio"/>
</folder>
</project>

10
main.aardio
View File

@ -35,6 +35,7 @@ import win.timer;
var boot_count = 0;//boot时间计数器
var bootstate = false;//boot状态标志
var starttime = time.now();
timer_bootcount = win.timer(mainForm,100);
timer_bootcount.onTimer = function(){//boot时间定时器，100ms间隔
boot_count++;
@ -126,10 +127,11 @@ listener.$Connected = function(){
flag_connected = 1;
}
listener.$SendEnd = function(isSuccess){
timer_bootcount.disable();
//timer_bootcount.disable();
var usetime = time.now().diffsecond(starttime);
bootstate = false;
if(isSuccess == true){
Display("刷写成功，用时 " + boot_count/10 + " S")
Display("刷写成功，用时 " + usetime + " S")
}
}
@ -139,7 +141,7 @@ var CanThread = function(){
//线程函数内部要添加自已的import语句
import win;
import console;
console.log("线程开始运行")
//console.log("线程开始运行")
loadcodex("\user\CanThread.aardio");//加载线程程序
//在子线程启动消息循环
win.loopMessage(FuncLoopMsg)
@ -189,7 +191,7 @@ mainForm.btnFlash.oncommand = function(id,event){
bootstate = true;
mainForm.edit.text = "";
Display("开始刷写流程");
timer_bootcount.enable();
//timer_bootcount.enable();
boot_count = 0;
DiagBootReq();

4
user/DiagBootcode.aardio
View File

@ -83,9 +83,9 @@ FuncSendBlockInit = function(id){
return 1;
}
for(i=1;#alldata;1){
len += math.ceil(#alldata[i]["data"] / 0x400)
len += math.ceil(#alldata[i]["data"] / 0x200)
}
alldata_blocknum = len + 19;
alldata_blocknum = len;
block_sended = 0;
sendblockstate = 0;
return 0;