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

boot ok

Browse Source
This commit is contained in:
sunbeam 2022-10-04 16:01:27 +08:00
parent 4c4f15a36a
commit b33dab5399
9 changed files with 185 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/usb2canfd.aardio
View File

@ -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){
@ -300,9 +300,9 @@ namespace usb2canfd{
msg.DLC = #data;
msg.Data = data;
console.dumpJson(msg);
console.log("Hwconnected = " + Hwconnected);
console.log("Chconntected = " + Chconntected);
//console.dumpJson(msg);
//console.log("Hwconnected = " + Hwconnected);
//console.log("Chconntected = " + Chconntected);
ret = DllHandle.CANFD_SendMsg(Hwconnected,Chconntected,msg,1);
}
else {
@ -318,9 +318,9 @@ namespace usb2canfd{
msg.RemoteFlag = 0;
msg.DataLen = #data;
msg.Data = data;
console.log("发送报文")
//console.log("发送报文")
ret = DllHandle.CAN_SendMsg(Hwconnected,Chconntected,msg,1);
console.log("ret = " + ret);
//console.log("ret = " + ret);
}

9
main.aardio
View File

@ -109,6 +109,9 @@ listener.$Display = function(str){
listener.$ShowPath = function(str){
mainForm.edFile.text = str;
}
listener.$ShowFlashDrvPath = function(str){
mainForm.edFile2.text = str;
}
listener.$SetProgress = function(pos){
if(pos >= 0 && pos <= 100){
mainForm.progress.pos = pos;
@ -194,7 +197,7 @@ mainForm.btnFlash.oncommand = function(id,event){
}
mainForm.btnOpen.oncommand = function(id,event){
::PostThreadMessage(thrdId,104,0,0)//自定义消息-打开文件
::PostThreadMessage(thrdId,104,1,0)//自定义消息-打开文件
}
//程序关闭
@ -218,6 +221,10 @@ mainForm.btnReadF199.oncommand = function(id,event){
DiagReadDID(0x1702);
}
mainForm.btnOpenFlashdrv.oncommand = function(id,event){
::PostThreadMessage(thrdId,104,0,0)//自定义消息-打开flashdriver
}
thrdHandle,thrdId = thread.create( CanThread )

19
user/CanThread.aardio
View File

@ -27,11 +27,22 @@ FuncLoopMsg = function(msg){
FuncStopBoot();
}
case 104 {//打开s19文件
FuncDisplay("打开文件");
var ret = FuncOpenS19File();
if(ret != null){
thread.command.$ShowPath(ret);
if(msg.wParam == 0){
FuncDisplay("打开FlashDriver");
var ret = FuncOpenS19File(msg.wParam);
if(ret != null){
thread.command.$ShowFlashDrvPath(ret);
}
}
else {
FuncDisplay("打开烧写文件");
var ret = FuncOpenS19File(msg.wParam);
if(ret != null){
thread.command.$ShowPath(ret);
}
}
}
case 105 {//停止boot
thread.stop(0);

6
user/Diag22code.aardio
View File

@ -7,8 +7,8 @@ FuncReadDID = function(did){
var data = {0x03,0x22,did>>8,did&0xff,0,0,0,0};
var ret = CANHw.SendMsg(DiagReqID,data);
diag22state = 1;
console.log("did = " + tostring(did,16));
console.log("ret = " + ret);
//console.log("did = " + tostring(did,16));
//console.log("ret = " + ret);
}
//接收
@ -40,7 +40,7 @@ FuncDiag22Pro = function(data){
}
else {
FuncDisplay("未知DID - " + did);
FuncDisplay("未知DID - " + tostring(did,16));
}
}

5
user/Diag31code.aardio
View File

@ -5,8 +5,9 @@ FuncReq31EraseFlash = function(addr,len){
FuncReq31(data);
}
FuncReq31CheckLogicBlock = function(addr,len){
var data = {0x02,0x02,0x44,addr>>24,addr>>16,addr>>8,addr,len>>24,len>>16,len>>8,len};
FuncReq31CheckLogicBlock = function(crc){//(addr,len)
//var data = {0x02,0x02,0x44,addr>>24,addr>>16,addr>>8,addr,len>>24,len>>16,len>>8,len};
var data = {0x02,0x02,crc>>24,crc>>16,crc>>8,crc};
FuncReq31(data);
}
FuncReq31CheckPD = function(){//Programming Dependencies

18
user/Diag34code.aardio
View File

@ -1,3 +1,5 @@
//发送
FuncReq34 = function(addr,len){
var data = {0x44,addr>>24,addr>>16,addr>>8,addr,len>>24,len>>16,len>>8,len};
@ -6,8 +8,22 @@ FuncReq34 = function(addr,len){
FuncPushPackage(DiagReqID,table.slice(data,5));
}
var maxlen = 0;
//接收
FuncDiag34Pro = function(data){
//console.dumpJson(data);
FuncDisplay("请求下载成功")
}
maxlen = (data[2]<<8) + data[3];
FuncDisplay("最大长度:" + maxlen);
}
FuncGetSengLen = function(){
if(maxlen>2){
return maxlen-2;
}
else {
return 0;
}
}

7
user/Diag36code.aardio
View File

@ -19,9 +19,10 @@ FuncGetSendStatus = function(){
return flag_sendend;
}
FuncSendNextBlock = function(){
if(#alldata>0x400){
FuncReq36(blocknum,table.slice(alldata,1,0x400));
alldata = table.slice(alldata,0x401,)
var len = FuncGetSengLen();
if(#alldata>len){
FuncReq36(blocknum,table.slice(alldata,1,len));
alldata = table.slice(alldata,len+1,)
}
else {
FuncReq36(blocknum,alldata);

99
user/DiagBootcode.aardio
View File

@ -72,16 +72,23 @@ var blocknum = 1;
var alldata_blocknum = 0;
var block_sended = 0;
var sendFlashDriverState = 0;
FuncSendBlockInit = function(){
FuncSendBlockInit = function(id){
var len = 0;
alldata = FuncGetAllData();
alldata = FuncGetAllData(id);
blocknum = 1;
if(alldata == null){
FuncDisplay("错误：空数据");
alldata_blocknum = 0;
sendblockstate = 0xff;
return 1;
}
for(i=1;#alldata;1){
len += math.ceil(#alldata[i]["data"] / 0x400)
}
alldata_blocknum = len + 19;
block_sended = 0;
sendblockstate = 0;
return 0;
}
nextstate = function(val){
if(val == 0){
@ -182,7 +189,7 @@ FuncBootSeq = function(){
case 0 {
boottime = 1;
if(sendstate == 0){
FuncSendBlockInit();
//FuncSendBlockInit(0);
FuncReadDID(0xF186);
FuncClearState();
}
@ -301,45 +308,20 @@ FuncBootSeq = function(){
}
}
case 11 {
if(sendstate == 0){//请求下载
FuncReq34(0x5A01,0x2C0);//
FuncClearState();
}
else {
var ret = FuncWait(0x34);
nextstate(ret);
}
}
case 11 {
if(sendstate == 0){//擦除flash
FuncReq31EraseFlash(0x00A000,0x00010000);//
FuncClearState();
}
else {
var ret = FuncWait(0x31);
nextstate(ret);
}
}
case 12 {
if(sendstate == 0){//发送数据
//FuncSendBlockInit();
FuncDisplay("开始发送app数据");
FuncSendBlockInit(0);
FuncDisplay("开始发送FlashDrv数据");
FuncClearState();
}
else {
var ret = FuncSendBlockApp();
nextstate(ret);
}
}
case 13 {
case 12 {
if(sendstate == 0){//CheckLogicBlock
FuncReq31CheckLogicBlock(0x00FE0000,0x00019FCC);
var crc = FuncGetFlashCRC(0);
FuncReq31CheckLogicBlock(crc);
FuncClearState();
}
else {
@ -347,7 +329,40 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
case 13 {
if(sendstate == 0){//CheckLogicBlock
FuncReq31EraseFlash(0xA000,0x10000);
FuncClearState();
}
else {
var ret = FuncWait(0x31);
nextstate(ret);
}
}
case 14 {
if(sendstate == 0){//发送数据
FuncSendBlockInit(1);
FuncDisplay("开始发送App数据");
FuncClearState();
}
else {
var ret = FuncSendBlockApp();
nextstate(ret);
}
}
case 15 {
if(sendstate == 0){//CheckLogicBlock
var crc = FuncGetFlashCRC(1);
FuncReq31CheckLogicBlock(crc);
FuncClearState();
}
else {
var ret = FuncWait(0x31);
nextstate(ret);
}
}
case 16 {
if(sendstate == 0){////Programming Dependencies
FuncReq31CheckPD();
FuncClearState();
@ -357,10 +372,10 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
case 15 {
case 17 {
if(sendstate == 0){//复位
FuncClearState();
FuncReq11(0x01);
FuncReq11(0x03);
}
else {
var ret = FuncWait(0x11);
@ -368,7 +383,7 @@ FuncBootSeq = function(){
}
}
case 16 {
case 18 {
if(sendstate == 0){//等待复位完成
delaycount = 0;
FuncClearState();
@ -382,7 +397,7 @@ FuncBootSeq = function(){
}
}
case 17 {
case 19 {
if(sendstate == 0){
FuncReq10(true,0x03);//进入扩展会话
FuncClearState();
@ -392,7 +407,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
case 18 {
case 20 {
if(sendstate == 0){
FuncReq28(0x00,0x01);//开启发送
FuncClearState();
@ -402,7 +417,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
case 19 {
case 21 {
if(sendstate == 0){
FuncReq85(0x01);//开启DTC
FuncClearState();
@ -412,7 +427,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
case 20 {
case 22 {
if(sendstate == 0){
FuncReq10(true,0x01);//进入默认会话
FuncClearState();
@ -428,6 +443,8 @@ FuncBootSeq = function(){
boottimer.disable();
}
}
if(alldata_blocknum != 0){
thread.command.$SetProgress(block_sended/alldata_blocknum * 100);
}
thread.command.$SetProgress(block_sended/alldata_blocknum * 100);
}

76
user/S19Decode.aardio
View File

@ -1,16 +1,73 @@
var Crc32Tble =
{
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3,
0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91,
0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5,
0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,
0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F,
0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D,
0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,
0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457,
0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB,
0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9,
0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD,
0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683,
0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7,
0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,
0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79,
0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F,
0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,
0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21,
0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45,
0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB,
0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF,
0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D
};
var fileinfo = "";
var FlashData = {};
FuncGetAllData = function(){
return FlashData;
var AllData = {}
FuncGetAllData = function(id){
if(id > #AllData){
return null;
}
return AllData[id];
}
FuncGetFileInfo = function(){
return fileinfo;
}
FuncCRC32Calc = function(Data){
var usCRC = 0xFFFFFFFF;
FuncOpenS19File = function(path){
for(i=1;#Data;1){
var temp = (usCRC ^ Data[i]) & 0xFF;
usCRC = ((usCRC >> 8)&0xffffff) ^ Crc32Tble[temp+1];
}
usCRC ^= 0xFFFFFFFF;
return usCRC;
}
FuncGetFlashCRC = function(id){
var Data = AllData[id];
var crc = FuncCRC32Calc(Data[1].data);
return crc;
}
FuncOpenS19File = function(id,path){
import fsys.dlg;
if(path == null){
path = fsys.dlg.open('S19文件|*.sx;*.s19;*.srec|所有文件|*.*||',,,winform);
@ -94,6 +151,14 @@ FuncOpenS19File = function(path){
if(block != null){
table.push(FlashData,block)
}
/*
for(i=1;#FlashData;1){
var crc = FuncCRC32Calc(FlashData[i].data);
var str = string.format("block %d:addr=0x%X,len=0x%X,crc=0x%X",i,FlashData[i]["address"],#FlashData[i].data,crc);
FuncDisplay(str);
}
*/
AllData[id] = FlashData;
}
//blocknum = 1;
@ -102,3 +167,4 @@ FuncOpenS19File = function(path){