更新bootoader

This commit is contained in:
sunbeam 2024-12-18 17:08:09 +08:00
parent 2c43f79bf5
commit 69769f95f4
9 changed files with 38 additions and 37 deletions

View File

@ -1,5 +1,5 @@
<?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.7" ProductVersion="0.0.0.7" publishDir="/dist/" dstrip="false" local="false" ignored="false">
<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.10" ProductVersion="0.0.0.10" publishDir="/dist/" dstrip="false" 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="dlg" comment="目录" embed="true" local="false" ignored="false">

View File

@ -232,8 +232,8 @@ FuncBootSeq = function(){
FuncClearState();
}
else {
//var ret = FuncWait(0x22);
nextstate(0);
var ret = FuncWait(0x22);
nextstate(ret);
}
}
case 2 {

View File

@ -173,6 +173,8 @@ FuncOpenS19File = function(id,path){
s19crc.data[0x7FA] = last_data_addr>>8;
s19crc.data[0x7F9] = last_data_addr&0XFF;
FuncDisplay("结束地址:"++tostring(last_data_addr,16));
var crc32temp = FuncCRC32Calc(block.data);
s19crc.data[0x800] = crc32temp>>24;
s19crc.data[0x7FF] = crc32temp>>16;

View File

@ -167,11 +167,11 @@
<RecentlyUsedMenus>1</RecentlyUsedMenus>
<MenuShadows>1</MenuShadows>
<ShowAllMenusAfterDelay>1</ShowAllMenusAfterDelay>
<CommandsUsage>2501000019001386000009000000268100000200000010860000350000000F8100000100000001E10000010000000D800000010000000C8100000900000003840000010000001781000001000000568600009B000000558400000100000014810000010000005E860000010000000E81000001000000E9800000010000000B810000010000002897000001000000148600000D0000000581000001000000118600001C00000046810000160000000A840000010000005D860000010000000D81000002000000E880000001000000</CommandsUsage>
<CommandsUsage>2A0100001A0013860000090000002681000002000000108600003700000048810000010000000F8100000100000001E10000010000000D800000010000000C8100000900000003840000010000001781000001000000568600009B000000558400000100000014810000010000005E860000010000000E810000010000000B810000010000002897000001000000E980000001000000148600000D0000000581000001000000118600001D00000046810000180000000A840000010000005D860000010000000D81000002000000E880000001000000</CommandsUsage>
</MFCToolBarParameters>
<CommandManager>
<CommandsWithoutImages>6000008800000188000002880000038800000488000005880000FFFFFFFF1C9700001A9700001B9700002DDE00001FDE000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE0000209200002892000029920000379200003892000034920000339200001E9200001D9200002CDE0000D6840000D7840000D8840000D9840000DA840000DB840000DC840000DD840000DE840000DF840000E0840000E1840000E9840000EA8400002481000008800000098000000A8000000B8000000C800000158000000A81000001E8000012810000D2840000D1850000D78600002BDE00000C84000033840000788400001184000000DC000001DC000002DC000003DC000004DC0000778400000784000086840000808C000044D500004D9700003597000005DC00001B8600001C8600001D8600001E8600005A8600005B86000053860000A4860000A386000078860000798600007A8600007B8600007C8600008786000085860000868600001D9700001897000019970000</CommandsWithoutImages>
<MenuUserImages>5700139700004D010000249700007A00000004840000CF0000002CE100003D0C000026810000AE0000001097000048010000158100001A000000048100009D00000031840000D600000023920000000000001E9700007400000029E10000B700000007E100003000000000900000DA0000000F810000A400000020810000AC00000004E100002E00000023E100003A0C00000C810000A100000007970000890100003A9700008F000000299700006400000001E100002B0000000D8000000C000000198200000C0C0000098100009F000000159700004C010000269700008600000006840000D1000000168200000A0C000003840000CE0000001297000047010000239700007D000000349700008A000000178100001C0000002BE100003C0C000000840000CB0000000F97000046010000259200005900000031970000870000001481000019000000449200005E000000008100000E0000000E840000D300000030840000D50000002F8200000D0C00001F9200005B0000000E810000A30000001F810000AB0000003C970000910000002B9700006600000025E10000C400000003E100002D00000006970000310C00002D9200005D0000001797000051010000399700008E000000289700006300000022E10000C200000000E100002A0000000B810000A0000000188200000B0C000005840000D0000000D18400005A000000149700004F010000259700008500000041E100003A00000002840000CD000000119700004B010000168100001B000000058100009E00000010840000D400000032840000D70000000E9700004501000005E100002F00000051840000570000000A840000D200000035E10000C70000003B970000900000002A9700006500000024E10000B600000002E10000BD0000000D810000A200000005970000300C00002C9200005C0000001697000052010000279700007E000000</MenuUserImages>
<MenuUserImages>5700139700004D010000249700007A00000004840000CF00000026810000AE0000001097000048010000048100009D0000002CE100003D0C0000158100001A00000023920000000000001E9700007400000029E10000B700000031840000D600000007E100003000000000900000DA00000020810000AC0000000F810000A400000004E100002E00000007970000890100003A9700008F00000029970000640000000C810000A100000023E100003A0C000001E100002B0000000D8000000C000000098100009F000000159700004C010000269700008600000006840000D1000000198200000C0C00001297000047010000239700007D000000349700008A00000003840000CE000000168200000A0C0000178100001C00000025920000590000000F97000046010000319700008700000000840000CB0000002BE100003C0C00001481000019000000449200005E0000000E840000D300000030840000D5000000008100000E0000001F9200005B0000003C970000910000002B970000660000001F810000AB0000000E810000A30000002F8200000D0C000025E10000C400000003E100002D0000002D9200005D0000001797000051010000399700008E00000028970000630000000B810000A000000006970000310C000022E10000C200000000E100002A000000149700004F0100002597000085000000D18400005A00000005840000D0000000188200000B0C000041E100003A000000119700004B010000058100009E00000002840000CD000000168100001B0000000E9700004501000010840000D400000032840000D700000005E100002F000000518400005700000035E10000C70000003B970000900000002A9700006500000024E10000B60000000A840000D20000000D810000A200000002E10000BD0000002C9200005C0000001697000052010000279700007E00000005970000300C0000</MenuUserImages>
</CommandManager>
<Pane-59393>
<ID>0</ID>
@ -1125,7 +1125,7 @@
</DockingManager-256>
<MFCToolBar-34048>
<Name>CMSIS-Pack</Name>
<Buttons>00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED1840000020000003E020000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000</Buttons>
<Buttons>00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED1840000020000002F010000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000</Buttons>
</MFCToolBar-34048>
<Pane-34048>
<ID>34048</ID>
@ -1142,7 +1142,7 @@
</BasePane-34048>
<MFCToolBar-34049>
<Name>Debug</Name>
<Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000200000059020000FFFEFF0000000000000000000000000001000000010000000180138600000200000055020000FFFEFF00000000000000000000000000010000000100000001805E860000020000005B020000FFFEFF000000000000000000000000000100000001000000018060860000020000005D020000FFFEFF00000000000000000000000000010000000100000001805D860000020000005A020000FFFEFF0000000000000000000000000001000000010000000180108600000200000053020000FFFEFF0000000000000000000000000001000000010000000180118600000200040054020000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000200000056020000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000070009802B87000000000000FFFFFFFFFFFEFF13440069007300610062006C0065006400200028004E006F0020007200650073006500740029000100000000000000000000000100000001000000000000000000000001000000000009802C87000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802D87000000000000FFFFFFFFFFFEFF144800610072006400770061007200650020002800520065007300650074002000700069006E0029000100000000000000000000000100000001000000000000000000000001000000000009802E87000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802F87000000000000FFFFFFFFFFFEFF064E006F0072006D0061006C000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000</Buttons>
<Buttons>00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E56860000020004004A010000FFFEFF0000000000000000000000000001000000010000000180138600000200040046010000FFFEFF00000000000000000000000000010000000100000001805E860000020004004C010000FFFEFF000000000000000000000000000100000001000000018060860000020004004E010000FFFEFF00000000000000000000000000010000000100000001805D860000020004004B010000FFFEFF0000000000000000000000000001000000010000000180108600000200040044010000FFFEFF0000000000000000000000000001000000010000000180118600000200000045010000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000200040047010000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000070009802B87000000000000FFFFFFFFFFFEFF13440069007300610062006C0065006400200028004E006F0020007200650073006500740029000100000000000000000000000100000001000000000000000000000001000000000009802C87000000000000FFFFFFFFFFFEFF0853006F006600740077006100720065000100000000000000000000000100000001000000000000000000000001000000000009802D87000000000000FFFFFFFFFFFEFF144800610072006400770061007200650020002800520065007300650074002000700069006E0029000100000000000000000000000100000001000000000000000000000001000000000009802E87000000000000FFFFFFFFFFFEFF0443006F00720065000100000000000000000000000100000001000000000000000000000001000000000009802F87000000000000FFFFFFFFFFFEFF064E006F0072006D0061006C000100000000000000000000000100000001000000000000000000000001000000000009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000</Buttons>
</MFCToolBar-34049>
<Pane-34049>
<ID>34049</ID>
@ -1159,7 +1159,7 @@
</BasePane-34049>
<MFCToolBar-34050>
<Name>Trace</Name>
<Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E5392000000000000C0020000FFFEFF03450054004D00000000000000000000000000010000000100000001805492000000000000C1020000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons>
<Buttons>00200000010000000200FFFF01001100434D4643546F6F6C426172427574746F6E5392000000000000B1010000FFFEFF03450054004D00000000000000000000000000010000000100000001805492000000000000B2010000FFFEFF03530057004F00000000000000000000000000010000000100000000000000FFFEFF05540072006100630065002F000000</Buttons>
</MFCToolBar-34050>
<Pane-34050>
<ID>34050</ID>
@ -1273,7 +1273,7 @@
<IarPane-34117 />
<MFCToolBar-34115>
<Name>Main</Name>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000009F020000FFFEFF000000000000000000000000000100000001000000018001E1000000000000A0020000FFFEFF000000000000000000000000000100000001000000018003E1000000000400A2020000FFFEFF000000000000000000000000000100000001000000018000810000000000007F020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E1000000000400A5020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E1000000000000A7020000FFFEFF000000000000000000000000000100000001000000018022E1000000000000A6020000FFFEFF000000000000000000000000000100000001000000018025E1000000000000A8020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE1000000000400A9020000FFFEFF00000000000000000000000000010000000100000001802CE1000000000400AA020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000400FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040091020000FFFEFF000000000000000000000000000100000001000000018024E10000000004009A020000FFFEFF000000000000000000000000000100000001000000018028E100000000040099020000FFFEFF000000000000000000000000000100000001000000018029E10000000004009B020000FFFEFF0000000000000000000000000001000000010000000180028100000000040080020000FFFEFF0000000000000000000000000001000000010000000180298100000000040095020000FFFEFF0000000000000000000000000001000000010000000180278100000000040093020000FFFEFF0000000000000000000000000001000000010000000180288100000000040094020000FFFEFF00000000000000000000000000010000000100000001801D810000000004008D020000FFFEFF00000000000000000000000000010000000100000001801E810000000004008E020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000200040084020000FFFEFF00000000000000000000000000010000000100000001800C8100000200000085020000FFFEFF00000000000000000000000000010000000100000001805F8600000200000098020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000020000008F020000FFFEFF0000000000000000000000000001000000010000000180208100000200000090020000FFFEFF0000000000000000000000000001000000010000000180468100000200020096020000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E003B030000</Buttons>
<Buttons>00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000091010000FFFEFF000000000000000000000000000100000001000000018001E100000000000092010000FFFEFF000000000000000000000000000100000001000000018003E100000000000094010000FFFEFF0000000000000000000000000001000000010000000180008100000000000071010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000097010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040099010000FFFEFF000000000000000000000000000100000001000000018022E100000000040098010000FFFEFF000000000000000000000000000100000001000000018025E10000000000009A010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE10000000004009B010000FFFEFF00000000000000000000000000010000000100000001802CE10000000004009C010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040083010000FFFEFF000000000000000000000000000100000001000000018024E10000000000008C010000FFFEFF000000000000000000000000000100000001000000018028E10000000004008B010000FFFEFF000000000000000000000000000100000001000000018029E10000000000008D010000FFFEFF0000000000000000000000000001000000010000000180028100000000000072010000FFFEFF0000000000000000000000000001000000010000000180298100000000000087010000FFFEFF0000000000000000000000000001000000010000000180278100000000000085010000FFFEFF0000000000000000000000000001000000010000000180288100000000000086010000FFFEFF00000000000000000000000000010000000100000001801D810000000000007F010000FFFEFF00000000000000000000000000010000000100000001801E8100000000040080010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000200000076010000FFFEFF00000000000000000000000000010000000100000001800C8100000200000077010000FFFEFF00000000000000000000000000010000000100000001805F860000020000008A010000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F8100000200000081010000FFFEFF0000000000000000000000000001000000010000000180208100000200000082010000FFFEFF0000000000000000000000000001000000010000000180468100000200020088010000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E003B030000</Buttons>
</MFCToolBar-34115>
<Pane-34115>
<ID>34115</ID>

View File

@ -15,13 +15,13 @@
<WatchCond>_ 0</WatchCond>
<Watch0>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch0>
<Watch1>_ 0 "" 0 "" 0 "" 0 "" 0 0 0 0</Watch1>
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
<CStepIntDis>_ 0</CStepIntDis>
<jlinkResetStyle>12</jlinkResetStyle>
<jlinkResetStrategy>0</jlinkResetStrategy>
<TraceBufferSize>0x10000</TraceBufferSize>
<TraceStallIfFIFOFull>0x0</TraceStallIfFIFOFull>
<TracePortSize>0x4</TracePortSize>
<LeaveTargetRunning>_ 0</LeaveTargetRunning>
<CStepIntDis>_ 0</CStepIntDis>
</JLinkDriver>
<DebugChecksum>
<Checksum>3131505811</Checksum>
@ -80,8 +80,8 @@
<MemConfigValue>E:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\config\debugger\CVAChip\CVM0144.ddf</MemConfigValue>
</PlDriver>
<ArmDriver>
<EnforceMemoryConfiguration>1</EnforceMemoryConfiguration>
<EnableCache>0</EnableCache>
<EnforceMemoryConfiguration>1</EnforceMemoryConfiguration>
</ArmDriver>
<TerminalIO>
<InputSource>1</InputSource>
@ -155,6 +155,15 @@
<ShowTimeSum>1</ShowTimeSum>
<SumSortOrder>0</SumSortOrder>
</EventLog>
<PowerProbe>
<Frequency>10000</Frequency>
<Probe0>I0</Probe0>
<ProbeSetup0>2 1 1 2 0 0</ProbeSetup0>
</PowerProbe>
<TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile>
</TermIOLog>
<DisassembleMode>
<mode>0</mode>
</DisassembleMode>
@ -163,17 +172,8 @@
<Bp1>_ 1 "EMUL_CODE" "{$PROJ_DIR$\SDK\middleware\uds\user\uds_service37.c}.67.13" 0 0 1 "" 0 "" 0</Bp1>
<Count>2</Count>
</Breakpoints2>
<TermIOLog>
<LoggingEnabled>_ 0</LoggingEnabled>
<LogFile>_ ""</LogFile>
</TermIOLog>
<Aliases>
<Count>0</Count>
<SuppressDialog>0</SuppressDialog>
</Aliases>
<PowerProbe>
<Frequency>10000</Frequency>
<Probe0>I0</Probe0>
<ProbeSetup0>2 1 1 2 0 0</ProbeSetup0>
</PowerProbe>
</settings>

File diff suppressed because one or more lines are too long

View File

@ -540,8 +540,8 @@ static void Bootloader_ExitState(void)
{
/* Jump to App */
pJumpFunctionPtr jumpFunc = sBootloader_Cb.pCallBackFunctionList->jumpFunction;
SEGGER_RTT_Init();
SEGGER_RTT_printf(0,"Jump to App\n");
//SEGGER_RTT_Init();
//SEGGER_RTT_printf(0,"Jump to App\n");
Bootloader_DeInit();
jumpFunc();
}

View File

@ -33,9 +33,9 @@ extern "C" {
* the defines
******************************************************************************/
/* If want to Generate flash driver code in ram, enable the configuration; if not, disable the configuration */
#define BOOTLOADER_CFG_FLS_CODE_GENERATE_EN (1u)
#define BOOTLOADER_CFG_FLS_CODE_GENERATE_EN (0u)
/* Copy flash driver from flash to ram to run if don't get flash driver from out side, only just for debug the flash driver */
#define BOOTLOADER_CFG_FLS_COPY_AUTO_EN (1u)
#define BOOTLOADER_CFG_FLS_COPY_AUTO_EN (0u)
/* Indication value with boot loader request from asw */
#define BOOTLOADER_CFG_REQ_ACTIVE (0x55AAAA55ul)

View File

@ -695,8 +695,6 @@ static void Bootloader_JumpToApp(void)
IrqDrv_DisableGlobalInterrupt();
FlexCanDrv_SoftReset(flexCanDrv_DemoObj);
/* MSP */
appStack = *(uint32_t *)BOOTLOADER_CFG_APP_START_ADDR;
/* PC */
@ -705,9 +703,9 @@ static void Bootloader_JumpToApp(void)
pJumpToApp = (void (*)(void))appEntry;
statckPointer = appStack;
/* Set the MSP */
__set_PSP(statckPointer);
__set_MSP(statckPointer);
__set_PSP(statckPointer);
SCB->VTOR = (uint32_t)BOOTLOADER_CFG_APP_START_ADDR;
/* Jump action */
pJumpToApp();