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

增加usbcan功能

Browse Source
This commit is contained in:
sunbeam 2022-07-06 11:01:56 +08:00
parent a50d01ce7c
commit b55d450a81
1 changed files with 26 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/usb2canfd.aardio
View File

@ -192,12 +192,13 @@ namespace usb2canfd{
} }
//打开设备，包括初始化通道 //打开设备，包括初始化通道
OpenDevice = function(index,channel,canfd = true){ OpenDevice = function(index,channel,canfd){
if(index > HwNum) if(index > HwNum)
{ //如果序号大于最大硬件数 { //如果序号大于最大硬件数
return 0; return 0;
} }
var ret = DllHandle.USB_OpenDevice(AvailableHW[index].hLINHW) var ret = DllHandle.USB_OpenDevice(AvailableHW[index].hLINHW)
canfd = true;
if(canfd == true){ if(canfd == true){
canconfig = ..usb2canfd.CANFD_INIT_CONFIG(); canconfig = ..usb2canfd.CANFD_INIT_CONFIG();
@ -236,10 +237,11 @@ namespace usb2canfd{
ret = DllHandle.CAN_Init(AvailableHW[index].hLINHW,channel,canconfig); ret = DllHandle.CAN_Init(AvailableHW[index].hLINHW,channel,canconfig);
} }
canfd_connected = canfd_connected = canfd;
if(ret == 0){//调用成功 if(ret == 0){//调用成功
Hwconnected = AvailableHW[index].hLINHW; Hwconnected = AvailableHW[index].hLINHW;
Chconntected = channel; Chconntected = channel;
} }
else { else {
Hwconnected = null Hwconnected = null
@ -280,7 +282,8 @@ namespace usb2canfd{
if(#data == 0 || #data>8){//长度不对 if(#data == 0 || #data>8){//长度不对
return 0; return 0;
} }
if(canfd_connect == true){ //console.log("发送报文")
if(canfd_connected == true){
var msg = ..usb2canfd.CANFD_MSG(); var msg = ..usb2canfd.CANFD_MSG();
msg.Flags = 0; msg.Flags = 0;
if(id <= 0x7ff){ if(id <= 0x7ff){
@ -307,6 +310,8 @@ namespace usb2canfd{
GetMsg = function(){ GetMsg = function(){
var ret = 0; var ret = 0;
var retdata = {}; var retdata = {};
if(canfd_connected == true){
//CANFD
do{ do{
var msgbuf = ..usb2canfd.CANFD_MSG(); var msgbuf = ..usb2canfd.CANFD_MSG();
ret = DllHandle.CANFD_GetMsg(Hwconnected,CANIndex,msgbuf,1); ret = DllHandle.CANFD_GetMsg(Hwconnected,CANIndex,msgbuf,1);
@ -319,6 +324,11 @@ namespace usb2canfd{
..table.push(retdata,msg); ..table.push(retdata,msg);
} }
}while(ret > 0) }while(ret > 0)
}
else {
//CAN
}
return retdata; return retdata;
} }