diff --git a/main.aardio b/main.aardio index 998bbbb..e1b52e5 100644 --- a/main.aardio +++ b/main.aardio @@ -16,7 +16,7 @@ btnReadSw={cls="button";text="读取软件版本号";left=37;top=382;right=136;b btnTest={cls="button";text="停止";left=149;top=316;right=248;bottom=344;z=11}; cbbChannel={cls="combobox";left=58;top=64;right=191;bottom=90;edge=1;items={};mode="dropdown";z=3}; cbbDev={cls="combobox";left=58;top=27;right=191;bottom=53;edge=1;items={};mode="dropdown";z=1}; -checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;z=21}; +checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;checked=1;z=21}; edFile={cls="richedit";left=8;top=131;right=288;bottom=187;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=14}; edFile2={cls="richedit";left=8;top=213;right=288;bottom=269;border=1;disabled=1;edge=1;multiline=1;wrap=1;z=22}; edit={cls="edit";left=294;top=19;right=596;bottom=401;autovscroll=false;edge=1;multiline=1;vscroll=1;z=5}; @@ -163,12 +163,12 @@ var DiagStopReq = function(){ } mainForm.btnReadSw.oncommand = function(id,event){ - DiagReadDID(0xF188); + DiagReadDID(0xF195); } mainForm.btnReadHw.oncommand = function(id,event){ - DiagReadDID(0xF191); + DiagReadDID(0xF193); } mainForm.btnReadF186.oncommand = function(id,event){ diff --git a/user/CanThread.aardio b/user/CanThread.aardio index 462a029..30b018b 100644 --- a/user/CanThread.aardio +++ b/user/CanThread.aardio @@ -5,8 +5,8 @@ import win.timer; CANHw = usb2canfd.USB2CANHW(); CANHw.LoadDll(); -DiagReqID = 0x741;//0x18dadff1; -DiagRespID = 0x751;//0x18daf1df; +DiagReqID = 0x7F3;//0x18dadff1; +DiagRespID = 0x7FB;//0x18daf1df; DiagGloableID = 0x7DF;//0x18DB33F1; stopflag = 0; //注册一个消息钩子函数 diff --git a/user/Diag22code.aardio b/user/Diag22code.aardio index aaa76ca..29b8cd8 100644 --- a/user/Diag22code.aardio +++ b/user/Diag22code.aardio @@ -12,6 +12,7 @@ FuncReadDID = function(did){ //FuncDisplay("did = " + tostring(did,16)); } +CurrentSession = 0; //接收 FuncDiag22Pro = function(data){ //console.log("诊断22服务") @@ -22,6 +23,7 @@ FuncDiag22Pro = function(data){ select(did) { case 0xF186 { FuncDisplay("当前会话: " + data[3]); + CurrentSession = data[3]; } case 0xF191 { FuncDisplay("硬件版本号"); diff --git a/user/DiagBootcode.aardio b/user/DiagBootcode.aardio index 882a279..e2b32f8 100644 --- a/user/DiagBootcode.aardio +++ b/user/DiagBootcode.aardio @@ -202,26 +202,43 @@ FuncBootSeq = function(){ if(sendstate == 0){ FuncReadDID(0xF195);//读取软件版本 FuncClearState(); + delaycount = 0; } else { - var ret = FuncWait(0x22); - nextstate(0); + //var ret = FuncWait(0x22); + //nextstate(0); + delaycount += 1; + if(delaycount > 10){ + nextstate(0);//延时1S + } } } case 2 { if(sendstate == 0){ FuncReadDID(0xF193);//读取硬件版本 FuncClearState(); + delaycount = 0; } else { - var ret = FuncWait(0x22); - nextstate(0); + //var ret = FuncWait(0x22); + //nextstate(0); + delaycount += 1; + if(delaycount > 10){ + nextstate(0);//延时1S + } } } case 3 { if(sendstate == 0){ - FuncReq10(true,0x03);//进入扩展会话 - FuncClearState(); + if(CurrentSession == 2){ + nextstate(0); + } + else { + FuncReq10(true,0x03);//进入扩展会话 + FuncClearState(); + } + + } else { var ret = FuncWait(0x10); @@ -232,20 +249,27 @@ FuncBootSeq = function(){ if(sendstate == 0){ FuncReq85(0x02);//关闭DTC FuncClearState(); + delaycount = 0; } else { - var ret = FuncWait(0x85); - nextstate(ret); + delaycount += 1; + if(delaycount > 10){ + nextstate(0);//延时1S + } } } case 5 { if(sendstate == 0){ FuncReq28(0x01,0x01);//禁止发送 FuncClearState(); + delaycount = 0; + } else { - var ret = FuncWait(0x28); - nextstate(ret); + delaycount += 1; + if(delaycount > 10){ + nextstate(0);//延时1S + } } } case 6 {