diff --git a/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt b/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt index 65cbf5b..03dddd2 100644 --- a/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt +++ b/cva_bootloader_m0146/settings/cva_bootloader_m0146.wsdt @@ -95,7 +95,7 @@ 1 1 1 - D300000019001386000004000000108600000100000026810000050000000F810000010000000C810000970000000D8000000100000001E1000001000000568600000800000017810000010000000384000001000000148100000100000055840000030000000E810000190000005E86000001000000E98000000600000028970000010000000B8100000C00000014860000020000001186000002000000058100000300000046810000010000000D810000020000005D860000010000000A84000001000000E880000002000000 + D800000019001386000004000000108600000100000026810000050000000F810000010000000C8100009B0000000D8000000100000001E1000001000000568600000800000017810000010000000384000001000000148100000100000055840000030000000E810000190000005E86000001000000E98000000600000028970000010000000B8100000D00000014860000020000001186000002000000058100000300000046810000010000000D810000020000005D860000010000000A84000001000000E880000002000000 60000D8400000F84000008840000FFFFFFFF54840000328100001C810000098400003C8400003D840000408400004C8400003E8400004B8400004D8400003F8400003A8400003B8400005A8400005B840000D6840000D7840000D8840000D9840000DA840000DB840000DC840000DD840000DE840000DF840000E0840000E1840000E2840000EA840000248100000C84000033840000788400001184000020DE000021DE000026DE000028DE000023DE000022DE000024DE000027DE000025DE0000209200002892000029920000379200003892000034920000339200001E9200001D92000045DE000008800000098000000A8000000B8000000C800000158000000A81000001E800007784000007840000808C000044D5000055840000568400005984000012810000D284000053840000818400007D840000828400008384000084840000E8800000E98400002DDE00001FDE00002CDE0000868400004D9700002AE10000008200001C82000033820000018200003D9700003E97000025920000 @@ -533,7 +533,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000039000000FFFEFF000000000000000000000000000100000001000000018001E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018003E10000000004003C000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000040041000000FFFEFF000000000000000000000000000100000001000000018022E100000000040040000000FFFEFF000000000000000000000000000100000001000000018025E100000000040042000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040043000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040044000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000400FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002B000000FFFEFF000000000000000000000000000100000001000000018024E100000000040034000000FFFEFF000000000000000000000000000100000001000000018028E100000000040033000000FFFEFF000000000000000000000000000100000001000000018029E100000000040035000000FFFEFF000000000000000000000000000100000001000000018002810000000004001A000000FFFEFF000000000000000000000000000100000001000000018029810000000004002F000000FFFEFF000000000000000000000000000100000001000000018027810000000004002D000000FFFEFF000000000000000000000000000100000001000000018028810000000004002E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040027000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040028000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020004001E000000FFFEFF00000000000000000000000000010000000100000001800D8100000200020020000000FFFEFF00000000000000000000000000010000000100000001805F8600000200000032000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000021000000FFFEFF00000000000000000000000000010000000100000001800F8100000200000022000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000039000000FFFEFF000000000000000000000000000100000001000000018001E10000000000003A000000FFFEFF000000000000000000000000000100000001000000018003E10000000004003C000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E100000000000041000000FFFEFF000000000000000000000000000100000001000000018022E100000000040040000000FFFEFF000000000000000000000000000100000001000000018025E100000000000042000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040043000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040044000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01000D005061737465436F6D626F426F784281000000000400FFFFFFFFFFFEFF000100000000000000010000000000000001000000B400000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004002B000000FFFEFF000000000000000000000000000100000001000000018024E100000000040034000000FFFEFF000000000000000000000000000100000001000000018028E100000000040033000000FFFEFF000000000000000000000000000100000001000000018029E100000000040035000000FFFEFF000000000000000000000000000100000001000000018002810000000004001A000000FFFEFF000000000000000000000000000100000001000000018029810000000004002F000000FFFEFF000000000000000000000000000100000001000000018027810000000004002D000000FFFEFF000000000000000000000000000100000001000000018028810000000004002E000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000027000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040028000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000020004001E000000FFFEFF00000000000000000000000000010000000100000001800D8100000200020020000000FFFEFF00000000000000000000000000010000000100000001805F8600000200000032000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000200000021000000FFFEFF00000000000000000000000000010000000100000001800F8100000200000022000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E0024030000 34065 @@ -584,7 +584,7 @@ - 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000B0000000000000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700390037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320033003000320039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320033003000350033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C00530044004B005C006D006900640064006C00650077006100720065005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330037002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003600360039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003600360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330037002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C0064007200690076006500720073005C0063006C006F0063006B005C0063006C006F0063006B005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003400350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003600300032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003600300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B63006C006F0063006B005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF342400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330036002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330036002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0073007400610063006B005C007500640073002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003700330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003700330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057500640073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C007300720063005C0062006F006F0074006C006F0061006400650072005C0062006F006F0074006C006F0061006400650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600380038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C62006F006F0074006C006F0061006400650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF492400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C0073007400610072007400750070005F004D0030003100340078002E005300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300340034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320034003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320034003400350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F73007400610072007400750070005F004D0030003100340078002E00530000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C00730079007300740065006D005F004D0030003100340078002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730079007300740065006D005F004D0030003100340078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF542400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C0066006C0065007800630061006E005C0066006C0065007800630061006E005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003400360034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003800370032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003800370032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C007200650067005C0066006C0065007800630061006E005F007200650067002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330037003500310032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330037003500310032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F007200650067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C007300720063005C0054004C00450039003400360031005C0054004C00450039003400780031005F0044004500460049004E00450053002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003000340030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003000350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1154004C00450039003400780031005F0044004500460049004E00450053002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000004301000049000000000600001B020000 + 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000C0000000B00000001000000FFFEFF132400570053005F0044004900520024005C007300720063005C006D00610069006E002E00630001000000FFFF010017004966436F6E74656E7453746F726167654D6663496D706CFFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700390037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320033003000380031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320033003000380031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF302400570053005F0044004900520024005C00530044004B005C006D006900640064006C00650077006100720065005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330037002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003600360039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003600360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330037002E00630000000000FFFFFFFFFFFFFFFFFFFEFF352400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C0064007200690076006500720073005C0063006C006F0063006B005C0063006C006F0063006B005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2B013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003400350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00370036003600300032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00370036003600300032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B63006C006F0063006B005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF342400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F007300650072007600690063006500330036002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F7500640073005F007300650072007600690063006500330036002E00630000000000FFFFFFFFFFFFFFFFFFFEFF2B2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0073007400610063006B005C007500640073002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00380034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003700330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003700330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057500640073002E00630000000000FFFFFFFFFFFFFFFFFFFEFF242400570053005F0044004900520024005C007300720063005C0062006F006F0074006C006F0061006400650072005C0062006F006F0074006C006F0061006400650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003600380038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0C62006F006F0074006C006F0061006400650072002E00630000000000FFFFFFFFFFFFFFFFFFFEFF492400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C0073007400610072007400750070005F004D0030003100340078002E005300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003300340034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320034003400350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320034003400350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F73007400610072007400750070005F004D0030003100340078002E00530000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C006300700075005C0073007400610072007400750070005C00730079007300740065006D005F004D0030003100340078002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0E730079007300740065006D005F004D0030003100340078002E00630000000000FFFFFFFFFFFFFFFFFFFEFF542400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C0064007200690076006500720073005C0066006C0065007800630061006E005C0066006C0065007800630061006E005F006400720076002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003400360034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00310033003800370032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00310033003800370032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F006400720076002E00630000000000FFFFFFFFFFFFFFFFFFFEFF482400570053005F0044004900520024005C002E002E005C006300760061005F006100730077005F006D0030003100340036005C00530044004B005C0070006C006100740066006F0072006D005C0064006500760069006300650073005C00430056004D0030003100340078005C007200650067005C0066006C0065007800630061006E005F007200650067002E006800010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700320039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00330037003500310032003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00330037003500310032003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0D66006C0065007800630061006E005F007200650067002E00680000000000FFFFFFFFFFFFFFFFFFFEFF262400570053005F0044004900520024005C007300720063005C0054004C00450039003400360031005C0054004C00450039003400780031005F0044004500460049004E00450053002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003000340030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003000350031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1154004C00450039003400780031005F0044004500460049004E00450053002E00680000000000FFFFFFFFFFFFFFFFFFFEFF2F2400570053005F0044004900520024005C007300720063005C0070007200690076006100740065005F006400720069007600650072005C007500640073005C0075007300650072005C007500640073005F0075007300650072002E006300010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100310034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A7500640073005F0075007300650072002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000004301000049000000000600001B020000 diff --git a/cva_bootloader_m0146/src/main.c b/cva_bootloader_m0146/src/main.c index 3ac5a25..47852b1 100644 --- a/cva_bootloader_m0146/src/main.c +++ b/cva_bootloader_m0146/src/main.c @@ -657,7 +657,7 @@ static bool Bootloader_GetBootReq(void) else { /* Clear the no-init ram */ - sBootloader_Req = 0x778899AA; + sBootloader_Req = 0; } } else @@ -689,6 +689,8 @@ static void Bootloader_JumpToApp(void) IrqDrv_DisableGlobalInterrupt(); + FlexCanDrv_SoftReset(flexCanDrv_DemoObj); + /* MSP */ appStack = *(uint32_t *)BOOTLOADER_CFG_APP_START_ADDR; /* PC */ @@ -697,9 +699,9 @@ static void Bootloader_JumpToApp(void) pJumpToApp = (void (*)(void))appEntry; statckPointer = appStack; /* Set the MSP */ - __set_MSP(statckPointer); __set_PSP(statckPointer); - + __set_MSP(statckPointer); + SCB->VTOR = (uint32_t)BOOTLOADER_CFG_APP_START_ADDR; /* Jump action */ pJumpToApp(); diff --git a/cva_bootloader_m0146/src/private_driver/isotp/isotp.c b/cva_bootloader_m0146/src/private_driver/isotp/isotp.c index a1a624f..e34d39f 100644 --- a/cva_bootloader_m0146/src/private_driver/isotp/isotp.c +++ b/cva_bootloader_m0146/src/private_driver/isotp/isotp.c @@ -656,6 +656,8 @@ void IsoTp_HandleIncomingCanMsg(IsoTpType *obj, uint32_t id, const uint8_t *data else { /* Send FC when BS reaches limit */ + if(obj->blockSize > 0) + { if(0 == --obj->receiveBlockSizeCount) { obj->receiveBlockSizeCount = obj->blockSize; @@ -663,6 +665,7 @@ void IsoTp_HandleIncomingCanMsg(IsoTpType *obj, uint32_t id, const uint8_t *data } } } + } 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 34eb0a5..1c9c286 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 (64) +#define UDS_RSP_LEN_MAX (512) /* 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_service10.c b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service10.c index e08d254..d7ee123 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service10.c +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service10.c @@ -19,6 +19,7 @@ ******************************************************************************/ #include "uds_service10.h" +#include "uds_service31.h" #include "bootloader.h" /******************************************************************************* @@ -60,6 +61,7 @@ void UdsService10_SessionControl(UdsType *obj, const uint8_t msgBuf[], uint16_t rspBuffer[3] = (uint8_t)(obj->p2Server_ms & 0x00ff); rspBuffer[4] = (uint8_t)(obj->p2xServer_10ms >> 8); rspBuffer[5] = (uint8_t)(obj->p2xServer_10ms & 0x00ff); + Routine_StatusInit(); switch(subFunction) { case UDS_SESSION_DEFAULT: diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.c b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.c index d8e2b97..b6be23b 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.c +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.c @@ -99,18 +99,15 @@ Uds_RtnCtrl udsRtnCtrlTable[] = { * the functions ******************************************************************************/ -void Routine_StatusInit(uint16_t routineId) +void Routine_StatusInit(void) { uint8_t rtnIndex = 0; uint8_t rntNum = sizeof(udsRtnCtrlTable) / sizeof(Uds_RtnCtrl); for(rtnIndex = 0; rtnIndex < rntNum; rtnIndex++) { - if(udsRtnCtrlTable[rtnIndex].rtnCtrlId == routineId) - { udsRtnCtrlTable[rtnIndex].rtnStatus = UDS_RTN_ST_IDLE; } - } } static void Routine_StartEreaseMemory(const uint8_t *pdata, uint16_t len, uint8_t *pRspData, uint16_t rspSize, uint16_t *pRspLen) diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.h b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.h index a51729d..8f83696 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.h +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service31.h @@ -53,7 +53,7 @@ extern void UdsService31_RoutineControl(UdsType *obj, const uint8_t msgBuf[], ui /*! \brief Routine status init */ -extern void Routine_StatusInit(uint16_t routineId); +extern void Routine_StatusInit(void); #ifdef __cplusplus } diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service34.c b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service34.c index 1b45fa6..7e9f2f0 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_service34.c +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_service34.c @@ -45,10 +45,9 @@ uint32_t Uds_GetMaxfBlockSize(void) { - /* user add code to get max num of block length */ uint32_t blockSize = 0; /* user add code to get max num of block length */ - blockSize = Bootloader_GetPgmBlockSize(); + blockSize = Bootloader_GetPgmBlockSize() + 2u; return blockSize; } diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.c b/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.c index 40a439c..c3d4f21 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.c +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.c @@ -35,6 +35,7 @@ typedef struct _Uds_DidBuffer_ uint8_t buffer_F186[1]; uint8_t buffer_F187[8];//ecu name uint8_t buffer_F180[8];//boot version + uint8_t buffer_F191[24];//buildtime uint8_t buffer_F193[4];//hw version uint8_t buffer_F195[8];//sw version } Uds_DidBuffer; @@ -89,6 +90,7 @@ Uds_DidType udsDidTable[] = { {0xF186, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F186, BYTES_OF(udsDidBuf.buffer_F186),DID_F186_func}, {0xF187, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F187, BYTES_OF(udsDidBuf.buffer_F187),DID_F187_func}, {0xF180, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F180, BYTES_OF(udsDidBuf.buffer_F180),DID_F180_func}, + {0xF191, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F191, BYTES_OF(udsDidBuf.buffer_F191),DID_F191_func}, {0xF193, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F193, BYTES_OF(udsDidBuf.buffer_F193),DID_F193_func}, {0xF195, UDS_DID_TYPE_RAM_RW, UDS_SESSION_DEFAULT, UDS_SA_NONE, udsDidBuf.buffer_F195, BYTES_OF(udsDidBuf.buffer_F195),DID_F195_func}, }; @@ -125,6 +127,15 @@ void DID_F187_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen) PBootInfo = (Bootloade_CfgInfoType *)0x0000400; memcpy(dataBuf, &(PBootInfo->ECUName), dataLen); } +void DID_F191_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen) +{ + Bootloade_CfgInfoType * PBootInfo; + PBootInfo = (Bootloade_CfgInfoType *)0x0000400; + //memcpy(dataBuf, &(PBootInfo->HWVersion), dataLen); + memcpy(dataBuf, &(PBootInfo->bootBuildDate), 12); + memcpy(dataBuf + 12, &(PBootInfo->bootBuildTime), 8); + dataBuf[11] = ' '; +} void DID_F193_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen) { Bootloade_CfgInfoType * PBootInfo; @@ -135,7 +146,7 @@ void DID_F195_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen) { for (uint8_t i = 0; i < dataLen; i++) { - dataBuf[i] = " ";//TODO + dataBuf[i] = 0x20;//TODO } } \ No newline at end of file diff --git a/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.h b/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.h index 8277205..5f6cb86 100644 --- a/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.h +++ b/cva_bootloader_m0146/src/private_driver/uds/user/uds_user.h @@ -71,6 +71,8 @@ extern void Uds_UserInit(UdsType *obj, const Uds_ParamsType *pParams); extern void DID_F180_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen); extern void DID_F186_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen); +extern void DID_F187_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen); +extern void DID_F191_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen); extern void DID_F193_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen); extern void DID_F195_func(UdsType *obj,uint8_t dataBuf[], uint8_t dataLen);