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

CANFD OK

Browse Source
This commit is contained in:
sunbeam 2022-09-30 16:32:52 +08:00
parent d3924dcadb
commit 4c4f15a36a
6 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
USB2XXX.dll
View File

Binary file not shown.

17
lib/usb2canfd.aardio
View File

@ -137,13 +137,13 @@ namespace usb2canfd{
//加载DLL
LoadDll = function(){
try{
DllHandle = ..raw.loadDll("\USB2XXX.dll")
DllHandle = ..raw.loadDll("USB2XXX.dll")
}
catch(err)
{
import win;
DllHandle = null;
win.msgboxTimeout("加载USB2LIN的DLL失败，请检查USB2XXX.dll和libusb-1.0.dll文件","错误",1000,);
win.msgboxTimeout("加载USB2LIN的DLL失败，请检查USB2XXX.dll和libusb-1.0.dll文件","错误",3000,);
}
if(DllHandle == null)return 1;
return 0;
@ -201,7 +201,7 @@ namespace usb2canfd{
var ret = DllHandle.USB_OpenDevice(AvailableHW[index].hLINHW)
//canfd = true;
if(canfd == true){
canconfig = ..usb2canfd.CANFD_INIT_CONFIG();
var canconfig = ..usb2canfd.CANFD_INIT_CONFIG();
canconfig.Mode = 0; //0-正常模式，1-自发自收模式
canconfig.ISOCRCEnable = 0;//0-禁止ISO CRC,1-使能ISO CRC
@ -222,7 +222,7 @@ namespace usb2canfd{
ret = DllHandle.CANFD_Init(AvailableHW[index].hLINHW,channel,canconfig);
}
else {
canconfig = ..usb2canfd.CAN_INIT_CONFIG();
var canconfig = ..usb2canfd.CAN_INIT_CONFIG();
canconfig.CAN_Mode = 0;//0-正常模式 1-环回模式
@ -285,6 +285,7 @@ namespace usb2canfd{
return 0;
}
//console.log("发送报文")
var ret = 0;
if(canfd_connected == true){
var msg = ..usb2canfd.CANFD_MSG();
msg.Flags = 0;
@ -298,7 +299,11 @@ namespace usb2canfd{
msg.DLC = #data;
msg.Data = data;
var ret = DllHandle.CANFD_SendMsg(Hwconnected,Chconntected,msg,1);
console.dumpJson(msg);
console.log("Hwconnected = " + Hwconnected);
console.log("Chconntected = " + Chconntected);
ret = DllHandle.CANFD_SendMsg(Hwconnected,Chconntected,msg,1);
}
else {
var msg = ..usb2canfd.CAN_MSG();
@ -314,7 +319,7 @@ namespace usb2canfd{
msg.DataLen = #data;
msg.Data = data;
console.log("发送报文")
var ret = DllHandle.CAN_SendMsg(Hwconnected,Chconntected,msg,1);
ret = DllHandle.CAN_SendMsg(Hwconnected,Chconntected,msg,1);
console.log("ret = " + ret);
}

BIN
libusb-1.0.dll
View File

Binary file not shown.

15
main.aardio
View File

@ -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="Checkbox";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};
@ -45,18 +45,22 @@ Display = function(str){//显示日志
}
//遍历目录
import console;
/*
import fsys.fileInfo;
info = fsys.fileInfo("C:\Users\fcb19\Desktop\dll\libusb-1.0.dll");
console.log(info.writeTime);
execute("pause")
raw.loadDll("C:\Users\fcb19\Desktop\dll\libusb-1.0.dll");
/*
*/
CANHw = usb2canfd.USB2CANHW();//尝试加载CAN dll
var ret = CANHw.LoadDll();
if(ret == 0){
Display("DLL加载成功");
}
*/
else {
Display("DLL加载失败");
}
//初始化界面
mainForm.cbbChannel.add("通道1");
@ -82,7 +86,8 @@ mainForm.btnFresh.oncommand = function(id,event){
}
mainForm.btnConnect.oncommand = function(id,event){
::PostThreadMessage(thrdId,101,mainForm.cbbDev.selIndex,mainForm.cbbChannel.selIndex - 1)//自定义消息
var canfd_check = mainForm.checkbox.checked?0x80:0x00;
::PostThreadMessage(thrdId,101,mainForm.cbbDev.selIndex,(mainForm.cbbChannel.selIndex - 1)|canfd_check)//自定义消息
/*
var ret = CANHw.OpenDevice(mainForm.cbbDev.selIndex,mainForm.cbbChannel.selIndex - 1);//通道为0和1
if(ret == 0){
@ -213,7 +218,7 @@ mainForm.btnReadF199.oncommand = function(id,event){
DiagReadDID(0x1702);
}
//thrdHandle,thrdId = thread.create( CanThread )
thrdHandle,thrdId = thread.create( CanThread )

15
user/CanThread.aardio
View File

@ -16,6 +16,8 @@ FuncLoopMsg = function(msg){
FuncFreshHw();
}
case 101 {//连接硬件
//console.log("msg.wParam = " + msg.wParam);
//console.log("msg.lParam = " + msg.lParam);
FuncConnect(msg.wParam,msg.lParam);
}
case 102 {//开始boot
@ -69,7 +71,8 @@ FuncFreshHw = function(){
}
FuncConnect = function(dev,chn){
var ret = CANHw.OpenDevice(dev,chn,false);
var canfd = (chn&0x80)==0x80?true:false;
var ret = CANHw.OpenDevice(dev,chn&0x7f,canfd);
if(ret == 0){
FuncDisplay("连接成功");
thread.command.$Connected();
@ -202,6 +205,7 @@ timer1.onTimer = function(){
return;
}
ret = CANHw.GetMsg();
for(i=1;#ret;1){
//console.log("id = " + tostring(ret[i].id))
if(ret[i].id & 0x7FFFFFFF == DiagRespID){
@ -235,10 +239,13 @@ timer1.onTimer = function(){
}
elseif(ret[i].data[1] == 0x30){//
FuncSendPackage();
}
}
}
else {
//console.varDump(ret[i].id);
//显示报文
}
}
}

4
user/Diag22code.aardio
View File

@ -5,8 +5,10 @@ FuncReadDID = function(did){
return;
}
var data = {0x03,0x22,did>>8,did&0xff,0,0,0,0};
CANHw.SendMsg(DiagReqID,data);
var ret = CANHw.SendMsg(DiagReqID,data);
diag22state = 1;
console.log("did = " + tostring(did,16));
console.log("ret = " + ret);
}
//接收