From 3353e0f792ebb0a054fe8f762b4e9e3aab6170f7 Mon Sep 17 00:00:00 2001 From: sunbeam Date: Fri, 13 Dec 2024 15:12:15 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E6=9C=89=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../drivers/cpu/startup/system_M014x.c | 4 +- .../linker/bootloader_m0146_flash.icf | 4 +- .../settings/cva_bootloader_m0146.dnx | 26 ++--- .../settings/cva_bootloader_m0146.wsdt | 43 ++++---- .../src/bootloader/bootloader_cfg.h | 6 +- cva_bootloader_m0146/src/main.c | 103 +++++++++++++----- .../src/private_driver/isotp/isotp.c | 1 + .../src/private_driver/uds/stack/uds.h | 2 +- .../private_driver/uds/user/uds_service36.c | 2 +- 9 files changed, 120 insertions(+), 71 deletions(-) diff --git a/cva_bootloader_m0146/SDK/platform/devices/CVM014x/drivers/cpu/startup/system_M014x.c b/cva_bootloader_m0146/SDK/platform/devices/CVM014x/drivers/cpu/startup/system_M014x.c index e847661..8d7340c 100644 --- a/cva_bootloader_m0146/SDK/platform/devices/CVM014x/drivers/cpu/startup/system_M014x.c +++ b/cva_bootloader_m0146/SDK/platform/devices/CVM014x/drivers/cpu/startup/system_M014x.c @@ -50,7 +50,7 @@ void SystemInit(void) #if defined (_USE_EXT_OSC_) /* Use External oscillator */ - AcgReg_SetOscRange(ACG, 2); /* set SOSC frequency range(use max value when SOSC as the clock source of the PLL) */ + AcgReg_SetOscRange(ACG, 1); /* set SOSC frequency range(use max value when SOSC as the clock source of the PLL) */ AcgReg_SetEnSosc(ACG, 1); /* enable SOSC */ while(AcgReg_GetStSoscRdy(ACG) == 0); /* wait until SOSC is ready */ @@ -62,7 +62,7 @@ void SystemInit(void) * - feedback divider : 45 * - PLL Feedback clock divider pre-scaler : 1 * - PLL post-divider setting : 3 - * Final PLL output frequency is 16M(SOSC) * 45 / 3 / 2 = 120M + * Final PLL output frequency is 8M(SOSC) * 90 / 3 / 2 = 120M */ AcgReg_SetPllClkIn(ACG, 2); AcgReg_SetPllPreDiv(ACG, 0); diff --git a/cva_bootloader_m0146/linker/bootloader_m0146_flash.icf b/cva_bootloader_m0146/linker/bootloader_m0146_flash.icf index 04a8ce5..1735a5b 100644 --- a/cva_bootloader_m0146/linker/bootloader_m0146_flash.icf +++ b/cva_bootloader_m0146/linker/bootloader_m0146_flash.icf @@ -68,13 +68,13 @@ define symbol m_data_2_noinit_end = 0x2000EFFF; if (isdefinedsymbol(__stack_size__)) { define symbol __size_cstack__ = __stack_size__; } else { - define symbol __size_cstack__ = 0x00001000; + define symbol __size_cstack__ = 0x00002000; } if (isdefinedsymbol(__heap_size__)) { define symbol __size_heap__ = __heap_size__; } else { - define symbol __size_heap__ = 0x00000400; + define symbol __size_heap__ = 0x00001000; } define exported symbol __VECTOR_TABLE = m_interrupts_start; diff --git a/cva_bootloader_m0146/settings/cva_bootloader_m0146.dnx b/cva_bootloader_m0146/settings/cva_bootloader_m0146.dnx index 568d93e..8646291 100644 --- a/cva_bootloader_m0146/settings/cva_bootloader_m0146.dnx +++ b/cva_bootloader_m0146/settings/cva_bootloader_m0146.dnx @@ -15,16 +15,16 @@ _ 0 _ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 _ 0 "" 0 "" 0 "" 0 "" 0 0 0 0 + _ 0 + _ 0 12 0 0x10000 0x0 0x4 - _ 0 - _ 0 - 968150740 + 3131505811 0 @@ -80,8 +80,8 @@ E:\Program Files\IAR Systems\Embedded Workbench 9.2\arm\config\debugger\CVAChip\CVM0144.ddf - 0 1 + 0 1 @@ -155,15 +155,6 @@ 1 0 - - 10000 - I0 - 2 1 1 2 0 0 - - - _ 0 - _ "" - 0 @@ -172,8 +163,17 @@ _ 1 "EMUL_CODE" "{$PROJ_DIR$\SDK\middleware\uds\user\uds_service37.c}.67.13" 0 0 1 "" 0 "" 0 2 + + _ 0 + _ "" + 0 0 + + 10000 + I0 + 2 1 1 2 0 0 + diff --git a/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt b/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt index 1abdb33..30b904b 100644 --- a/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt +++ b/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt @@ -20,7 +20,7 @@ 20 2 - + 0 -1 @@ -95,11 +95,11 @@ 1 1 1 - DA00000019001386000004000000108600000100000026810000050000000F810000010000000C8100009D0000000D8000000100000001E1000001000000568600000800000017810000010000000384000001000000148100000100000055840000030000000E810000190000005E86000001000000E98000000600000028970000010000000B8100000D00000014860000020000001186000002000000058100000300000046810000010000000D810000020000005D860000010000000A84000001000000E880000002000000 + FC0000001A0013860000040000002681000005000000108600000100000048810000010000000F8100000100000001E10000010000000D800000010000000C810000B8000000038400000100000017810000010000005686000008000000558400000600000014810000010000005E860000010000000E8100001C0000000B8100000D0000002897000001000000E98000000600000014860000020000000581000003000000118600000200000046810000010000000A840000010000005D860000010000000D81000002000000E880000002000000 - 60000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400003C8400003D840000408400004C8400003E8400004B8400004D8400003F8400003A8400003B8400005A8400005B840000D6840000D7840000D8840000D9840000DA840000DB840000DC840000DD840000DE840000DF840000E0840000E1840000E2840000EA840000248100000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE0000209200002892000029920000379200003892000034920000339200001E9200001D92000045DE000008800000098000000A8000000B8000000C800000158000000A81000001E800007784000007840000808C000044D5000055840000568400005984000012810000D284000053840000818400007D840000828400008384000084840000E8800000E98400002DDE00001FDE00002CDE0000868400004D9700002AE10000008200001C82000033820000018200003D9700003E97000025920000 - 5600048400004D000000249700007A000000139700007700000015810000750000002CE100003D0C000004810000D70000001097000072000000268100007600000007E1000090000000318400005400000029E10000B70000001E97000074000000239200000000000004E100008E0000000F810000DE00000020810000E600000000900000030100000D8000006900000001E100008B00000023E100003A0C00000C810000DB00000029970000640000003A9700008F00000007970000B2000000198200000C0C0000068400004F0000002697000086000000159700007600000009810000D90000001781000077000000168200000A0C0000038400004C000000349700008A000000239700007D000000129700007100000014810000740000002BE100003C0C000000840000420C000031970000870000000F97000070000000008100006A00000030840000530000000E8400005100000044920000CF00000003E100008D00000025E100003B0C00002F8200000D0C00000E810000DD0000001F810000E50000002B970000660000003C970000910000001F920000CC00000000E100008A00000022E10000390C000006970000310C00000B810000680000002897000063000000399700008E000000179700007B0000002D920000CE00000041E1000097000000188200000B0C0000058400004E000000D1840000CB000000259700008500000014970000790000001681000076000000028400004B00000005810000D80000001197000075000000328400005500000010840000520000000E9700006F00000051840000A800000005E100008F00000002E10000F70000000D8100006A0000000A8400005000000024E10000B60000002A970000650000003B9700009000000035E100000101000005970000300C0000279700007E000000169700007C0000002C920000CD000000 + 61000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400003C8400003D840000408400004C8400003E8400004B8400004D8400003F8400003A8400003B8400005A8400005B840000D6840000D7840000D8840000D9840000DA840000DB840000DC840000DD840000DE840000DF840000E0840000E1840000E2840000EA840000248100000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE0000209200002892000029920000379200003892000034920000339200001E9200001D92000045DE000008800000098000000A8000000B8000000C800000158000000A81000001E800007784000007840000808C000044D5000055840000568400005984000012810000D284000053840000818400007D840000828400008384000084840000E8800000E98400002DDE00001FDE00002CDE0000868400004D9700002AE10000008200001C82000033820000018200003D9700003E9700002592000048810000 + 57001397000077000000249700007A000000048400004D0000002681000076000000109700007200000004810000D70000002CE100003D0C0000158100007500000023920000000000001E9700007400000029E10000B7000000318400005400000007E1000090000000009000000301000020810000E60000000F810000DE00000004E100008E00000007970000B20000003A9700008F00000029970000640000000C810000DB00000023E100003A0C000001E100008B0000000D8000006900000009810000D900000015970000760000002697000086000000068400004F000000198200000C0C00001297000071000000239700007D000000349700008A000000038400004C000000168200000A0C0000178100007700000025920000590000000F97000070000000319700008700000000840000420C00002BE100003C0C0000148100007400000044920000CF0000000E840000510000003084000053000000008100006A0000001F920000CC0000003C970000910000002B970000660000001F810000E50000000E810000DD0000002F8200000D0C000025E100003B0C000003E100008D0000002D920000CE000000179700007B000000399700008E00000028970000630000000B8100006800000006970000310C000022E10000390C000000E100008A00000014970000790000002597000085000000D1840000CB000000058400004E000000188200000B0C000041E1000097000000119700007500000005810000D8000000028400004B00000016810000760000000E9700006F0000001084000052000000328400005500000005E100008F00000051840000A800000035E10000010100003B970000900000002A9700006500000024E10000B60000000A840000500000000D8100006A00000002E10000F70000002C920000CD000000169700007C000000279700007E00000005970000300C0000 0 @@ -162,9 +162,9 @@ _I0 - 438 + 436 40 - 1024 + 1026 20 24 @@ -208,7 +208,7 @@ 76 914 2 - + 0 -1 @@ -230,7 +230,7 @@ 76 914 2 - + 0 -1 @@ -266,7 +266,7 @@ 76 914 2 - + 0 -1 @@ -285,7 +285,7 @@ 2 - + 0 -1 @@ -307,16 +307,16 @@ 2 - + - + <Right-click on a symbol in the editor to show a call graph> - + 0 @@ -325,7 +325,7 @@ 0 - + 0 @@ -461,12 +461,12 @@ CMSIS-Pack - 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000008000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 + 00200000010000000100FFFF01001100434D4643546F6F6C426172427574746F6ED18400000200000005020000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF0A43004D005300490053002D005000610063006B0018000000 34049 0A0000000A0000006E0000006E000000 - 3A03000000000000680300001A000000 + CB03000000000000F90300001A000000 8192 0 0 @@ -523,26 +523,27 @@ 33054 0 33035 - 33036 + 33037 34399 0 33038 33039 + 33877 0 Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000039000000FFFEFF000000000000000000000000000100000001000000018001E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018003E10000000000003C000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040041000000FFFEFF000000000000000000000000000100000001000000018022E100000000040040000000FFFEFF000000000000000000000000000100000001000000018025E100000000040042000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040043000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040044000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002B000000FFFEFF000000000000000000000000000100000001000000018024E100000000000034000000FFFEFF000000000000000000000000000100000001000000018028E100000000040033000000FFFEFF000000000000000000000000000100000001000000018029E100000000000035000000FFFEFF000000000000000000000000000100000001000000018002810000000000001A000000FFFEFF000000000000000000000000000100000001000000018029810000000000002F000000FFFEFF000000000000000000000000000100000001000000018027810000000000002D000000FFFEFF000000000000000000000000000100000001000000018028810000000000002E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000027000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040028000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020000001E000000FFFEFF00000000000000000000000000010000000100000001800C810000020000001F000000FFFEFF00000000000000000000000000010000000100000001805F8600000200000032000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000021000000FFFEFF00000000000000000000000000010000000100000001800F8100000200000022000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E10000000000002F020000FFFEFF000000000000000000000000000100000001000000018001E100000000000030020000FFFEFF000000000000000000000000000100000001000000018003E100000000000032020000FFFEFF000000000000000000000000000100000001000000018000810000000000000F020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E100000000000035020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040037020000FFFEFF000000000000000000000000000100000001000000018022E100000000040036020000FFFEFF000000000000000000000000000100000001000000018025E100000000000038020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040039020000FFFEFF00000000000000000000000000010000000100000001802CE10000000004003A020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000000FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF00960000000000000000000180218100000000040021020000FFFEFF000000000000000000000000000100000001000000018024E10000000000002A020000FFFEFF000000000000000000000000000100000001000000018028E100000000040029020000FFFEFF000000000000000000000000000100000001000000018029E10000000000002B020000FFFEFF0000000000000000000000000001000000010000000180028100000000000010020000FFFEFF0000000000000000000000000001000000010000000180298100000000000025020000FFFEFF0000000000000000000000000001000000010000000180278100000000000023020000FFFEFF0000000000000000000000000001000000010000000180288100000000000024020000FFFEFF00000000000000000000000000010000000100000001801D810000000000001D020000FFFEFF00000000000000000000000000010000000100000001801E810000000004001E020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000200000014020000FFFEFF00000000000000000000000000010000000100000001800D8100000200020016020000FFFEFF00000000000000000000000000010000000100000001805F8600000200000028020000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000017020000FFFEFF00000000000000000000000000010000000100000001800F8100000200000018020000FFFEFF00000000000000000000000000010000000100000001805584000002000000FFFFFFFFFFFEFF1B44006F0077006E006C006F0061006400200061006300740069007600650020006100700070006C00690063006100740069006F006E00000000000000000001000000000000000100000000000000FFFEFF044D00610069006E00E4010000 34065 0A0000000A0000006E0000006E000000 - 00000000000000003A0300001A000000 + 0000000000000000CB0300001A000000 8192 0 0 - 804 + 484 0 @@ -584,7 +585,7 @@ - 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000C0000000500000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700390037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C00530044004B005C006D006900640064006C00650077006100720065005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330037002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003600360039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003600360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330037002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C0064007200690076006500720073005C0063006C006F0063006B005C0063006C006F0063006B005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003400350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003600300032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003600300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B63006C006F0063006B005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF342400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330036002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330036002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0073007400610063006B005C007500640073002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003700330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003700330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057500640073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C007300720063005C0062006F006F0074006C006F0061006400650072005C0062006F006F0074006C006F0061006400650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500310033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C62006F006F0074006C006F0061006400650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF492400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C0073007400610072007400750070005F004D0030003100340078002E005300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300340034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320034003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320034003400350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F73007400610072007400750070005F004D0030003100340078002E00530000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C00730079007300740065006D005F004D0030003100340078002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730079007300740065006D005F004D0030003100340078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF542400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C0066006C0065007800630061006E005C0066006C0065007800630061006E005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003400360034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003800370032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003800370032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C007200650067005C0066006C0065007800630061006E005F007200650067002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330037003500310032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330037003500310032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F007200650067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C007300720063005C0054004C00450039003400360031005C0054004C00450039003400780031005F0044004500460049004E00450053002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003000340030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003000350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1154004C00450039003400780031005F0044004500460049004E00450053002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2F2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F0075007300650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A7500640073005F0075007300650072002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000004301000049000000000600001B020000 + 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000C0000000000000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700360030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320031003800370033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320031003800370033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C00530044004B005C006D006900640064006C00650077006100720065005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330037002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003600360039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003600360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330037002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C0064007200690076006500720073005C0063006C006F0063006B005C0063006C006F0063006B005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003400350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003600300032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003600300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B63006C006F0063006B005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF342400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330036002E006300010000000180FFFEFF00FFFEFFFF21013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330036002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0073007400610063006B005C007500640073002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003700330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003700330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057500640073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C007300720063005C0062006F006F0074006C006F0061006400650072005C0062006F006F0074006C006F0061006400650072002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003500330031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320032003100350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320032003100350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C62006F006F0074006C006F0061006400650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF492400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C0073007400610072007400750070005F004D0030003100340078002E005300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300300035003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320033003400390031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320033003400390031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F73007400610072007400750070005F004D0030003100340078002E00530000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C00730079007300740065006D005F004D0030003100340078002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730079007300740065006D005F004D0030003100340078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF542400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C0066006C0065007800630061006E005C0066006C0065007800630061006E005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003400360034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003800370032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003800370032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C007200650067005C0066006C0065007800630061006E005F007200650067002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330037003500310032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330037003500310032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F007200650067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C007300720063005C0054004C00450039003400360031005C0054004C00450039003400780031005F0044004500460049004E00450053002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003000340030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003000350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1154004C00450039003400780031005F0044004500460049004E00450053002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2F2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F0075007300650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A7500640073005F0075007300650072002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000004301000049000000000600001B020000 diff --git a/cva_bootloader_m0146/src/bootloader/bootloader_cfg.h b/cva_bootloader_m0146/src/bootloader/bootloader_cfg.h index ee7ce96..1e9b539 100644 --- a/cva_bootloader_m0146/src/bootloader/bootloader_cfg.h +++ b/cva_bootloader_m0146/src/bootloader/bootloader_cfg.h @@ -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 (0u) +#define BOOTLOADER_CFG_FLS_CODE_GENERATE_EN (1u) /* 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 (0u) +#define BOOTLOADER_CFG_FLS_COPY_AUTO_EN (1u) /* Indication value with boot loader request from asw */ #define BOOTLOADER_CFG_REQ_ACTIVE (0x55AAAA55ul) @@ -66,7 +66,7 @@ extern "C" { #define BOOTLOADER_CFG_FLS_DRV_RAM_CODE_SIZE (BOOTLOADER_CFG_FLS_DRV_RAM_CRC_ADDR - BOOTLOADER_CFG_FLS_DRV_RAM_START_ADDR) /* The max time stay in boot before can jump to App, unit: ms */ -#define BOOTLOADER_CFG_BOOT_DURATION_MS (50u) +#define BOOTLOADER_CFG_BOOT_DURATION_MS (10u) /* Erased all sector */ #define BOOTLOADER_CFG_ERASE_ALL (0xFFFFFFFF) diff --git a/cva_bootloader_m0146/src/main.c b/cva_bootloader_m0146/src/main.c index 0fa8744..4d5b99b 100644 --- a/cva_bootloader_m0146/src/main.c +++ b/cva_bootloader_m0146/src/main.c @@ -98,6 +98,8 @@ typedef struct #pragma location = ".no_init" static uint32_t sBootloader_Req; +#pragma location = ".no_init" +static uint32_t reboot_times; #pragma location = ".bootloaderInfo" __root const Bootloade_CfgInfoType sBootloader_Version = { @@ -439,6 +441,8 @@ void SysTick_Handler(void) Uds_Tick(&udsObj); } + + void CAN0_ERxFIFO_Handler(void) { if(FlexCanDrv_GetEnhanceRxFFIsrFlag(flexCanDrv_DemoObj, FLEXCANDRV_ENHANCERXFF_ISR_SRC_DAIE) == true) @@ -750,6 +754,36 @@ static void ResetS3Timer(UdsType *obj) { obj->s3ServerTimer.counter = 0; } + +uint8_t ExtraBootInitFlag,ExtraBootInitDelay; +static void ExtraBootInit(void) +{ + uint32_t tTcr = 0; + ClockDrv_ModuleClkConfigType clockConfig; + /* Setup the Pll div2 clock */ + clockConfig.gating = true; + clockConfig.source = CLOCKDRV_PLL; + clockConfig.div = 1; + ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_PLL_DIV2, &clockConfig); + + + /* Setup the SPI clock */ + clockConfig.gating = true; + clockConfig.source = CLOCKDRV_PLL_DIV2; + ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_SPI2, &clockConfig); + + tTcr = SpiReg_GetTcr((const SpiRegType *)&mcu.spiDrv2.reg); + + SpiDrv_SetPrescaler(&tTcr,0x03); + + //SEGGER_RTT_printf(0,"ret = %d\n",ret); + //SEGGER_RTT_printf(0,"-----SBC_SPI_INIT-----\n"); + + SBC_SPI_INIT(); + + + SBC_Init(); +} int main(void) { FlexCan_FrameStructureType rxMsg; @@ -757,8 +791,19 @@ int main(void) ClockDrv_ModuleClkConfigType clockConfig; uint32_t ret; uint32_t rollingcounter,temp; - uint32_t tTcr = 0; + + if((reboot_times>>16) != 0x55AA) + { + reboot_times = 0x55AA0000; + } + else + { + reboot_times++; + } + + ExtraBootInitFlag = 0; + ExtraBootInitDelay = 0; IrqDrv_DisableGlobalInterrupt(); /* Initialize all MCU drivers: flash drv included */ @@ -781,29 +826,7 @@ int main(void) ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_PORTD, &clockConfig); ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_PORTE, &clockConfig); - /* Setup the Pll div2 clock */ - clockConfig.gating = true; - clockConfig.source = CLOCKDRV_PLL; - clockConfig.div = 1; - ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_PLL_DIV2, &clockConfig); - - - /* Setup the SPI clock */ - clockConfig.gating = true; - clockConfig.source = CLOCKDRV_PLL_DIV2; - ret = ClockDrv_ConfigureClock(&mcu.clockDrv, CLOCKDRV_SPI2, &clockConfig); - - tTcr = SpiReg_GetTcr((const SpiRegType *)&mcu.spiDrv2.reg); - - SpiDrv_SetPrescaler(&tTcr,0x03); - - //SEGGER_RTT_printf(0,"ret = %d\n",ret); - //SEGGER_RTT_printf(0,"-----SBC_SPI_INIT-----\n"); - - SBC_SPI_INIT(); - - - SBC_Init(); + //SBC_Mode_Normal(); /* get CAN controller default configuration */ @@ -836,23 +859,47 @@ int main(void) IrqDrv_EnableGlobalInterrupt(); - SEGGER_RTT_printf(0,"gCpuClockFrequency = %d\n",gCpuClockFrequency); - + //SEGGER_RTT_printf(0,"gCpuClockFrequency = %d\n",gCpuClockFrequency); + SEGGER_RTT_printf(0,"reboot_times = %d\n",(reboot_times&0xff)); + uint32_t reset_src = mcu.resetDrv.rcmReg->RST_FLAG; + SEGGER_RTT_printf(0,"reset_src = %08x\n",reset_src); + if ((reboot_times&0xff) > 5) + { + Bootloader_EventEmergeBootRequest(true); + } + while(1) { if(gSystick1msEvent > 0u) { gSystick1msEvent = 0; gSystick1msCnt++; + if (ExtraBootInitFlag == 0) + { + if (ExtraBootInitDelay < BOOTLOADER_CFG_BOOT_DURATION_MS) + { + ExtraBootInitDelay++; + } + else + { + ExtraBootInitDelay = 0; + ExtraBootInitFlag = 1; + ExtraBootInit(); + } + } + if (gSystick1msCnt % 10 == 0) { - SBC_WD_Trigger(); + if (ExtraBootInitFlag == 1) + { + SBC_WD_Trigger(); + } } if (PinsDrv_ReadPin(&mcu.ptc, 2) == 0) { Bootloader_EventEmergeBootRequest(true); } - if (gSystick1msCnt % 500 == 0) + if (gSystick1msCnt % 1000 == 0) { ret = SBC_Read_Command(SBC_WD_CTRL); SEGGER_RTT_printf(0,"%04d : SBC_WD_CTRL = %x\n",rollingcounter++,ret); diff --git a/cva_bootloader_m0146/src/private_driver/isotp/isotp.c b/cva_bootloader_m0146/src/private_driver/isotp/isotp.c index e34d39f..6d46efc 100644 --- a/cva_bootloader_m0146/src/private_driver/isotp/isotp.c +++ b/cva_bootloader_m0146/src/private_driver/isotp/isotp.c @@ -637,6 +637,7 @@ void IsoTp_HandleIncomingCanMsg(IsoTpType *obj, uint32_t id, const uint8_t *data /* If wrong SN */ if(ISOTP_RET_WRONG_SN == ret) { + TxTestMsg(&msg.byte); obj->receiveProtocolResult = ISOTP_PROTOCOL_RESULT_WRONG_SN; obj->receiveStatus = ISOTP_RECEIVE_STATUS_IDLE; break; diff --git a/cva_bootloader_m0146/src/private_driver/uds/stack/uds.h b/cva_bootloader_m0146/src/private_driver/uds/stack/uds.h index 1c9c286..34eb0a5 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/stack/uds.h +++ b/cva_bootloader_m0146/src/private_driver/uds/stack/uds.h @@ -85,7 +85,7 @@ extern "C" { #define BYTES_OF(x) (sizeof(x) / sizeof(uint8_t)) -#define UDS_RSP_LEN_MAX (512) +#define UDS_RSP_LEN_MAX (64) /* DID type */ #define UDS_VAR_TYPE_NONVOL_STORAGE (1 << 0) /* set if non-volatile data */ diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service36.c b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service36.c index f92d09f..1983803 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service36.c +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service36.c @@ -136,7 +136,7 @@ void UdsService36_TransferData(UdsType *obj, const uint8_t msgBuf[], uint16_t ms rspBuffer[0] = UDS_GET_POSITIVE_RSP(0x36); rspBuffer[1] = s_curRcvSequence; - Uds_PositiveResponse(obj, rspBuffer, 2); + //Uds_PositiveResponse(obj, rspBuffer, 2); } break; case UDS_TRANSFER_DIR_UPLOAD: