diff --git a/IAR/settings/test01.dbgdt b/IAR/settings/test01.dbgdt index 70464bd..5a77755 100644 --- a/IAR/settings/test01.dbgdt +++ b/IAR/settings/test01.dbgdt @@ -156,7 +156,7 @@ 1 1 1 - B40300003300138600001A0000005786000001000000568400000100000010860000A90000001581000003000000048100000100000023920000010000005F860000010000000F8100000200000020810000020000000C81000033000000EA800000010000001D8100000100000026DE0000020000001D92000002000000048600000300000056860000640100001781000001000000288100000100000055840000010000001481000005000000259200000100000083860000020000000081000001000000D88600000100000028E100005A00000009860000010000005E860000070000001F810000060000000E8100003400000003E10000030000000B8100000100000000E1000003000000E9800000010000008E860000040000006986000001000000588600000100000014860000260000002781000002000000558600000100000005810000020000001186000051000000028400000100000010840000050000004681000099000000608600000300000021810000110000005D860000010000000D810000040000001E8100001F0000000886000002000000 + C90300003300138600001A0000005786000001000000568400000100000010860000B20000001581000003000000048100000100000023920000010000005F860000010000000F8100000200000020810000020000000C81000033000000EA800000010000001D8100000100000026DE0000020000001D92000002000000048600000300000056860000640100001781000001000000288100000100000055840000010000001481000005000000259200000100000083860000020000000081000001000000D88600000100000028E100005A00000009860000010000005E860000070000001F810000060000000E8100003400000003E10000030000000B8100000100000000E1000003000000E9800000010000008E8600000400000069860000010000005886000001000000148600002600000027810000020000005586000001000000058100000200000011860000530000000284000001000000108400000500000046810000A3000000608600000300000021810000110000005D860000010000000D810000040000001E8100001F0000000886000002000000 19000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000838600005886000004DC00007784000007840000808C000044D500007486000000DC000001DC000002DC000003DC00002AE10000008200001C8200000182000067860000 @@ -962,7 +962,9 @@ UART1rxIndex adc_GetValue g_Adc12ConversionValue - + flag1 + SystemCoreClock + Expression @@ -1144,7 +1146,7 @@ Debug - 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000000035000000FFFEFF0000000000000000000000000001000000010000000180138600000000000031000000FFFEFF00000000000000000000000000010000000100000001805E8600000000000037000000FFFEFF0000000000000000000000000001000000010000000180608600000000000039000000FFFEFF00000000000000000000000000010000000100000001805D8600000000000036000000FFFEFF000000000000000000000000000100000001000000018010860000000000002F000000FFFEFF0000000000000000000000000001000000010000000180118600000000040030000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000000032000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000020009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 + 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000040035000000FFFEFF0000000000000000000000000001000000010000000180138600000000040031000000FFFEFF00000000000000000000000000010000000100000001805E8600000000040037000000FFFEFF0000000000000000000000000001000000010000000180608600000000040039000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040036000000FFFEFF000000000000000000000000000100000001000000018010860000000004002F000000FFFEFF0000000000000000000000000001000000010000000180118600000000000030000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000040032000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000020009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 34049 @@ -1178,7 +1180,7 @@ Main - 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000066000000FFFEFF000000000000000000000000000100000001000000018001E100000000000067000000FFFEFF000000000000000000000000000100000001000000018003E100000000000069000000FFFEFF000000000000000000000000000100000001000000018000810000000000004A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006C000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006D000000FFFEFF000000000000000000000000000100000001000000018025E100000000000070000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040073000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040074000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005D000000FFFEFF000000000000000000000000000100000001000000018024E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018028E100000000040071000000FFFEFF000000000000000000000000000100000001000000018029E100000000000072000000FFFEFF000000000000000000000000000100000001000000018002810000000000004C000000FFFEFF0000000000000000000000000001000000010000000180298100000000000061000000FFFEFF000000000000000000000000000100000001000000018027810000000000005F000000FFFEFF0000000000000000000000000001000000010000000180288100000000000060000000FFFEFF00000000000000000000000000010000000100000001801D8100000000040059000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005A000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000040050000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000051000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000065000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005B000000FFFEFF000000000000000000000000000100000001000000018020810000000000005C000000FFFEFF0000000000000000000000000001000000010000000180468100000000020063000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000004006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000000006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000000006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000040070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000040073000000FFFEFF000000000000000000000000000100000001000000018002810000000004004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000040062000000FFFEFF0000000000000000000000000001000000010000000180278100000000040060000000FFFEFF0000000000000000000000000001000000010000000180288100000000040061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 34051 diff --git a/IAR/settings/test01.dnx b/IAR/settings/test01.dnx index 229cea6..9f02ff1 100644 --- a/IAR/settings/test01.dnx +++ b/IAR/settings/test01.dnx @@ -35,7 +35,7 @@ _ 0 - 2142188364 + 3227652277 _ 0 diff --git a/IAR/settings/test01.wsdt b/IAR/settings/test01.wsdt index 9afe6e9..76f68db 100644 --- a/IAR/settings/test01.wsdt +++ b/IAR/settings/test01.wsdt @@ -62,15 +62,13 @@ - 190 + 173 30 30 30 test01 - test01/drivers - test01/startup test01/user test01/utilities @@ -79,7 +77,7 @@ 24 1309 2 - + 0 -1 @@ -95,11 +93,11 @@ 1 1 1 - CC0200003300578600000100000013860000020000000481000001000000158100000300000010860000020000005684000001000000239200000100000020810000010000000F810000030000005F860000010000001D9200000200000026DE0000020000001D81000001000000EA800000010000000C8100008C010000048600000100000028810000010000001781000001000000568600000C00000025920000010000001481000005000000558400000100000028E100005A000000D8860000010000000081000001000000838600000200000003E10000030000000E810000230100001F810000010000005E8600000100000009860000010000008E86000001000000E98000000100000000E10000030000000B81000003000000148600000400000058860000010000006986000001000000028400000100000011860000030000000581000002000000558600000100000027810000020000004681000001000000108400000E0000002181000011000000608600000300000008860000010000001E8100001F0000000D810000040000005D86000001000000 + DE020000330013860000020000005786000001000000568400000100000010860000020000001581000003000000048100000100000023920000010000005F860000010000000F8100000300000020810000010000000C81000094010000EA800000010000001D8100000100000026DE0000020000001D920000020000000486000001000000568600000C0000001781000001000000288100000100000055840000010000001481000005000000259200000100000083860000020000000081000001000000D88600000100000028E100005A00000009860000010000005E860000010000001F810000010000000E8100002D01000003E10000030000000B8100000300000000E1000003000000E9800000010000008E8600000100000069860000010000005886000001000000148600000400000027810000020000005586000001000000058100000200000011860000030000000284000001000000108400000E0000004681000001000000608600000300000021810000110000005D860000010000000D810000040000001E8100001F0000000886000001000000 1E007784000007840000FFFFFFFF808C00000D8400000F8400000884000054840000328100001C81000009840000538400000C84000033840000788400001184000044D500000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F0000 - 1800048400004C000000048100001800000031840000530000002392000000000000208100002B0000000F810000230000000C81000020000000068400004E000000038400004B00000000840000480000000E8400005000000030840000520000001F8100002A0000000E8100002200000022E10000380000000B8100001F000000058400004D000000D18400000C000000028400004A0000000581000019000000108400005100000032840000540000000A8400004F0000000D81000021000000 + 1800048400004C0000000481000018000000239200000000000031840000530000000F81000023000000208100002B0000000C81000020000000068400004E000000038400004B000000008400004800000030840000520000000E840000500000000E810000220000001F8100002A0000000B8100001F00000022E1000038000000D18400000C000000058400004D0000000581000019000000028400004A000000328400005400000010840000510000000D810000210000000A8400004F000000 0 @@ -116,8 +114,8 @@ 4294967295 - 00000000FF01000056050000C5020000 - 00000000E801000056050000AE020000 + 000000005202000056050000C5020000 + 000000006C02000056050000AE020000 4096 0 0 @@ -130,7 +128,7 @@ 34048 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 04000000840200005205000094020000 32768 0 0 @@ -143,7 +141,7 @@ 34053 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 04000000840200005205000094020000 32768 0 0 @@ -156,7 +154,7 @@ 34054 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 04000000840200005205000094020000 32768 0 0 @@ -167,9 +165,9 @@ 1 - 472 - 67 - 810 + 466 + 66 + 799 2 0 @@ -178,7 +176,7 @@ 34055 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 040000008402000052050000C5020000 32768 0 0 @@ -192,7 +190,7 @@ 34056 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 040000008402000052050000C5020000 32768 0 0 @@ -206,7 +204,7 @@ 34057 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 04000000840200005205000094020000 32768 0 0 @@ -228,7 +226,7 @@ 34060 26FFFFFF890200007C0400005D030000 - 04000000000200005205000094020000 + 040000008402000052050000C5020000 32768 0 0 @@ -303,7 +301,7 @@ 34061 00000000170000000601000078010000 - 000000003200000017010000E4010000 + 0000000032000000F500000068020000 4096 0 0 @@ -370,7 +368,7 @@ - 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFF17010000320000001B010000E4010000010000000200001004000000010000000BFFFFFFC10300000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000003F01000056050000430100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF00000000E401000056050000E80100000100000001000010040000000100000008FEFFFF3900000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E65008000000100000000000000FF01000056050000C502000000000000E801000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0200000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 + 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFFF500000032000000F9000000680200000100000002000010040000000100000074FFFFFF2A0400000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000003F01000056050000430100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF0000000068020000560500006C0200000100000001000010040000000100000000FEFFFF3100000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000000000005202000056050000C5020000000000006C02000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 CMSIS-Pack @@ -391,7 +389,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000000042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 34050 @@ -448,7 +446,7 @@ - 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000C0000000000000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200370031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200370031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300380036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300380036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350031003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600380031003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600380031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400360035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00330032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003800360037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003800360037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0070006F00720074002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400340036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A660073006C005F0070006F00720074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200370039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200370039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF182400570053005F0044004900520024005C002E002E005C0075007300650072005C00640065006C00610079002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600370039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600370039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF07640065006C00610079002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C0075007300650072005C007000690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100370035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100390031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057000690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C0075007300650072005C007000690074002E006800010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00350036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00350036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057000690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF252400570053005F0044004900520024005C002E002E005C0073007400610072007400750070005C00730079007300740065006D005F004D004B005600350036004600320034002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100370034003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003000380037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003000390031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF11730079007300740065006D005F004D004B005600350036004600320034002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000001B0100004900000056050000FB010000 + 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000040000000100000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003800330033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003800330033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100360037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003700330038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003700330038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100340039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100340039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF23013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00340036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00390038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00390038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000100000002000000F900000049000000560500007F020000 diff --git a/IAR/test01.dep b/IAR/test01.dep index cff2f10..8db45ca 100644 --- a/IAR/test01.dep +++ b/IAR/test01.dep @@ -5,614 +5,614 @@ Debug - $PROJ_DIR$\Debug\Obj\fsl_str.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_gpio.o + $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\user\delay.c $PROJ_DIR$\..\user\delay.h - $PROJ_DIR$\Debug\Obj\serial_port_uart.o $PROJ_DIR$\..\drivers\fsl_adc16.h - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.h - $PROJ_DIR$\..\drivers\fsl_common.h $PROJ_DIR$\Debug\Obj\serial_manager.__cstat.et - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c - $PROJ_DIR$\..\utilities\generic_list.c - $PROJ_DIR$\Debug\Obj\serial_port_uart.xcl $PROJ_DIR$\Debug\Obj\main.xcl - $PROJ_DIR$\Debug\Obj\pin_Init.__cstat.et $PROJ_DIR$\Debug\Obj\fsl_uart.__cstat.et + $PROJ_DIR$\..\user\pit.c + $PROJ_DIR$\Debug\Obj\fsl_str.__cstat.et + $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\Debug\Obj\serial_port_uart.o + $PROJ_DIR$\..\drivers\fsl_uart.c + $PROJ_DIR$\..\drivers\fsl_common.h + $PROJ_DIR$\..\user\pin_Init.c + $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\Debug\Obj\pin_Init.__cstat.et $PROJ_DIR$\Debug\Obj\main.o $PROJ_DIR$\Debug\Obj\adc_Interrupt.xcl - $PROJ_DIR$\Debug\Obj\system_MKV56F24.o - $PROJ_DIR$\..\utilities\serial_port_uart.c - $PROJ_DIR$\Debug\Obj\pin_Init.xcl - $PROJ_DIR$\Debug\Obj\fsl_assert.xcl - $PROJ_DIR$\Debug\Obj\delay.o - $PROJ_DIR$\Debug\Obj\fsl_common.__cstat.et - $TOOLKIT_DIR$\inc\c\iccarm_builtin.h - $PROJ_DIR$\Debug\List\test01.map - $TOOLKIT_DIR$\lib\rt7M_tl.a - $PROJ_DIR$\..\drivers\fsl_uart.h - $TOOLKIT_DIR$\inc\c\stdint.h - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $PROJ_DIR$\..\drivers\fsl_clock.h - $PROJ_DIR$\..\utilities\fsl_assert.c - $TOOLKIT_DIR$\inc\c\stdbool.h - $PROJ_DIR$\Debug\Obj\fsl_common.o $PROJ_DIR$\..\drivers\fsl_port.h - $PROJ_DIR$\..\utilities\serial_port_uart.h + $PROJ_DIR$\..\startup\startup_MKV56F24.s + $PROJ_DIR$\..\startup\MKV56F24.h + $PROJ_DIR$\..\user\uart_Interrupt.h + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.h + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + $PROJ_DIR$\Debug\Obj\serial_port_uart.xcl $PROJ_DIR$\..\drivers\fsl_common.c - $PROJ_DIR$\..\drivers\fsl_pit.c $PROJ_DIR$\..\startup\system_MKV56F24.c - $PROJ_DIR$\Debug\Obj\adc_Interrupt.o - $PROJ_DIR$\Debug\Obj\uart_Interrupt.o - $PROJ_DIR$\..\user\uart_Interrupt.h - $PROJ_DIR$\..\startup\fsl_device_registers.h - $PROJ_DIR$\Debug\Obj\generic_list.__cstat.et - $PROJ_DIR$\..\user\pin_Init.c - $PROJ_DIR$\Debug\Obj\startup_MKV56F24.o - $PROJ_DIR$\Debug\Obj\fsl_clock.o - $PROJ_DIR$\..\utilities\str\fsl_str.c - $PROJ_DIR$\..\user\delay.c - $PROJ_DIR$\Debug\Obj\fsl_debug_console.o - $PROJ_DIR$\..\Include\cmsis_compiler.h - $PROJ_DIR$\..\user\adc_Interrupt.c - $PROJ_DIR$\..\drivers\fsl_uart.c - $PROJ_DIR$\..\startup\MKV56F24.h - $PROJ_DIR$\..\startup\startup_MKV56F24.s - $PROJ_DIR$\..\user\pit.c + $PROJ_DIR$\..\user\main.c $PROJ_DIR$\..\user\pit.h + $PROJ_DIR$\Debug\Obj\fsl_gpio.o $PROJ_DIR$\..\drivers\fsl_gpio.c - $PROJ_DIR$\..\user\uart_Interrupt.c - $PROJ_DIR$\..\Include\cmsis_version.h - $PROJ_DIR$\Debug\Obj\uart_adapter.xcl - $PROJ_DIR$\Debug\Obj\serial_port_uart.__cstat.et - $PROJ_DIR$\..\drivers\fsl_pit.h - $PROJ_DIR$\..\user\main.c - $PROJ_DIR$\Debug\Obj\delay.xcl - $PROJ_DIR$\..\drivers\fsl_clock.c + $PROJ_DIR$\..\drivers\fsl_pit.c $PROJ_DIR$\..\drivers\fsl_adc16.c - $PROJ_DIR$\Debug\Obj\fsl_uart.xcl + $PROJ_DIR$\..\drivers\fsl_clock.c $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $PROJ_DIR$\Debug\Obj\fsl_adc16.xcl + $TOOLKIT_DIR$\inc\c\assert.h + $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\Debug\Obj\generic_list.xcl + $PROJ_DIR$\Debug\Obj\fsl_clock.xcl + $PROJ_DIR$\Debug\Obj\fsl_clock.__cstat.et + $TOOLKIT_DIR$\inc\c\yvals.h $PROJ_DIR$\Debug\Obj\fsl_adc16.o - $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h - $PROJ_DIR$\Debug\Obj\fsl_str.xcl - $PROJ_DIR$\..\utilities\generic_list.h $TOOLKIT_DIR$\lib\m7M_tls.a - $PROJ_DIR$\..\user\adc_Interrupt.h - $TOOLKIT_DIR$\inc\c\stdlib.h - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $PROJ_DIR$\Debug\Obj\serial_manager.o $PROJ_DIR$\..\drivers\fsl_gpio.h - $PROJ_DIR$\Debug\Obj\generic_list.xcl - $PROJ_DIR$\..\utilities\serial_manager.h - $PROJ_DIR$\..\startup\system_MKV56F24.h - $PROJ_DIR$\Debug\Obj\system_MKV56F24.__cstat.et - $TOOLKIT_DIR$\inc\c\DLib_float_setup.h - $PROJ_DIR$\Debug\Obj\fsl_clock.xcl + $PROJ_DIR$\..\user\adc_Interrupt.h $PROJ_DIR$\Debug\Obj\fsl_assert.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_clock.__cstat.et - $TOOLKIT_DIR$\inc\c\assert.h - $PROJ_DIR$\..\utilities\serial_port_internal.h $PROJ_DIR$\Debug\Obj\generic_list.o - $PROJ_DIR$\Debug\Exe\test01.out - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console_conf.h - $TOOLKIT_DIR$\inc\c\yvals.h $PROJ_DIR$\..\Include\mpu_armv7.h + $PROJ_DIR$\Debug\Obj\system_MKV56F24.__cstat.et $PROJ_DIR$\Debug\Obj\uart_adapter.o + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $TOOLKIT_DIR$\inc\c\stdlib.h + $PROJ_DIR$\..\utilities\serial_port_internal.h + $PROJ_DIR$\Debug\Obj\fsl_str.xcl + $PROJ_DIR$\..\utilities\generic_list.h + $TOOLKIT_DIR$\inc\c\DLib_float_setup.h $TOOLKIT_DIR$\lib\shb_l.a $PROJ_DIR$\Debug\Obj\main.__cstat.et + $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h + $PROJ_DIR$\Debug\Obj\serial_manager.o + $PROJ_DIR$\..\startup\system_MKV56F24.h + $PROJ_DIR$\Debug\Obj\fsl_adc16.xcl + $PROJ_DIR$\..\utilities\serial_manager.h + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console_conf.h + $PROJ_DIR$\Debug\Obj\fsl_uart.xcl + $PROJ_DIR$\Debug\Obj\fsl_pit.o $PROJ_DIR$\Debug\Obj\test01.pbd + $PROJ_DIR$\Debug\Obj\serial_manager.xcl + $PROJ_DIR$\..\utilities\serial_manager.c + $PROJ_DIR$\Debug\Obj\pit.xcl + $PROJ_DIR$\..\Include\core_cm7.h $PROJ_DIR$\..\user\pin_Init.h - $TOOLKIT_DIR$\lib\dl7M_tln.a - $PROJ_DIR$\Debug\Obj\system_MKV56F24.xcl - $PROJ_DIR$\Debug\Obj\delay.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_str.o $PROJ_DIR$\Debug\Obj\uart_Interrupt.xcl - $TOOLKIT_DIR$\inc\c\stddef.h - $TOOLKIT_DIR$\inc\c\string.h - $PROJ_DIR$\Debug\Obj\fsl_uart.o - $PROJ_DIR$\Debug\Obj\serial_manager.xcl $PROJ_DIR$\Debug\Obj\pin_Init.o - $PROJ_DIR$\..\utilities\serial_manager.c - $PROJ_DIR$\Debug\Obj\fsl_debug_console.__cstat.et + $PROJ_DIR$\..\utilities\uart.h + $PROJ_DIR$\Debug\Obj\fsl_common.xcl $PROJ_DIR$\Debug\Obj\fsl_debug_console.xcl + $PROJ_DIR$\Debug\Obj\fsl_debug_console.__cstat.et + $PROJ_DIR$\..\Include\cmsis_iccarm.h + $PROJ_DIR$\Debug\Obj\uart_adapter.__cstat.et + $PROJ_DIR$\..\utilities\uart_adapter.c + $PROJ_DIR$\Debug\Obj\fsl_str.o $PROJ_DIR$\..\utilities\str\fsl_str.h - $TOOLKIT_DIR$\inc\c\ycheck.h - $PROJ_DIR$\Debug\Obj\fsl_gpio.xcl - $PROJ_DIR$\Debug\Obj\fsl_common.xcl - $PROJ_DIR$\..\utilities\uart.h + $TOOLKIT_DIR$\lib\dl7M_tln.a + $TOOLKIT_DIR$\inc\c\stddef.h $PROJ_DIR$\Debug\Obj\uart_Interrupt.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_pit.o - $PROJ_DIR$\Debug\Obj\pit.xcl - $PROJ_DIR$\..\Include\core_cm7.h - $PROJ_DIR$\..\Include\cmsis_iccarm.h $TOOLKIT_DIR$\config\linker\NXP\MKV5xF512xxx24.icf - $PROJ_DIR$\Debug\Obj\uart_adapter.__cstat.et - $TOOLKIT_DIR$\inc\c\stdarg.h $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $PROJ_DIR$\..\utilities\uart_adapter.c + $TOOLKIT_DIR$\inc\c\string.h + $TOOLKIT_DIR$\inc\c\stdarg.h $TOOLKIT_DIR$\inc\c\ysizet.h - $PROJ_DIR$\Debug\Obj\fsl_pit.xcl - $TOOLKIT_DIR$\inc\c\math.h + $PROJ_DIR$\Debug\Obj\delay.__cstat.et + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\Debug\Obj\system_MKV56F24.xcl + $PROJ_DIR$\Debug\Obj\fsl_gpio.xcl + $PROJ_DIR$\Debug\Obj\fsl_uart.o + $PROJ_DIR$\Debug\Obj\fsl_assert.o $PROJ_DIR$\Debug\Obj\pit.o - $PROJ_DIR$\Debug\Obj\fsl_gpio.__cstat.et $PROJ_DIR$\..\startup\MKV56F24_features.h - $PROJ_DIR$\Debug\Obj\fsl_assert.o + $PROJ_DIR$\Debug\Obj\fsl_gpio.__cstat.et + $TOOLKIT_DIR$\inc\c\math.h + $PROJ_DIR$\Debug\Obj\fsl_pit.xcl + $PROJ_DIR$\Debug\Obj\fsl_assert.xcl + $PROJ_DIR$\..\drivers\fsl_uart.h + $PROJ_DIR$\Debug\Obj\adc_Interrupt.o + $PROJ_DIR$\Debug\Obj\system_MKV56F24.o + $TOOLKIT_DIR$\lib\rt7M_tl.a + $PROJ_DIR$\Debug\Obj\uart_Interrupt.o + $PROJ_DIR$\..\utilities\serial_port_uart.h + $TOOLKIT_DIR$\inc\c\stdbool.h + $PROJ_DIR$\Debug\List\test01.map + $PROJ_DIR$\Debug\Obj\fsl_common.o + $PROJ_DIR$\..\utilities\serial_port_uart.c + $TOOLKIT_DIR$\inc\c\stdint.h + $PROJ_DIR$\Debug\Obj\generic_list.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_clock.o + $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\Debug\Obj\fsl_debug_console.o + $PROJ_DIR$\..\drivers\fsl_clock.h + $PROJ_DIR$\..\utilities\fsl_assert.c + $PROJ_DIR$\Debug\Obj\fsl_common.__cstat.et + $PROJ_DIR$\Debug\Obj\delay.o + $PROJ_DIR$\..\startup\fsl_device_registers.h + $PROJ_DIR$\Debug\Obj\startup_MKV56F24.o + $PROJ_DIR$\..\Include\cmsis_compiler.h + $PROJ_DIR$\Debug\Obj\uart_adapter.xcl + $PROJ_DIR$\Debug\Obj\serial_port_uart.__cstat.et + $PROJ_DIR$\..\drivers\fsl_pit.h + $PROJ_DIR$\Debug\Obj\delay.xcl + $PROJ_DIR$\..\Include\cmsis_version.h + $TOOLKIT_DIR$\inc\c\iccarm_builtin.h + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\Debug\Obj\pin_Init.xcl [ROOT_NODE] ILINK - 23 89 + 36 110 - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + $PROJ_DIR$\..\user\adc_Interrupt.c ICCARM - 47 - - - __cstat - 109 + 104 BICOMP - 110 + 17 ICCARM - 123 74 112 91 75 124 27 126 69 90 6 86 30 26 104 66 103 40 51 119 57 48 120 22 92 80 131 28 111 79 33 115 5 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 18 43 44 3 - $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\..\user\delay.c ICCARM - 88 + 121 - __cstat - 41 + BICOMP + 128 - BICOMP - 78 + __cstat + 91 ICCARM - 71 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 2 - $PROJ_DIR$\..\utilities\serial_port_uart.c + $PROJ_DIR$\..\user\pit.c ICCARM - 3 - - - __cstat - 59 + 97 BICOMP - 10 + 69 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 79 33 115 87 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 127 43 21 28 - $PROJ_DIR$\..\utilities\fsl_assert.c + $PROJ_DIR$\..\user\uart_Interrupt.c ICCARM - 132 + 107 - __cstat - 84 + BICOMP + 72 - BICOMP - 19 + __cstat + 85 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 5 79 33 115 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 21 103 71 43 127 28 44 - $PROJ_DIR$\..\drivers\fsl_common.c + $PROJ_DIR$\..\drivers\fsl_uart.c ICCARM - 31 + 95 - __cstat - 21 + BICOMP + 64 - BICOMP - 114 + __cstat + 6 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 103 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\drivers\fsl_pit.c + $PROJ_DIR$\..\user\pin_Init.c ICCARM - 117 + 73 BICOMP - 127 + 132 + + + __cstat + 15 ICCARM - 60 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 18 43 71 103 - $PROJ_DIR$\..\startup\system_MKV56F24.c + $PROJ_DIR$\..\utilities\generic_list.c ICCARM - 16 + 46 - __cstat - 81 + BICOMP + 37 - BICOMP - 99 + __cstat + 114 ICCARM - 26 112 91 75 124 27 40 51 119 57 48 120 22 92 80 131 + 54 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\user\pin_Init.c + $PROJ_DIR$\..\startup\startup_MKV56F24.s - ICCARM - 107 + AARM + 123 + + + + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + - __cstat - 12 + ICCARM + 117 BICOMP - 18 + 76 + + + __cstat + 77 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 32 77 97 25 + 89 51 92 40 50 87 131 90 58 63 12 35 109 113 88 34 84 122 20 70 129 124 78 130 47 60 98 118 82 62 108 74 22 - $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\..\drivers\fsl_common.c ICCARM - 101 + 111 - __cstat - 0 + BICOMP + 75 - BICOMP - 70 + __cstat + 120 ICCARM - 128 112 91 75 124 27 82 123 74 126 69 111 6 86 30 26 104 66 103 40 51 119 57 48 120 22 92 80 131 28 90 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\user\delay.c + $PROJ_DIR$\..\startup\system_MKV56F24.c ICCARM - 20 + 105 - __cstat - 100 + BICOMP + 93 - BICOMP - 62 + __cstat + 48 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 2 + 113 92 40 50 87 131 122 20 70 129 124 78 130 47 60 98 - $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\user\main.c ICCARM - 37 + 16 BICOMP - 15 + 5 + + + __cstat + 57 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 32 77 73 4 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 43 71 28 2 21 44 103 - $PROJ_DIR$\..\drivers\fsl_uart.c + $PROJ_DIR$\..\drivers\fsl_gpio.c ICCARM - 105 + 29 - __cstat - 13 + BICOMP + 94 - BICOMP - 65 + __cstat + 99 ICCARM - 25 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 43 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\startup\startup_MKV56F24.s - - - AARM - 43 - - - - - $PROJ_DIR$\..\user\pit.c + $PROJ_DIR$\..\drivers\fsl_pit.c ICCARM - 129 + 65 BICOMP - 118 + 101 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 60 77 39 54 + 127 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\drivers\fsl_gpio.c + $PROJ_DIR$\..\drivers\fsl_adc16.c ICCARM - 1 - - - __cstat - 130 + 41 BICOMP - 113 + 61 ICCARM - 77 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 3 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 - $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\..\drivers\fsl_clock.c ICCARM - 38 + 115 - __cstat - 116 + BICOMP + 38 - BICOMP - 102 + __cstat + 39 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 39 25 97 77 60 54 73 + 118 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 - $PROJ_DIR$\..\user\main.c + $PROJ_DIR$\Debug\Exe\test01.out - ICCARM - 14 - - - __cstat - 95 - - - BICOMP - 11 + ILINK + 110 - ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 77 97 54 2 39 73 25 + ILINK + 86 104 121 41 115 111 29 65 95 16 73 97 123 105 107 56 106 42 83 - $PROJ_DIR$\..\drivers\fsl_clock.c + $PROJ_DIR$\..\utilities\serial_manager.c ICCARM - 44 + 59 - __cstat - 85 + BICOMP + 67 - BICOMP - 83 + __cstat + 4 ICCARM - 28 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 62 108 74 52 - $PROJ_DIR$\..\drivers\fsl_adc16.c + $PROJ_DIR$\..\utilities\uart_adapter.c ICCARM - 68 + 49 BICOMP - 67 + 125 + + + __cstat + 79 ICCARM - 4 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 103 74 - $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\utilities\serial_port_uart.c - ILINK - 23 + ICCARM + 10 + + + BICOMP + 24 + + + __cstat + 126 - ILINK - 121 37 20 68 44 31 1 117 105 14 107 129 43 16 38 94 24 72 98 + ICCARM + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 62 108 74 52 - $PROJ_DIR$\..\utilities\serial_manager.c + $PROJ_DIR$\..\utilities\str\fsl_str.c ICCARM - 76 + 81 - __cstat - 7 + BICOMP + 53 - BICOMP - 106 + __cstat + 8 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 79 33 115 87 + 100 92 40 50 87 131 55 89 51 90 58 82 12 35 109 113 88 34 84 122 20 70 129 124 78 130 47 60 98 118 63 - $PROJ_DIR$\..\utilities\uart_adapter.c + $PROJ_DIR$\..\utilities\fsl_assert.c ICCARM - 93 + 96 - __cstat - 122 + BICOMP + 102 - BICOMP - 58 + __cstat + 45 ICCARM - 6 86 112 91 75 124 27 30 26 104 126 66 74 69 103 40 51 119 57 48 120 22 92 80 131 28 25 115 + 12 35 92 40 50 87 131 109 113 88 90 34 51 58 84 122 20 70 129 124 78 130 47 60 98 118 22 62 108 74 diff --git a/user/adc_Interrupt.c b/user/adc_Interrupt.c index 7152bc6..fdc42d3 100644 --- a/user/adc_Interrupt.c +++ b/user/adc_Interrupt.c @@ -5,9 +5,8 @@ #include "adc_Interrupt.h" #include "fsl_adc16.h" - -uint32_t g_Adc12ConversionValue = 0; -uint32_t g_Adc12_Value = 0; +uint32_t g_Adc12ConversionValue = 0; //ADC寄存器数值 +uint32_t g_Adc12_Value = 0; //返回转换后的电压值，数值为0-3040 uint32_t g_Adc12Count = 0; /*****************ADC初始化************************* @@ -40,16 +39,14 @@ void ADC12_InterrputInit() //ADC uint32_t adc_ReturnValue() { g_Adc12_Value = g_Adc12ConversionValue * 3040/ g_Adc12_12bitFullRange; - return g_Adc12_Value; //放大1000倍 + return g_Adc12_Value; //电压值放大1000倍 } void ADC0_IRQHandler(void) { - - /* Read conversion result to clear the conversion completed flag. */ - g_Adc12ConversionValue = ADC16_GetChannelConversionValue(ADC0, 0u); + g_Adc12ConversionValue = ADC16_GetChannelConversionValue(ADC0, 0u); //读取ADC寄存器数值 g_Adc12Count++; g_Adc12Count %= 1000; - SDK_ISR_EXIT_BARRIER; + SDK_ISR_EXIT_BARRIER; //清除中断标志位 } diff --git a/user/main.c b/user/main.c index 0df0412..26c5d4e 100644 --- a/user/main.c +++ b/user/main.c @@ -10,18 +10,21 @@ #include "system_MKV56F24.h" /********************************************* -PTA15——LED灯闪烁 +功能： +1、UART1读取编码器位置，并转换为弧度0-360° +2、ADC采集电压并转换为0-3V +3、UART2发送编码器位置与电压值到上位机 +描述： +1、UART1间隔50ms发送一帧数据到编码器 +2、电压值大于2.00V绿色指示灯点亮 +3、SI输入端子触发ADC开始采集电压 +4、与编码器通信成功后，UART2间隔1秒发送一次数据 **********************************************/ void main() { - MCG->C4 = 0x40; - SystemCoreClockUpdate (); - // NVIC_SetPriorityGrouping(3u); //设置优先级分组3 - // NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(3u, 3, 2)); //抢占优先级3，子优先级2 - // NVIC_SetPriority(UART1_RX_TX_IRQn, NVIC_EncodePriority(3u, 1, 2)); //抢占优先级1，子优先级2 - //NVIC_SetPriority(UART2_RX_TX_IRQn, NVIC_EncodePriority(3u, 2, 1)); //抢占优先级1，子优先级2 - //NVIC_SetPriority(ADC0_IRQn, NVIC_EncodePriority(3u, 2, 2)); //抢占优先级1，子优先级2 + MCG->C4 = 0x40; //FEI时钟模式配置为60-75MHz + SystemCoreClockUpdate ();//更新系统时钟 Delay_Init(); //延时函数初始化 pin_Init(); //GPIO初始化 UART1_InterrputInit(); //UART1初始化 @@ -29,20 +32,12 @@ void main() ADC12_InterrputInit(); //ADC初始化 Pit_MyInit(); //PIT定时器初始化 while (1) - { - // GPIO_PinWrite(GPIOA, 15, 0); - // Delay_ms(100U); - // GPIO_PinWrite(GPIOA, 15, 1); - // Delay_ms(100U); - // UART1_sendData(); - RS485_Recieve_Data(); - ADC16_Recieve_Data(); - UART2_sendData(); - Delay_ms(1000U); - - + { + RS485_Recieve_Data(); //485接收数据 + ADC16_Recieve_Data(); //刷新电压数据 + UART2_sendData(); //UART2发送数据 + Delay_ms(1000U); //延时1秒 } - } diff --git a/user/pin_Init.c b/user/pin_Init.c index 63d6c08..ff7433f 100644 --- a/user/pin_Init.c +++ b/user/pin_Init.c @@ -5,10 +5,11 @@ #include "pin_Init.h" #include "fsl_uart.h" -/*****************PTA15初始化*************************/ +/*****************引脚初始化*************************/ void pin_Init() { - CLOCK_EnableClock(kCLOCK_PortA); //开启PORT时钟 + /*ADC指示灯*/ + CLOCK_EnableClock(kCLOCK_PortA); //开启PORTA时钟 port_pin_config_t GPIO_Port_Init = { kPORT_PullUp , //上拉 @@ -19,25 +20,35 @@ void pin_Init() kPORT_MuxAsGpio, //普通GPIO模式 kPORT_UnlockRegister, // }; - PORT_SetPinConfig(PORTA, 15U, &GPIO_Port_Init); //设置引脚复用方式 + PORT_SetPinConfig(PORTA, 15U, &GPIO_Port_Init); //设置PTA15引脚复用方式 + PORT_SetPinConfig(PORTA, 16U, &GPIO_Port_Init); //设置PTA16引脚复用方式 gpio_pin_config_t config = { kGPIO_DigitalOutput, //输出模式 0, }; GPIO_PinInit(GPIOA, 15U, &config); //初始化PTA15 + GPIO_PinInit(GPIOA, 16U, &config); //初始化PTA16 GPIO_PinWrite(GPIOA, 15, 1); //PTA15写1 /*编码器方向PTE3*/ CLOCK_EnableClock(kCLOCK_PortE); //开启PORT时钟 PORT_SetPinConfig(PORTE, 3U, &GPIO_Port_Init); //设置引脚复用方式 - GPIO_PinInit(GPIOE, 3U, &config); //初始化PTA15 + GPIO_PinInit(GPIOE, 3U, &config); //初始化PTE3 + + /*ADC采集电压控制PTD4*/ + CLOCK_EnableClock(kCLOCK_PortD); //开启PORT时钟 + PORT_SetPinConfig(PORTD, 4U, &GPIO_Port_Init); //设置引脚复用方式 + gpio_pin_config_t config1 = + { + kGPIO_DigitalInput, //输入模式 + }; + GPIO_PinInit(GPIOD, 4U, &config1); //初始化PTD4 } /*****************UART1引脚初始化*************************/ void UART1_InitPins(void) { - // CLOCK_EnableClock(kCLOCK_PortE); //开启PORT时钟 PORT_SetPinMux(PORTE, 0U, kPORT_MuxAlt3); //PTE0配置为UART1_TX PORT_SetPinMux(PORTE, 1U, kPORT_MuxAlt3); //PTE1配置为UART1_RX SIM->SOPT5 = ((SIM->SOPT5 & @@ -50,14 +61,8 @@ void UART1_InitPins(void) /*****************UART2引脚初始化*************************/ void UART2_InitPins(void) { - // CLOCK_EnableClock(kCLOCK_PortE); //开启PORT时钟 PORT_SetPinMux(PORTE, 16U, kPORT_MuxAlt3); //PTE16配置为UART2_TX PORT_SetPinMux(PORTE, 17U, kPORT_MuxAlt3); //PTE17配置为UART2_RX -// SIM->SOPT5 = ((SIM->SOPT5 & -// /* UART1收发数据源选择*/ -// (~(SIM_SOPT5_UART1TXSRC_MASK | SIM_SOPT5_UART1RXSRC_MASK))) -// | SIM_SOPT5_UART1TXSRC(SOPT5_UART1TXSRC_UART_TX) -// | SIM_SOPT5_UART1RXSRC(SOPT5_UART1RXSRC_UART_RX)); } diff --git a/user/uart_Interrupt.c b/user/uart_Interrupt.c index ce149ed..c9abc7d 100644 --- a/user/uart_Interrupt.c +++ b/user/uart_Interrupt.c @@ -21,6 +21,7 @@ uint8_t g_tipString2[] = "\t uint32_t BMQ_Location_Num; //编码器位置 uint8_t UART2_Buf_Arr[DEMO_UART2_ARR_SIZE]; //RS485缓存数据数组 uint32_t adc_GetValue = 0; //接收母线直流电压值 +uint32_t flag1; //ADC采集标志位 /*****************UART1初始化*************************/ void UART1_InterrputInit() { @@ -101,10 +102,6 @@ void UART2_RX_TX_IRQHandler(void) /**************发送一帧数据*************/ void UART1_sendData() { -// if (UART2_SendData_OK == 1) -// { -// return; -// } UART2_SendData_OK ++; UART2_SendData_OK %= 100; GPIO_PinWrite(GPIOE, 3, 1); //PTE3写 @@ -140,11 +137,6 @@ void UART2_sendData() /***************RS485接收数据*********************/ void RS485_Recieve_Data() { -// for (uint8_t i = 0; i < UART1rxIndex; i++ ) -// { -// RS485_Buf_Arr[i] = demoRingBuffer[i]; -// } - // BMQ_Location_Num = (RS485_Buf_Arr[4] << 16) + (RS485_Buf_Arr[3] << 8) + (RS485_Buf_Arr[2]); if (demoRingBuffer[0] != 0x1A) { return; @@ -161,18 +153,40 @@ void RS485_Recieve_Data() /*************刷新电压数据******************/ void ADC16_Recieve_Data() { - adc_GetValue = adc_ReturnValue(); + if (flag1 != 1) + { + adc_GetValue = adc_ReturnValue(); + } UART2_Buf_Arr[5] = (adc_GetValue % 10000 / 1000) + '0'; UART2_Buf_Arr[6] = '.'; UART2_Buf_Arr[7] = (adc_GetValue % 1000 / 100) + '0'; UART2_Buf_Arr[8] = (adc_GetValue % 100 / 10) + '0'; + if (adc_GetValue >= 2000) + { + GPIO_PinWrite(GPIOA, 16, 0); + } + else + { + GPIO_PinWrite(GPIOA, 16, 1); + } } +/*************定时器中断服务函数******************/ void PIT0_IRQHandler() { PIT_ClearStatusFlags(PIT, DEMO_PIT_CHANNEL, kPIT_TimerFlag); //清除中断标志 UART1_sendData(); //UART1发送 UART1rxIndex = 0; - //GPIO_PortToggle(GPIOA, 1 << 15); - + flag1 = GPIO_PinRead(GPIOD, 4); + if (flag1 == 1) + { + GPIO_PinWrite(GPIOA, 15, 1); //ADC采集指示灯关闭 + DisableIRQ(ADC0_IRQn); //关闭ADC中断 + adc_GetValue = 0; //电压数据置0 + } + else + { + GPIO_PinWrite(GPIOA, 15, 0); //ADC采集指示灯开启 + EnableIRQ(ADC0_IRQn); //开启ADC中断 + } }