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

Compare commits

merge into: huahua:S51EV_ECU
Branches Tags
huahua:S51EV_ECU
huahua:P417_rework
huahua:P417
huahua:P417_TEST
huahua:master
huahua:VF12
huahua:Branch_534bebb6
...
pull from: huahua:master
Branches Tags
huahua:P417_rework
huahua:P417
huahua:S51EV_ECU
huahua:P417_TEST
huahua:master
huahua:VF12
huahua:Branch_534bebb6

3 Commits
S51EV_ECU ... master

Author SHA1 Message Date
sunbeam
439fe19ffd 20230415 2023-04-15 10:55:15 +08:00
sunbeam
7f093b12f4 Merge branch 'S51EV_ECU' of http://ikuai.hua-hua.cn:23080/huahua/can_bootloader 2022-07-05 13:25:04 +08:00
sunbeam
e06dffc932 更新注释 2022-07-05 13:23:46 +08:00
3 changed files with 8 additions and 13 deletions
Show Stats Expand all files Collapse all files

6
default.aproj
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<project ver="10" name="CAN_Bootloader" libEmbed="true" icon="..." ui="win" output="CAN_Bootloader.exe" CompanyName="单位名称" FileDescription="CAN_Bootloader" LegalCopyright="Copyright (C) 作者 2022" ProductName="CAN_Bootloader" InternalName="CAN_Bootloader" FileVersion="0.0.0.1" ProductVersion="0.0.0.1" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<project ver="10" name="CAN_Bootloader" libEmbed="true" icon="\res\icon.ico" ui="win" output="CAN_Bootloader.exe" CompanyName="大明电子" FileDescription="CAN_Bootloader" LegalCopyright="Copyright (C) sunbeam 2022" ProductName="CAN_Bootloader" InternalName="CAN_Bootloader" FileVersion="0.1" ProductVersion="0.1" publishDir="/dist/" dstrip="true" local="false" ignored="false">
<file name="main.aardio" path="main.aardio" comment="main.aardio"/>
<folder name="资源文件" path="res" embed="true" local="false" ignored="false"/>
<folder name="资源文件" path="res" embed="true" local="false" ignored="false">
<file name="icon.ico" path="res\icon.ico" comment="res\icon.ico"/>
</folder>
<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"/>

2
lib/usb2canfd.aardio
View File

@ -236,7 +236,7 @@ namespace usb2canfd{
ret = DllHandle.CAN_Init(AvailableHW[index].hLINHW,channel,canconfig);
}
canfd_connected =
canfd_connected = canfd;
if(ret == 0){//调用成功
Hwconnected = AvailableHW[index].hLINHW;
Chconntected = channel;

13
main.aardio
View File

@ -64,24 +64,17 @@ mainForm.btnFresh.oncommand = function(id,event){
else {
var allhw = CANHw.GetAvailableHW();
for(i=1;#allhw;1){
mainForm.cbbDev.add(allhw[i].name);
mainForm.cbbDev.add(allhw[i].name);//将硬件添加到下拉框中
}
}
mainForm.cbbDev.selIndex = 1
::PostThreadMessage(thrdId,100,0,0)//自定义消息
}
//连接按键
mainForm.btnConnect.oncommand = function(id,event){
//发送线程消息，thrdId为线程ID，101为自定义消息号，后两个为消息携带的参数
::PostThreadMessage(thrdId,101,mainForm.cbbDev.selIndex,mainForm.cbbChannel.selIndex - 1)//自定义消息
/*
var ret = CANHw.OpenDevice(mainForm.cbbDev.selIndex,mainForm.cbbChannel.selIndex - 1);//通道为0和1
if(ret == 0){
Display("连接成功");
}
else {
Display("连接失败");
}
*/
}
//CAN通讯线程