diff --git a/default.aproj b/default.aproj index 4048a0f..91880c0 100644 --- a/default.aproj +++ b/default.aproj @@ -1,5 +1,5 @@  - + diff --git a/lib/usb2canfd.aardio b/lib/usb2canfd.aardio index 9391dd1..f5db3cf 100644 --- a/lib/usb2canfd.aardio +++ b/lib/usb2canfd.aardio @@ -197,7 +197,7 @@ namespace usb2canfd{ { //如果序号大于最大硬件数 return 0; } - //import console; + import console; var ret = DllHandle.USB_OpenDevice(AvailableHW[index].hLINHW) //canfd = true; if(canfd == true){ @@ -224,7 +224,7 @@ namespace usb2canfd{ else { var canconfig = ..usb2canfd.CAN_INIT_CONFIG(); - canconfig.CAN_Mode = 0;//0-正常模式 1-环回模式 + canconfig.CAN_Mode = 0x80;//0-正常模式 1-环回模式 0x80终端电阻 canconfig.CAN_ABOM = 0;//禁止自动离线 canconfig.CAN_NART = 1;//禁止报文重传 @@ -234,9 +234,9 @@ namespace usb2canfd{ canconfig.CAN_BRP = 4; canconfig.CAN_BS1 = 15; canconfig.CAN_BS2 = 5; - canconfig.CAN_SJW = 1; + canconfig.CAN_SJW = 2; ret = DllHandle.CAN_Init(AvailableHW[index].hLINHW,channel,canconfig); - console.log("init ret = " + ret); + //console.log("init ret = " + ret); } canfd_connected = canfd; diff --git a/main.aardio b/main.aardio index a67f44d..1b87d34 100644 --- a/main.aardio +++ b/main.aardio @@ -15,7 +15,7 @@ btnReadSw={cls="button";text="读取软件版本号";left=36;top=384;right=135;b btnTest={cls="button";text="停止";left=147;top=317;right=246;bottom=345;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;checked=1;z=21}; +checkbox={cls="checkbox";text="CANFD设备";left=151;top=101;right=248;bottom=120;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}; @@ -191,6 +191,7 @@ mainForm.btnFlash.oncommand = function(id,event){ bootstate = true; mainForm.edit.text = ""; Display("开始刷写流程"); + starttime = time.now(); //timer_bootcount.enable(); boot_count = 0; DiagBootReq();