diff --git a/IAR/settings/test01.dbgdt b/IAR/settings/test01.dbgdt index 274a574..6abe96b 100644 --- a/IAR/settings/test01.dbgdt +++ b/IAR/settings/test01.dbgdt @@ -156,11 +156,11 @@ 1 1 1 - 880300001E00138600001A000000108600009800000020810000020000005F860000010000000F810000020000001D810000010000000C810000330000000486000003000000178100000100000056860000640100005584000001000000838600000200000000810000010000005E860000070000000E810000340000001F8100000500000009860000010000008E860000040000000B8100000100000069860000010000001486000026000000028400000100000027810000020000001186000050000000058100000200000046810000800000001084000005000000608600000300000008860000020000005D86000001000000 + 8E0300001E00138600001A000000108600009B00000020810000020000005F860000010000000F810000020000001D810000010000000C810000330000000486000003000000178100000100000056860000640100005584000001000000838600000200000000810000010000005E860000070000000E810000340000001F8100000500000009860000010000008E860000040000000B8100000100000069860000010000001486000026000000028400000100000027810000020000001186000050000000058100000200000046810000830000001084000005000000608600000300000008860000020000005D86000001000000 19000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000838600005886000004DC00007784000007840000808C000044D500007486000000DC000001DC000002DC000003DC00002AE10000008200001C8200000182000067860000 - 4F001386000031000000048400007E000000578600001C000000768600003B000000108600002F00000015810000560000002CE1000074000000848600003C0000003184000085000000239200000000000007E100006C000000208100005D0000000F810000550000000A8600002D00000004E100006A0000005F860000650000000C81000052000000078600002A0000000D8000004800000001E100006700000023E100006E0000000684000080000000048600002700000019820000460000005686000035000000038400007D0000009A8600001A00000017810000580000004A810000780000001682000044000000008400007A00000014810000550000002BE10000730000000E840000820000003084000084000000008100004A0000005E860000370000001F8100005C0000000E81000054000000098600002C0000001A8600003400000003E100006900000025E10000700000002F820000470000008E8600003D0000000B81000051000000068600002900000000E100006600000022E100006D0000001486000032000000D184000020000000058400007F000000698600003A00000041E100007600000018820000450000001186000030000000028400007C0000005586000008000000168100005700000049810000770000004681000064000000108400008300000032840000860000000E8600001B00000060860000390000000B8600002E000000518400008700000005E100006B0000005D860000360000000A84000081000000088600002B000000C386000004000000A18600003E0000000D8100005300000002E10000680000001686000033000000C08600000E00000037870000030000000586000028000000 + 4F00578600001C000000048400007E00000013860000310000002CE10000740000001581000056000000108600002F000000768600003B00000007E100006C00000023920000000000003184000085000000848600003C0000005F8600006500000004E100006A0000000A8600002D0000000F81000055000000208100005D00000023E100006E00000001E10000670000000D80000048000000078600002A0000000C8100005200000019820000460000000486000027000000068400008000000016820000440000004A8100007800000017810000580000009A8600001A000000038400007D00000056860000350000002BE10000730000001481000055000000008400007A000000008100004A00000030840000840000000E840000820000002F8200004700000025E100007000000003E10000690000001A86000034000000098600002C0000000E810000540000001F8100005C0000005E8600003700000022E100006D00000000E100006600000006860000290000000B810000510000008E8600003D000000188200004500000041E1000076000000698600003A000000058400007F000000D1840000200000001486000032000000498100007700000016810000570000005586000008000000028400007C00000011860000300000000E8600001B00000032840000860000001084000083000000468100006400000005E100006B00000051840000870000000B8600002E000000608600003900000002E10000680000000D81000053000000A18600003E000000C386000004000000088600002B0000000A840000810000005D8600003600000005860000280000003787000003000000C08600000E0000001686000033000000 0 @@ -1142,7 +1142,7 @@ Debug - 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000000035000000FFFEFF0000000000000000000000000001000000010000000180138600000000000031000000FFFEFF00000000000000000000000000010000000100000001805E8600000000000037000000FFFEFF0000000000000000000000000001000000010000000180608600000000000039000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040036000000FFFEFF000000000000000000000000000100000001000000018010860000000000002F000000FFFEFF0000000000000000000000000001000000010000000180118600000000040030000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000000032000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000020009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 + 00200000010000000800FFFF01001100434D4643546F6F6C426172427574746F6E568600000000040035000000FFFEFF0000000000000000000000000001000000010000000180138600000000040031000000FFFEFF00000000000000000000000000010000000100000001805E8600000000040037000000FFFEFF0000000000000000000000000001000000010000000180608600000000040039000000FFFEFF00000000000000000000000000010000000100000001805D8600000000040036000000FFFEFF000000000000000000000000000100000001000000018010860000000004002F000000FFFEFF0000000000000000000000000001000000010000000180118600000000000030000000FFFEFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E148600000000040032000000FFFEFF205200650073006500740020007400680065002000640065006200750067006700650064002000700072006F006700720061006D000A00520065007300650074000000000000000000000000000100000001000000000000000000000001000000020009800000000000000400FFFFFFFFFFFEFF000000000000000000000000000100000001000000000000000000000001000000000009801986000000000000FFFFFFFFFFFEFF000100000000000000000000000100000001000000000000000000000001000000000000000000FFFEFF0544006500620075006700C6000000 34049 @@ -1176,7 +1176,7 @@ Main - 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000000006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000000070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000000073000000FFFEFF000000000000000000000000000100000001000000018002810000000000004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000000062000000FFFEFF0000000000000000000000000001000000010000000180278100000000000060000000FFFEFF0000000000000000000000000001000000010000000180288100000000000061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000000064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000000006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000000070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000000073000000FFFEFF000000000000000000000000000100000001000000018002810000000000004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000000062000000FFFEFF0000000000000000000000000001000000010000000180278100000000000060000000FFFEFF0000000000000000000000000001000000010000000180288100000000000061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 34051 diff --git a/IAR/settings/test01.dnx b/IAR/settings/test01.dnx index de2e9ec..ab67d70 100644 --- a/IAR/settings/test01.dnx +++ b/IAR/settings/test01.dnx @@ -35,7 +35,7 @@ _ 0 - 2402771450 + 2269743658 _ 0 diff --git a/IAR/settings/test01.wsdt b/IAR/settings/test01.wsdt index 8ce84f0..cb51330 100644 --- a/IAR/settings/test01.wsdt +++ b/IAR/settings/test01.wsdt @@ -95,11 +95,11 @@ 1 1 1 - 550200001E001386000002000000108600000200000020810000010000005F860000010000000F810000030000001D810000010000000C8100004501000004860000010000001781000001000000568600000C0000005584000001000000838600000200000000810000010000005E860000010000000E810000F30000001F8100000100000009860000010000008E860000010000000B810000030000006986000001000000148600000400000002840000010000002781000002000000118600000300000005810000020000004681000001000000108400000E000000608600000300000008860000010000005D86000001000000 + 840200001E001386000002000000108600000200000020810000010000005F860000010000000F810000030000001D810000010000000C8100005E01000004860000010000001781000001000000568600000C0000005584000001000000838600000200000000810000010000005E860000010000000E810000090100001F8100000100000009860000010000008E860000010000000B810000030000006986000001000000148600000400000002840000010000002781000002000000118600000300000005810000020000004681000001000000108400000E000000608600000300000008860000010000005D86000001000000 - 20007784000007840000FFFFFFFF808C00000D8400000F8400000884000054840000328100001C81000009840000538400000C84000033840000788400001184000044D500000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F00000E84000030840000 - 1600048400004C000000048100001800000031840000530000002392000000000000208100002B0000000F810000230000000C81000020000000068400004E000000038400004B00000000840000480000001F8100002A0000000E8100002200000022E10000380000000B8100001B000000058400004D000000D18400000C000000028400004A0000000581000019000000108400005100000032840000540000000A8400004F0000000D8100001D000000 + 1E007784000007840000FFFFFFFF808C00000D8400000F8400000884000054840000328100001C81000009840000538400000C84000033840000788400001184000044D500000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F0000 + 1800048400004C0000000481000018000000239200000000000031840000530000000F81000023000000208100002B0000000C81000020000000068400004E000000038400004B000000008400004800000030840000520000000E840000500000000E810000220000001F8100002A0000000B8100001F00000022E1000038000000D18400000C000000058400004D0000000581000019000000028400004A000000328400005400000010840000510000000D810000210000000A8400004F000000 0 @@ -171,7 +171,7 @@ 67 810 2 - + 0 -1 @@ -221,7 +221,7 @@ 67 810 2 - + 0 -1 @@ -270,7 +270,7 @@ 34058 000000001700000022010000C8000000 - 000000004501000056050000F6010000 + 000000004301000056050000F4010000 32768 0 0 @@ -370,7 +370,7 @@ - 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFF17010000320000001B010000F4010000010000000200001004000000010000000BFFFFFFC10300000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000004101000056050000450100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF00000000F401000056050000F80100000100000001000010040000000100000001FEFFFF3200000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000000000000F02000056050000C502000000000000F801000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 + 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFF17010000320000001B010000F4010000010000000200001004000000010000000BFFFFFFC10300000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000003F01000056050000430100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF00000000F401000056050000F80100000100000001000010040000000100000001FEFFFF3200000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000000000000F02000056050000C502000000000000F801000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 CMSIS-Pack @@ -391,7 +391,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000040038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000004003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000004003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000400FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000004003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000040041000000FFFEFF000000000000000000000000000100000001000000018002810000000004001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000040030000000FFFEFF000000000000000000000000000100000001000000018027810000000004002E000000FFFEFF000000000000000000000000000100000001000000018028810000000004002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000004001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 34050 @@ -448,7 +448,7 @@ - 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000200000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300330033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300330033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF28013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003100300038003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003700360034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003700360034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003700390039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003700390039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003500350039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003500350039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0075006100720074002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00350032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0033003000390030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0033003100300036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A660073006C005F0075006100720074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0073007400610072007400750070005C004D004B005600350036004600320034002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003400340030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003400340030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A4D004B005600350036004600320034002E00680000000000FFFFFFFFFFFFFFFFFFFEFF182400570053005F0044004900520024005C002E002E005C0075007300650072005C00640065006C00610079002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300370035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300370035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF07640065006C00610079002E00630000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000001B01000049000000560500000B020000 + 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000000000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300370030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300370030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600370037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600390035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003000320033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003000320033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003500360037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003500360037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400360035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0070006F00720074002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400340036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A660073006C005F0070006F00720074002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000001B01000049000000560500000B020000 diff --git a/IAR/test01.dep b/IAR/test01.dep index ce825a7..a51c965 100644 --- a/IAR/test01.dep +++ b/IAR/test01.dep @@ -1,249 +1,257 @@ 4 - 1415475508 + 14492896 Debug - $PROJ_DIR$\..\drivers\fsl_common.c - $PROJ_DIR$\..\drivers\fsl_uart.c - $PROJ_DIR$\..\drivers\fsl_port.h - $PROJ_DIR$\..\drivers\fsl_gpio.c - $PROJ_DIR$\..\drivers\fsl_clock.c - $PROJ_DIR$\..\drivers\fsl_common.h - $PROJ_DIR$\Debug\List\test01.map - $TOOLKIT_DIR$\inc\c\string.h - $TOOLKIT_DIR$\lib\rt7M_tl.a - $PROJ_DIR$\Debug\Obj\fsl_str.xcl - $PROJ_DIR$\Debug\Obj\uart_Interrupt.__cstat.et - $PROJ_DIR$\..\user\delay.c - $PROJ_DIR$\Debug\Obj\startup_MKV56F24.o - $TOOLKIT_DIR$\inc\c\stdarg.h - $PROJ_DIR$\..\user\uart_Interrupt.h - $PROJ_DIR$\..\user\main.c - $PROJ_DIR$\Debug\Obj\fsl_clock.o - $TOOLKIT_DIR$\inc\c\stdbool.h - $TOOLKIT_DIR$\inc\c\math.h - $PROJ_DIR$\..\startup\system_MKV56F24.c - $PROJ_DIR$\..\startup\MKV56F24.h - $PROJ_DIR$\Debug\Obj\fsl_str.o - $PROJ_DIR$\Debug\Obj\delay.xcl + $PROJ_DIR$\Debug\Obj\main.xcl + $PROJ_DIR$\Debug\Obj\uart_adapter.__cstat.et + $PROJ_DIR$\..\Include\core_cm7.h + $PROJ_DIR$\..\utilities\serial_manager.h + $TOOLKIT_DIR$\lib\m7M_tls.a + $PROJ_DIR$\..\drivers\fsl_adc16.h + $TOOLKIT_DIR$\inc\c\assert.h + $PROJ_DIR$\..\utilities\serial_manager.c + $PROJ_DIR$\..\drivers\fsl_gpio.h + $PROJ_DIR$\..\startup\fsl_device_registers.h + $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\Debug\Obj\uart_Interrupt.o + $PROJ_DIR$\Debug\Obj\uart_adapter.o + $PROJ_DIR$\Debug\Obj\generic_list.__cstat.et + $PROJ_DIR$\Debug\Obj\uart_adapter.xcl + $PROJ_DIR$\Debug\Obj\system_MKV56F24.xcl + $TOOLKIT_DIR$\inc\c\DLib_float_setup.h + $PROJ_DIR$\Debug\Obj\fsl_debug_console.o + $TOOLKIT_DIR$\config\linker\NXP\MKV5xF512xxx24.icf + $PROJ_DIR$\..\Include\cmsis_iccarm.h + $PROJ_DIR$\Debug\Obj\pin_Init.o + $PROJ_DIR$\Debug\Obj\fsl_assert.xcl $PROJ_DIR$\Debug\Obj\system_MKV56F24.o - $PROJ_DIR$\..\user\pin_Init.c - $PROJ_DIR$\..\user\delay.h - $TOOLKIT_DIR$\inc\c\DLib_Defaults.h - $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\Debug\Obj\system_MKV56F24.__cstat.et + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console_conf.h + $PROJ_DIR$\Debug\Obj\fsl_common.__cstat.et + $PROJ_DIR$\..\utilities\serial_port_uart.h + $PROJ_DIR$\..\startup\system_MKV56F24.h + $PROJ_DIR$\Debug\Obj\pin_Init.__cstat.et + $PROJ_DIR$\Debug\Obj\delay.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_uart.o + $PROJ_DIR$\..\Include\cmsis_compiler.h + $PROJ_DIR$\..\utilities\str\fsl_str.h $PROJ_DIR$\Debug\Obj\fsl_debug_console.xcl - $PROJ_DIR$\Debug\Obj\fsl_uart.xcl - $PROJ_DIR$\Debug\Obj\fsl_uart.__cstat.et - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c - $PROJ_DIR$\..\Include\cmsis_version.h - $PROJ_DIR$\..\startup\startup_MKV56F24.s - $PROJ_DIR$\Debug\Obj\fsl_assert.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_gpio.xcl - $PROJ_DIR$\Debug\Obj\fsl_clock.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_assert.xcl + $PROJ_DIR$\Debug\List\test01.map $PROJ_DIR$\Debug\Obj\main.o - $PROJ_DIR$\..\utilities\str\fsl_str.h - $PROJ_DIR$\Debug\Obj\fsl_clock.xcl - $PROJ_DIR$\Debug\Obj\pin_Init.xcl - $TOOLKIT_DIR$\config\linker\NXP\MKV5xF512xxx24.icf + $PROJ_DIR$\Debug\Obj\fsl_common.o + $TOOLKIT_DIR$\inc\c\iccarm_builtin.h + $PROJ_DIR$\..\user\delay.h + $PROJ_DIR$\Debug\Obj\adc_Interrupt.o + $PROJ_DIR$\Debug\Obj\fsl_adc16.xcl + $PROJ_DIR$\Debug\Obj\uart_Interrupt.__cstat.et + $TOOLKIT_DIR$\inc\c\stdarg.h $PROJ_DIR$\Debug\Obj\fsl_str.__cstat.et + $PROJ_DIR$\..\drivers\fsl_common.h + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c $PROJ_DIR$\Debug\Obj\fsl_gpio.o - $PROJ_DIR$\..\drivers\fsl_clock.h - $TOOLKIT_DIR$\inc\c\ysizet.h - $PROJ_DIR$\..\Include\mpu_armv7.h - $PROJ_DIR$\Debug\Obj\fsl_common.o + $PROJ_DIR$\Debug\Obj\fsl_clock.xcl $PROJ_DIR$\Debug\Obj\test01.pbd - $PROJ_DIR$\Debug\Obj\fsl_assert.o - $PROJ_DIR$\Debug\Obj\fsl_common.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_gpio.__cstat.et - $TOOLKIT_DIR$\inc\c\stdlib.h - $PROJ_DIR$\Debug\Obj\pin_Init.o - $TOOLKIT_DIR$\inc\c\DLib_float_setup.h - $TOOLKIT_DIR$\lib\dl7M_tln.a - $PROJ_DIR$\..\drivers\fsl_gpio.h - $TOOLKIT_DIR$\lib\m7M_tls.a - $PROJ_DIR$\Debug\Obj\uart_Interrupt.o - $TOOLKIT_DIR$\inc\c\DLib_Product.h - $TOOLKIT_DIR$\inc\c\iccarm_builtin.h - $TOOLKIT_DIR$\inc\c\stddef.h - $TOOLKIT_DIR$\inc\c\DLib_Product_string.h - $PROJ_DIR$\Debug\Obj\system_MKV56F24.xcl - $PROJ_DIR$\..\Include\core_cm7.h + $PROJ_DIR$\Debug\Obj\fsl_uart.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_str.xcl + $TOOLKIT_DIR$\inc\c\stdbool.h $PROJ_DIR$\Debug\Obj\delay.o - $TOOLKIT_DIR$\inc\c\stdint.h - $PROJ_DIR$\Debug\Obj\fsl_common.xcl - $PROJ_DIR$\Debug\Obj\main.__cstat.et - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h + $PROJ_DIR$\Debug\Obj\fsl_uart.xcl + $TOOLKIT_DIR$\inc\c\string.h + $PROJ_DIR$\Debug\Obj\delay.xcl $PROJ_DIR$\..\utilities\fsl_assert.c - $PROJ_DIR$\Debug\Obj\fsl_debug_console.__cstat.et - $PROJ_DIR$\..\utilities\serial_port_uart.h - $PROJ_DIR$\..\Include\cmsis_compiler.h - $PROJ_DIR$\..\Include\cmsis_iccarm.h - $PROJ_DIR$\..\utilities\serial_port_internal.h - $PROJ_DIR$\..\utilities\serial_manager.c - $TOOLKIT_DIR$\inc\c\ycheck.h - $PROJ_DIR$\..\startup\fsl_device_registers.h - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console_conf.h - $PROJ_DIR$\Debug\Obj\fsl_debug_console.o - $PROJ_DIR$\Debug\Obj\pin_Init.__cstat.et - $PROJ_DIR$\Debug\Obj\fsl_uart.o - $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h - $PROJ_DIR$\Debug\Obj\uart_Interrupt.xcl - $PROJ_DIR$\Debug\Obj\main.xcl + $PROJ_DIR$\..\Include\cmsis_version.h + $TOOLKIT_DIR$\lib\rt7M_tl.a + $PROJ_DIR$\Debug\Obj\startup_MKV56F24.o + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $PROJ_DIR$\Debug\Obj\pin_Init.xcl + $PROJ_DIR$\Debug\Obj\fsl_gpio.xcl + $PROJ_DIR$\..\drivers\fsl_port.h + $PROJ_DIR$\..\utilities\serial_port_uart.c $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.h - $PROJ_DIR$\..\startup\MKV56F24_features.h - $TOOLKIT_DIR$\inc\c\assert.h - $PROJ_DIR$\..\utilities\str\fsl_str.c - $PROJ_DIR$\Debug\Obj\delay.__cstat.et + $PROJ_DIR$\Debug\Obj\serial_port_uart.__cstat.et + $PROJ_DIR$\Debug\Obj\serial_port_uart.xcl + $TOOLKIT_DIR$\inc\c\DLib_Product.h $TOOLKIT_DIR$\inc\c\yvals.h + $PROJ_DIR$\Debug\Obj\fsl_gpio.__cstat.et + $PROJ_DIR$\..\user\main.c + $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\..\drivers\fsl_gpio.c + $PROJ_DIR$\..\user\uart_Interrupt.h + $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\startup\system_MKV56F24.c + $PROJ_DIR$\Debug\Obj\generic_list.o + $PROJ_DIR$\..\drivers\fsl_clock.c + $PROJ_DIR$\Debug\Obj\generic_list.xcl $PROJ_DIR$\..\drivers\fsl_uart.h + $PROJ_DIR$\..\user\delay.c $TOOLKIT_DIR$\lib\shb_l.a - $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\utilities\serial_port_internal.h + $PROJ_DIR$\..\drivers\fsl_common.c + $TOOLKIT_DIR$\inc\c\stdint.h + $PROJ_DIR$\..\startup\MKV56F24.h + $PROJ_DIR$\..\drivers\fsl_uart.c + $PROJ_DIR$\..\startup\startup_MKV56F24.s + $PROJ_DIR$\..\user\pin_Init.c + $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\utilities\generic_list.h $PROJ_DIR$\..\user\pin_Init.h - $PROJ_DIR$\..\startup\system_MKV56F24.h - $PROJ_DIR$\Debug\Obj\system_MKV56F24.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_common.xcl + $PROJ_DIR$\..\user\adc_Interrupt.h + $PROJ_DIR$\..\drivers\fsl_adc16.c + $TOOLKIT_DIR$\inc\c\stdlib.h + $PROJ_DIR$\Debug\Obj\uart_Interrupt.xcl + $TOOLKIT_DIR$\lib\dl7M_tln.a + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\Debug\Obj\fsl_str.o + $PROJ_DIR$\Debug\Obj\fsl_adc16.o + $PROJ_DIR$\..\utilities\uart_adapter.c + $PROJ_DIR$\Debug\Obj\serial_manager.o + $PROJ_DIR$\Debug\Obj\main.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_clock.__cstat.et + $PROJ_DIR$\..\startup\MKV56F24_features.h + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $PROJ_DIR$\Debug\Obj\fsl_assert.__cstat.et + $PROJ_DIR$\..\drivers\fsl_clock.h + $PROJ_DIR$\..\Include\mpu_armv7.h $PROJ_DIR$\Debug\Obj\serial_port_uart.o - $PROJ_DIR$\Debug\Obj\serial_manager.__cstat.et - $PROJ_DIR$\Debug\Obj\serial_port_uart.xcl - $PROJ_DIR$\Debug\Obj\uart_adapter.o + $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h + $TOOLKIT_DIR$\inc\c\math.h + $TOOLKIT_DIR$\inc\c\stddef.h + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h $PROJ_DIR$\..\utilities\generic_list.c - $PROJ_DIR$\Debug\Obj\uart_adapter.xcl - $PROJ_DIR$\..\utilities\uart_adapter.c - $PROJ_DIR$\Debug\Obj\generic_list.xcl - $PROJ_DIR$\Debug\Obj\generic_list.__cstat.et - $PROJ_DIR$\..\utilities\serial_port_uart.c - $PROJ_DIR$\..\utilities\serial_manager.h - $PROJ_DIR$\..\utilities\generic_list.h - $PROJ_DIR$\Debug\Obj\serial_port_uart.__cstat.et - $PROJ_DIR$\Debug\Obj\uart_adapter.__cstat.et - $PROJ_DIR$\Debug\Obj\generic_list.o - $PROJ_DIR$\..\utilities\uart.h + $PROJ_DIR$\Debug\Obj\fsl_clock.o + $PROJ_DIR$\Debug\Obj\serial_manager.__cstat.et $PROJ_DIR$\Debug\Obj\serial_manager.xcl - $PROJ_DIR$\Debug\Obj\serial_manager.o + $PROJ_DIR$\Debug\Obj\fsl_assert.o + $TOOLKIT_DIR$\inc\c\ysizet.h + $PROJ_DIR$\..\utilities\uart.h + $PROJ_DIR$\Debug\Obj\fsl_debug_console.__cstat.et + $PROJ_DIR$\Debug\Obj\adc_Interrupt.xcl - [ROOT_NODE] - - - ILINK - 95 6 - - - - - $PROJ_DIR$\..\drivers\fsl_common.c + $PROJ_DIR$\..\utilities\serial_manager.c ICCARM - 48 + 103 __cstat - 51 + 118 BICOMP - 68 + 119 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 3 26 122 83 - $PROJ_DIR$\..\drivers\fsl_uart.c + $PROJ_DIR$\..\utilities\str\fsl_str.c ICCARM - 83 + 100 __cstat - 30 + 43 BICOMP - 29 + 50 ICCARM - 93 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 + 113 99 69 107 115 68 16 42 96 121 112 32 44 6 51 85 54 60 114 9 86 2 57 31 19 37 110 27 106 109 24 - $PROJ_DIR$\..\drivers\fsl_gpio.c + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c ICCARM - 44 + 17 __cstat - 52 + 123 BICOMP - 35 + 33 ICCARM - 57 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 + 42 96 99 69 107 115 68 121 112 24 44 6 51 85 54 60 114 9 86 2 57 31 19 37 110 27 106 109 32 3 26 122 65 - $PROJ_DIR$\..\drivers\fsl_clock.c + $PROJ_DIR$\..\utilities\fsl_assert.c ICCARM - 16 + 120 __cstat - 36 + 108 BICOMP - 40 + 21 ICCARM - 45 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 65 3 26 122 - $PROJ_DIR$\..\user\delay.c + [ROOT_NODE] + + + ILINK + 75 34 + + + + + $PROJ_DIR$\..\utilities\serial_port_uart.c ICCARM - 66 + 111 __cstat - 91 + 66 BICOMP - 22 + 67 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 25 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 3 26 122 83 @@ -252,229 +260,267 @@ ICCARM - 38 + 35 __cstat - 69 + 104 BICOMP - 86 + 0 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 57 96 25 14 93 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 8 92 38 74 94 80 - $PROJ_DIR$\..\startup\system_MKV56F24.c + $PROJ_DIR$\..\user\uart_Interrupt.c ICCARM - 23 + 11 __cstat - 98 + 41 BICOMP - 64 + 97 ICCARM - 67 78 92 26 70 60 79 20 65 32 74 75 61 47 97 88 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 74 80 92 8 94 - $PROJ_DIR$\..\user\pin_Init.c + $PROJ_DIR$\..\drivers\fsl_gpio.c ICCARM - 54 + 46 __cstat - 82 + 70 BICOMP - 41 + 62 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 2 57 96 93 + 8 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 - $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\Debug\Exe\test01.out + + + ILINK + 34 + + + + + ILINK + 18 39 52 101 117 36 46 30 35 20 59 22 11 82 58 4 98 + + + + + $PROJ_DIR$\..\startup\system_MKV56F24.c ICCARM - 59 + 22 __cstat - 10 + 23 BICOMP - 85 + 15 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 14 93 96 57 + 85 99 69 107 115 68 9 86 2 57 31 19 37 110 27 106 - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + $PROJ_DIR$\..\drivers\fsl_clock.c ICCARM - 81 + 117 __cstat - 72 + 105 BICOMP - 28 + 47 ICCARM - 13 53 78 92 26 70 60 46 84 80 5 89 17 67 7 63 62 79 20 65 32 74 75 61 47 97 88 45 39 109 73 114 87 + 109 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 - $PROJ_DIR$\..\startup\startup_MKV56F24.s + $PROJ_DIR$\..\user\delay.c - AARM - 12 + ICCARM + 52 + + + __cstat + 29 + + + BICOMP + 55 + + + ICCARM + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 38 + + - $PROJ_DIR$\..\utilities\fsl_assert.c + $PROJ_DIR$\..\drivers\fsl_common.c ICCARM - 50 + 36 __cstat - 34 + 25 BICOMP - 37 + 93 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 87 109 73 114 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 - $PROJ_DIR$\..\utilities\serial_manager.c + $PROJ_DIR$\..\drivers\fsl_uart.c ICCARM - 116 + 30 __cstat - 100 + 49 BICOMP - 115 + 53 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 109 73 114 76 + 80 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 - $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\..\startup\startup_MKV56F24.s + + + AARM + 59 + + + + + $PROJ_DIR$\..\user\pin_Init.c ICCARM - 21 + 20 __cstat - 43 + 28 BICOMP - 9 + 61 ICCARM - 18 78 92 26 70 60 55 13 53 46 84 39 5 89 17 67 7 63 62 79 20 65 32 74 75 61 47 97 88 45 80 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 63 8 92 80 - $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\user\adc_Interrupt.c - ILINK - 6 + ICCARM + 39 + + + BICOMP + 124 - ILINK - 42 66 16 48 44 83 38 54 12 23 59 94 8 58 56 + ICCARM + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 63 8 94 5 - $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\..\drivers\fsl_adc16.c ICCARM - 113 - - - __cstat - 107 + 101 BICOMP - 106 + 40 ICCARM - 110 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 + 5 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 @@ -483,44 +529,44 @@ ICCARM - 102 + 12 __cstat - 112 + 1 BICOMP - 104 + 14 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 93 114 + 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 80 122 - $PROJ_DIR$\..\utilities\serial_port_uart.c + $PROJ_DIR$\..\utilities\generic_list.c ICCARM - 99 + 77 __cstat - 111 + 13 BICOMP - 101 + 79 ICCARM - 5 89 78 92 26 70 60 17 67 7 46 63 53 84 62 79 20 65 32 74 75 61 47 97 88 45 109 73 114 76 + 91 44 6 99 69 107 115 68 51 85 54 121 60 96 112 114 9 86 2 57 31 19 37 110 27 106 109 diff --git a/IAR/test01.ewp b/IAR/test01.ewp index 77ce7c0..055862a 100644 --- a/IAR/test01.ewp +++ b/IAR/test01.ewp @@ -2109,6 +2109,9 @@ drivers + + $PROJ_DIR$\..\drivers\fsl_adc16.c + $PROJ_DIR$\..\drivers\fsl_clock.c @@ -2139,6 +2142,9 @@ user + + $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\user\delay.c diff --git a/IAR/test01.ewt b/IAR/test01.ewt index 4992202..5b8144c 100644 --- a/IAR/test01.ewt +++ b/IAR/test01.ewt @@ -2371,6 +2371,9 @@ drivers + + $PROJ_DIR$\..\drivers\fsl_adc16.c + $PROJ_DIR$\..\drivers\fsl_clock.c @@ -2401,6 +2404,9 @@ user + + $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\user\delay.c diff --git a/user/adc_Interrupt.c b/user/adc_Interrupt.c new file mode 100644 index 0000000..d56ca16 --- /dev/null +++ b/user/adc_Interrupt.c @@ -0,0 +1,41 @@ +/*****************头文件*************************/ +#include "fsl_common.h" +#include "fsl_port.h" +#include "fsl_gpio.h" +#include "adc_Interrupt.h" +#include "fsl_adc16.h" + + +uint32_t g_Adc16ConversionValue = 0; +uint32_t g_Adc16Count = 0; + +/*****************ADC初始化*************************/ +void ADC16_InterrputInit() //ADC初始化 +{ + adc16_config_t adc16ConfigStruct; + adc16_channel_config_t adc16ChannelConfigStruct; + EnableIRQ(ADC0_IRQn); + ADC16_GetDefaultConfig(&adc16ConfigStruct); + adc16ConfigStruct.enableContinuousConversion = true; + ADC16_Init(ADC0, &adc16ConfigStruct); + ADC16_EnableHardwareTrigger(ADC0, false); /* Make sure the software trigger is used. */ + adc16ChannelConfigStruct.channelNumber = 2u; + adc16ChannelConfigStruct.enableInterruptOnConversionCompleted = true; /* Enable the interrupt. */ + ADC16_SetChannelConfig(ADC0, 0u, &adc16ChannelConfigStruct); +} + +uint32_t adc_ReturnValue() +{ + return g_Adc16ConversionValue; +} + +void ADC0_IRQHandler(void) +{ + + /* Read conversion result to clear the conversion completed flag. */ + g_Adc16ConversionValue = ADC16_GetChannelConversionValue(ADC0, 0u); + g_Adc16Count++; + g_Adc16Count %= 1000; + SDK_ISR_EXIT_BARRIER; +} + diff --git a/user/adc_Interrupt.h b/user/adc_Interrupt.h new file mode 100644 index 0000000..f9b9f70 --- /dev/null +++ b/user/adc_Interrupt.h @@ -0,0 +1,10 @@ +#ifndef _ADC_INTERRUPT_H_ +#define _ADC_INTERRUPT_H_ + +/*****************宏定义*************************/ + + +/*****************函数声明*************************/ +void ADC16_InterrputInit(); //ADC初始化 +uint32_t adc_ReturnValue(); +#endif \ No newline at end of file diff --git a/user/main.c b/user/main.c index bddf1de..3d7bcea 100644 --- a/user/main.c +++ b/user/main.c @@ -4,6 +4,7 @@ #include "pin_Init.h" #include "delay.h" #include "uart_Interrupt.h" +#include "adc_Interrupt.h" #include "fsl_uart.h" #include "system_MKV56F24.h" /********************************************* @@ -14,14 +15,16 @@ void main() { MCG->C4 = 0x40; SystemCoreClockUpdate (); - NVIC_SetPriorityGrouping(3u); //设置优先级分组3 - NVIC_SetPriority(SysTick_IRQn, NVIC_EncodePriority(3u, 3, 2)); //抢占优先级2，子优先级2 - NVIC_SetPriority(UART1_RX_TX_IRQn, NVIC_EncodePriority(3u, 1, 2)); //抢占优先级1，子优先级2 - NVIC_SetPriority(UART2_RX_TX_IRQn, NVIC_EncodePriority(3u, 2, 2)); //抢占优先级1，子优先级2 + // 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 Delay_Init(); //延时函数初始化 pin_Init(); //GPIO初始化 UART1_InterrputInit(); //UART1初始化 UART2_InterrputInit(); //UART2初始化 + ADC16_InterrputInit(); //ADC初始化 while (1) { // GPIO_PinWrite(GPIOA, 15, 0); @@ -29,10 +32,13 @@ void main() // GPIO_PinWrite(GPIOA, 15, 1); // Delay_ms(100U); UART1_sendData(); - Delay_ms(300U); - UART2_sendData(); - Delay_ms(300U); + Delay_ms(500U); RS485_Recieve_Data(); + ADC16_Recieve_Data(); + UART2_sendData(); + Delay_ms(500U); + + } } diff --git a/user/pin_Init.c b/user/pin_Init.c index 43177b0..63d6c08 100644 --- a/user/pin_Init.c +++ b/user/pin_Init.c @@ -15,7 +15,7 @@ void pin_Init() kPORT_FastSlewRate, //快速压摆率 kPORT_PassiveFilterDisable, //无源滤波器 kPORT_OpenDrainDisable, //推挽输出 - kPORT_LowDriveStrength, //低驱动力 + kPORT_HighDriveStrength, //高驱动力 kPORT_MuxAsGpio, //普通GPIO模式 kPORT_UnlockRegister, // }; diff --git a/user/uart_Interrupt.c b/user/uart_Interrupt.c index c00d27e..c7b6526 100644 --- a/user/uart_Interrupt.c +++ b/user/uart_Interrupt.c @@ -4,20 +4,21 @@ #include "fsl_uart.h" #include "pin_Init.h" #include "fsl_gpio.h" +#include "adc_Interrupt.h" /*****************变量声明*************************/ uint8_t demoRingBuffer[DEMO_RING_BUFFER_SIZE]; uint16_t txIndex; //发送数据计数 uint16_t rxIndex; //接收数据计数 -uint16_t UART1rxIndex = 0; //接收数据计数 +volatile uint16_t UART1rxIndex = 0; //接收数据计数 uint8_t RS485_Buf_Arr[DEMO_RS485_ARR_SIZE]; //RS485缓存数据数组 uint16_t UART2_SendData_len; //记录UART2发送数据长度 -uint8_t UART2_SendData_OK; //UART2发送结束标志 +uint16_t UART2_SendData_OK; //UART2发送结束标志 uint8_t g_tipString1[] = "\r\n\r\n编码器位置\t"; -uint8_t g_tipString2[] = "\t圈数\t"; +uint8_t g_tipString2[] = "\t电压\t"; uint32_t BMQ_Location_Num; //编码器位置 -uint32_t BMQ_Circle_Num; //编码器圈数 uint8_t UART2_Buf_Arr[DEMO_UART2_ARR_SIZE]; //RS485缓存数据数组 +uint32_t adc_GetValue = 0; //接收母线直流电压值 /*****************UART1初始化*************************/ void UART1_InterrputInit() { @@ -97,13 +98,17 @@ void UART2_RX_TX_IRQHandler(void) /**************发送一帧数据*************/ void UART1_sendData() { - if (UART2_SendData_OK == 1) - { - return; - } +// if (UART2_SendData_OK == 1) +// { +// return; +// } + UART2_SendData_OK ++; + UART2_SendData_OK %= 100; GPIO_PinWrite(GPIOE, 3, 1); //PTE3写 UART_WriteByte(UART1, 0x1A); //发送一帧数据（一个字节，8个数据位） - UART_WriteByte(UART1, 0x2A); //发送一帧数据（一个字节，8个数据位） + UART_WriteByte(UART1, 0x1A); //发送一帧数据（一个字节，8个数据位） + UART_WriteByte(UART1, 0x1A); //发送一帧数据（一个字节，8个数据位） + // UART_WriteByte(UART1, 0x00); //发送一帧数据（一个字节，8个数据位） while (!(kUART_TxDataRegEmptyFlag & UART_GetStatusFlags(UART1))); //发送中断标志 UART_ClearStatusFlags(UART1, kUART_TransmissionCompleteFlag); GPIO_PinWrite(GPIOE, 3, 0); //PTE3写 @@ -111,8 +116,7 @@ void UART1_sendData() /**************UART2发送数据*******************/ void UART2_sendData() -{ - UART2_SendData_OK = 1; +{ if (UART2_SendData_len != 0) { UART_WriteBlocking(DEMO_UART, g_tipString1, sizeof(g_tipString1) / sizeof(g_tipString1[0])-1); @@ -123,37 +127,42 @@ void UART2_sendData() UART_ClearStatusFlags(DEMO_UART, kUART_TransmissionCompleteFlag); } UART_WriteBlocking(DEMO_UART, g_tipString2, sizeof(g_tipString2) / sizeof(g_tipString2[0])-1); - for (uint8_t i = 0; i < 5; i++ ) + for (uint8_t i = 0; i < 6; i++ ) { UART_WriteByte(DEMO_UART, UART2_Buf_Arr[i+6]); while (!(kUART_TxDataRegEmptyFlag & UART_GetStatusFlags(DEMO_UART))); //等待发送结束 UART_ClearStatusFlags(DEMO_UART, kUART_TransmissionCompleteFlag); } } - UART2_SendData_OK = 0; } /***************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]); +// 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]); + BMQ_Location_Num = (demoRingBuffer[4] << 16) + (demoRingBuffer[3] << 8) + (demoRingBuffer[2]); UART2_Buf_Arr[0] = (BMQ_Location_Num / 100000) + '0'; UART2_Buf_Arr[1] = (BMQ_Location_Num % 100000 / 10000) + '0'; UART2_Buf_Arr[2] = (BMQ_Location_Num % 10000 / 1000) + '0'; UART2_Buf_Arr[3] = (BMQ_Location_Num % 1000 / 100) + '0'; UART2_Buf_Arr[4] = (BMQ_Location_Num % 100 / 10) + '0'; UART2_Buf_Arr[5] = (BMQ_Location_Num % 10) + '0'; - BMQ_Circle_Num = (RS485_Buf_Arr[7] << 8) + (RS485_Buf_Arr[6]); - UART2_Buf_Arr[6] = (BMQ_Circle_Num % 100000 / 10000) + '0'; - UART2_Buf_Arr[7] = (BMQ_Circle_Num % 10000 / 1000) + '0'; - UART2_Buf_Arr[8] = (BMQ_Circle_Num % 1000 / 100) + '0'; - UART2_Buf_Arr[9] = (BMQ_Circle_Num % 100 / 10) + '0'; - UART2_Buf_Arr[10] = (BMQ_Circle_Num % 10) + '0'; UART2_SendData_len = UART1rxIndex; UART1rxIndex = 0; } +/*************刷新电压数据******************/ +void ADC16_Recieve_Data() +{ + adc_GetValue = adc_ReturnValue(); + UART2_Buf_Arr[6] = (adc_GetValue / 100000) + '0'; + UART2_Buf_Arr[7] = (adc_GetValue % 100000 / 10000) + '0'; + UART2_Buf_Arr[8] = (adc_GetValue % 10000 / 1000) + '0'; + UART2_Buf_Arr[9] = (adc_GetValue % 1000 / 100) + '0'; + UART2_Buf_Arr[10] = (adc_GetValue % 100 / 10) + '0'; + UART2_Buf_Arr[11] = (adc_GetValue % 10) + '0'; +} diff --git a/user/uart_Interrupt.h b/user/uart_Interrupt.h index ae9c206..5cfa655 100644 --- a/user/uart_Interrupt.h +++ b/user/uart_Interrupt.h @@ -15,6 +15,7 @@ void UART1_InterrputInit(); //UART0 void UART1_sendData(); //UART1发送1帧数据 void UART2_sendData(); //UART2发送数组 void RS485_Recieve_Data(); //RS485接收数据 +void ADC16_Recieve_Data(); //转换发送的电压数值 #endif \ No newline at end of file