diff --git a/CAN_Bootloader/main.aardio b/CAN_Bootloader/main.aardio
index 10f36fa..9a1a860 100644
--- a/CAN_Bootloader/main.aardio
+++ b/CAN_Bootloader/main.aardio
@@ -14,7 +14,6 @@ btnReadF199={cls="button";text="读取F199";left=149;top=415;right=248;bottom=44
btnReadHw={cls="button";text="读取硬件版本号";left=149;top=381;right=248;bottom=409;z=12};
btnReadSw={cls="button";text="读取软件版本号";left=37;top=382;right=136;bottom=410;z=10};
btnTest={cls="button";text="停止";left=149;top=316;right=248;bottom=344;z=11};
-button={cls="button";text="Button";left=248;top=445;right=278;bottom=459;z=26};
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};
@@ -256,9 +255,6 @@ mainForm.onClose = function(hwnd,message,wParam,lParam){
}
-mainForm.button.oncommand = function(id,event){
- DiagReadDID(0xF191);
-}
mainForm.show();
return win.loopMessage();
\ No newline at end of file
diff --git a/CAN_Bootloader/user/DiagBootcode.aardio b/CAN_Bootloader/user/DiagBootcode.aardio
index 8f3b707..b6134c8 100644
--- a/CAN_Bootloader/user/DiagBootcode.aardio
+++ b/CAN_Bootloader/user/DiagBootcode.aardio
@@ -405,17 +405,6 @@ FuncBootSeq = function(){
}
}
case 19 {
- if(sendstate == 0){//复位
- FuncClearState();
- FuncReq11(0x03);
- }
- else {
- var ret = FuncWait(0x11);
- nextstate(ret);
- }
- }
-
- case 20 {
if(sendstate == 0){//等待复位完成
delaycount = 0;
FuncClearState();
@@ -428,8 +417,32 @@ FuncBootSeq = function(){
}
}
+ case 20 {
+ if(sendstate == 0){//复位
+ FuncClearState();
+ FuncReq11(0x03);
+ }
+ else {
+ var ret = FuncWait(0x11);
+ nextstate(ret);
+ }
+ }
case 21 {
+ if(sendstate == 0){//等待复位完成
+ delaycount = 0;
+ FuncClearState();
+ }
+ else {
+ delaycount += 1;
+ if(delaycount > 200){
+ nextstate(0);//延时1S
+ }
+
+ }
+ }
+
+ case 22 {
if(sendstate == 0){
FuncReq10(true,0x03);//进入扩展会话
FuncClearState();
@@ -439,7 +452,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
- case 22 {
+ case 23 {
if(sendstate == 0){
FuncReq28(0x00,0x01);//开启发送
FuncClearState();
@@ -449,7 +462,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
- case 23 {
+ case 24 {
if(sendstate == 0){
FuncReq85(0x01);//开启DTC
FuncClearState();
@@ -459,7 +472,7 @@ FuncBootSeq = function(){
nextstate(ret);
}
}
- case 24 {
+ case 25 {
if(sendstate == 0){
FuncReq10(true,0x01);//进入默认会话
FuncClearState();
diff --git a/cva_asw_m0146/.vscode/c_cpp_properties.json b/cva_asw_m0146/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000..a5c72a7
--- /dev/null
+++ b/cva_asw_m0146/.vscode/c_cpp_properties.json
@@ -0,0 +1,21 @@
+{
+ "configurations": [
+ {
+ "name": "Win32",
+ "includePath": [
+ "${workspaceFolder}/**",
+ "E:\\Program Files\\IAR Systems\\Embedded Workbench 9.2\\arm\\inc\\c\\"
+ ],
+ "defines": [
+ "MCU_CVM0144FMLH",
+ "__INT32_T_TYPE__=signed long",
+ "__UINT32_T_TYPE__=unsigned long",
+ "__INT8_T_TYPE__=signed char",
+ "__UINT8_T_TYPE__=unsigned char",
+ "__INT16_T_TYPE__=signed int",
+ "__UINT16_T_TYPE__=unsigned int"
+ ]
+ }
+ ],
+ "version": 4
+}
\ No newline at end of file
diff --git a/cva_asw_m0146/.vscode/settings.json b/cva_asw_m0146/.vscode/settings.json
index 7b8c38e..5b093a8 100644
--- a/cva_asw_m0146/.vscode/settings.json
+++ b/cva_asw_m0146/.vscode/settings.json
@@ -1,6 +1,19 @@
{
"files.associations": {
"mcu.h": "c",
- "segger_rtt.h": "c"
- }
+ "segger_rtt.h": "c",
+ "apptask.h": "c",
+ "uds_user.h": "c",
+ "uds.h": "c",
+ "stimer.h": "c",
+ "ycheck.h": "c",
+ "yvals.h": "c",
+ "stddef.h": "c",
+ "stdint.h": "c",
+ "hwctrl.h": "c",
+ "cvm014x_features.h": "c",
+ "clock_drv.h": "c",
+ "irq_drv.h": "c"
+ },
+ "C_Cpp.default.compilerPath": ""
}
\ No newline at end of file
diff --git a/cva_asw_m0146/cva_asw_m0146.ewp b/cva_asw_m0146/cva_asw_m0146.ewp
index 0457a4d..de06dbd 100644
--- a/cva_asw_m0146/cva_asw_m0146.ewp
+++ b/cva_asw_m0146/cva_asw_m0146.ewp
@@ -359,6 +359,8 @@
$PROJ_DIR$\SDK\platform\devices\CVM014x\drivers
$PROJ_DIR$\src\TLE9461
$PROJ_DIR$\src\RTT
+ $PROJ_DIR$\SDK\platform\devices\CVM014x\drivers\clock
+ $PROJ_DIR$\SDK\platform\devices\CVM014x\drivers\cpu\irq