From 216aa17ea3d51ef1b15fbc4f5bfb0c995a567425 Mon Sep 17 00:00:00 2001 From: QQyyblithe Date: Fri, 12 Aug 2022 13:50:54 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=9A=E6=97=B6=E5=99=A8?= =?UTF-8?q?=E8=AE=A1=E6=97=B6=E5=8F=91=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- IAR/settings/test01.dbgdt | 6 +- IAR/settings/test01.dnx | 2 +- IAR/settings/test01.wsdt | 34 +-- IAR/test01.dep | 498 +++++++++++++++++++++----------------- IAR/test01.ewp | 9 + IAR/test01.ewt | 9 + user/adc_Interrupt.c | 36 ++- user/adc_Interrupt.h | 6 +- user/main.c | 10 +- user/pit.c | 20 ++ user/pit.h | 12 + user/uart_Interrupt.c | 24 +- 12 files changed, 394 insertions(+), 272 deletions(-) create mode 100644 user/pit.c create mode 100644 user/pit.h diff --git a/IAR/settings/test01.dbgdt b/IAR/settings/test01.dbgdt index 6abe96b..6af2514 100644 --- a/IAR/settings/test01.dbgdt +++ b/IAR/settings/test01.dbgdt @@ -156,11 +156,11 @@ 1 1 1 - 8E0300001E00138600001A000000108600009B00000020810000020000005F860000010000000F810000020000001D810000010000000C810000330000000486000003000000178100000100000056860000640100005584000001000000838600000200000000810000010000005E860000070000000E810000340000001F8100000500000009860000010000008E860000040000000B8100000100000069860000010000001486000026000000028400000100000027810000020000001186000050000000058100000200000046810000830000001084000005000000608600000300000008860000020000005D86000001000000 + A10300001E00138600001A00000010860000A400000020810000020000005F860000010000000F810000020000001D810000010000000C810000330000000486000003000000178100000100000056860000640100005584000001000000838600000200000000810000010000005E860000070000000E810000340000001F8100000500000009860000010000008E860000040000000B81000001000000698600000100000014860000260000000284000001000000278100000200000011860000510000000581000002000000468100008C0000001084000005000000608600000300000008860000020000005D86000001000000 19000D8400000F84000008840000FFFFFFFF54840000328100001C81000009840000838600005886000004DC00007784000007840000808C000044D500007486000000DC000001DC000002DC000003DC00002AE10000008200001C8200000182000067860000 - 4F00578600001C000000048400007E00000013860000310000002CE10000740000001581000056000000108600002F000000768600003B00000007E100006C00000023920000000000003184000085000000848600003C0000005F8600006500000004E100006A0000000A8600002D0000000F81000055000000208100005D00000023E100006E00000001E10000670000000D80000048000000078600002A0000000C8100005200000019820000460000000486000027000000068400008000000016820000440000004A8100007800000017810000580000009A8600001A000000038400007D00000056860000350000002BE10000730000001481000055000000008400007A000000008100004A00000030840000840000000E840000820000002F8200004700000025E100007000000003E10000690000001A86000034000000098600002C0000000E810000540000001F8100005C0000005E8600003700000022E100006D00000000E100006600000006860000290000000B810000510000008E8600003D000000188200004500000041E1000076000000698600003A000000058400007F000000D1840000200000001486000032000000498100007700000016810000570000005586000008000000028400007C00000011860000300000000E8600001B00000032840000860000001084000083000000468100006400000005E100006B00000051840000870000000B8600002E000000608600003900000002E10000680000000D81000053000000A18600003E000000C386000004000000088600002B0000000A840000810000005D8600003600000005860000280000003787000003000000C08600000E0000001686000033000000 + 4F001386000031000000048400007E000000578600001C000000768600003B000000108600002F00000015810000560000002CE1000074000000848600003C0000003184000085000000239200000000000007E100006C000000208100005D0000000F810000550000000A8600002D00000004E100006A0000005F860000650000000C81000052000000078600002A0000000D8000004800000001E100006700000023E100006E0000000684000080000000048600002700000019820000460000005686000035000000038400007D0000009A8600001A00000017810000580000004A810000780000001682000044000000008400007A00000014810000550000002BE10000730000000E840000820000003084000084000000008100004A0000005E860000370000001F8100005C0000000E81000054000000098600002C0000001A8600003400000003E100006900000025E10000700000002F820000470000008E8600003D0000000B81000051000000068600002900000000E100006600000022E100006D0000001486000032000000D184000020000000058400007F000000698600003A00000041E100007600000018820000450000001186000030000000028400007C0000005586000008000000168100005700000049810000770000004681000064000000108400008300000032840000860000000E8600001B00000060860000390000000B8600002E000000518400008700000005E100006B0000005D860000360000000A84000081000000088600002B000000C386000004000000A18600003E0000000D8100005300000002E10000680000001686000033000000C08600000E00000037870000030000000586000028000000 0 @@ -1176,7 +1176,7 @@ Main - 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000000006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0000000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000000070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000000073000000FFFEFF000000000000000000000000000100000001000000018002810000000000004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000000062000000FFFEFF0000000000000000000000000001000000010000000180278100000000000060000000FFFEFF0000000000000000000000000001000000010000000180288100000000000061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 + 00200000010000002100FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000067000000FFFEFF000000000000000000000000000100000001000000018001E100000000000068000000FFFEFF000000000000000000000000000100000001000000018003E10000000000006A000000FFFEFF000000000000000000000000000100000001000000018000810000000000004B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000006D000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004006F000000FFFEFF000000000000000000000000000100000001000000018022E10000000004006E000000FFFEFF000000000000000000000000000100000001000000018025E100000000000071000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000000074000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040075000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000000000018021810000000004005E000000FFFEFF000000000000000000000000000100000001000000018024E100000000000070000000FFFEFF000000000000000000000000000100000001000000018028E100000000040072000000FFFEFF000000000000000000000000000100000001000000018029E100000000000073000000FFFEFF000000000000000000000000000100000001000000018002810000000000004D000000FFFEFF0000000000000000000000000001000000010000000180298100000000000062000000FFFEFF0000000000000000000000000001000000010000000180278100000000000060000000FFFEFF0000000000000000000000000001000000010000000180288100000000000061000000FFFEFF00000000000000000000000000010000000100000001801D810000000000005A000000FFFEFF00000000000000000000000000010000000100000001801E810000000004005B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B8100000000000051000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000052000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000066000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001801F810000000000005C000000FFFEFF000000000000000000000000000100000001000000018020810000000000005D000000FFFEFF0000000000000000000000000001000000010000000180468100000000020064000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00FF020000 34051 diff --git a/IAR/settings/test01.dnx b/IAR/settings/test01.dnx index ab67d70..7a390be 100644 --- a/IAR/settings/test01.dnx +++ b/IAR/settings/test01.dnx @@ -35,7 +35,7 @@ _ 0 - 2269743658 + 1849806380 _ 0 diff --git a/IAR/settings/test01.wsdt b/IAR/settings/test01.wsdt index cb51330..a9f4ef4 100644 --- a/IAR/settings/test01.wsdt +++ b/IAR/settings/test01.wsdt @@ -62,7 +62,7 @@ - 207 + 190 30 30 30 @@ -95,7 +95,7 @@ 1 1 1 - 840200001E001386000002000000108600000200000020810000010000005F860000010000000F810000030000001D810000010000000C8100005E01000004860000010000001781000001000000568600000C0000005584000001000000838600000200000000810000010000005E860000010000000E810000090100001F8100000100000009860000010000008E860000010000000B810000030000006986000001000000148600000400000002840000010000002781000002000000118600000300000005810000020000004681000001000000108400000E000000608600000300000008860000010000005D86000001000000 + AB0200001E001386000002000000108600000200000020810000010000005F860000010000000F810000030000001D810000010000000C8100007B01000004860000010000001781000001000000568600000C0000005584000001000000838600000200000000810000010000005E860000010000000E810000130100001F8100000100000009860000010000008E860000010000000B810000030000006986000001000000148600000400000002840000010000002781000002000000118600000300000005810000020000004681000001000000108400000E000000608600000300000008860000010000005D86000001000000 1E007784000007840000FFFFFFFF808C00000D8400000F8400000884000054840000328100001C81000009840000538400000C84000033840000788400001184000044D500000088000001880000028800000388000004880000058800001C8F00001D8F00001F8F0000208F0000218F00002AE10000118F0000 @@ -116,8 +116,8 @@ 4294967295 - 000000000F02000056050000C5020000 - 00000000F801000056050000AE020000 + 000000000702000056050000C5020000 + 00000000F001000056050000AE020000 4096 0 0 @@ -130,7 +130,7 @@ 34048 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -143,7 +143,7 @@ 34053 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -156,7 +156,7 @@ 34054 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -171,14 +171,14 @@ 67 810 2 - + 0 -1 34055 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -192,7 +192,7 @@ 34056 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -206,7 +206,7 @@ 34057 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -221,14 +221,14 @@ 67 810 2 - + 0 -1 34060 26FFFFFF890200007C0400005D030000 - 04000000100200005205000094020000 + 04000000080200005205000094020000 32768 0 0 @@ -303,7 +303,7 @@ 34061 00000000170000000601000078010000 - 000000003200000017010000F4010000 + 000000003200000017010000EC010000 4096 0 0 @@ -370,7 +370,7 @@ - 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFF17010000320000001B010000F4010000010000000200001004000000010000000BFFFFFFC10300000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000003F01000056050000430100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF00000000F401000056050000F80100000100000001000010040000000100000001FEFFFF3200000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000000000000F02000056050000C502000000000000F801000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 + 0000000010000000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000F85000000000000000000000000000000000000010000000F850000010000000F850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000E85000000000000000000000000000000000000010000000E850000010000000E850000000000000010000001000000FFFFFFFFFFFFFFFF17010000320000001B010000EC010000010000000200001004000000010000000BFFFFFFC10300000D85000000000000000000000000000000000000010000000D850000010000000D850000000000000080000000000000FFFFFFFFFFFFFFFF000000000000000004000000040000000000000001000000040000000100000000000000000000000B85000000000000000000000000000000000000010000000B850000010000000B850000000000000080000000000000FFFFFFFFFFFFFFFF000000003F01000056050000430100000000000001000000040000000100000000000000000000000A85000000000000000000000000000000000000010000000A850000010000000A850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000048500000000000000000000000000000000000001000000048500000100000004850000000000000080000000000000FFFFFFFFFFFFFFFF00000000000000000400000004000000000000000100000004000000010000000000000000000000038500000000000000000000000000000000000001000000038500000100000003850000000000000080000001000000FFFFFFFFFFFFFFFF00000000EC01000056050000F00100000100000001000010040000000100000016FEFFFF4700000000000000000000000000000001000000FFFFFFFF070000000085000005850000068500000785000008850000098500000C850000FFFF02000B004354616262656450616E650080000001000000000000000702000056050000C502000000000000F001000056050000AE020000000000004080005607000000FFFEFF054200750069006C006400010000000085000001000000FFFFFFFFFFFFFFFFFFFEFF094400650062007500670020004C006F006700010000000585000001000000FFFFFFFFFFFFFFFFFFFEFF0C4400650063006C00610072006100740069006F006E007300010000000685000001000000FFFFFFFFFFFFFFFFFFFEFF0A5200650066006500720065006E00630065007300000000000785000001000000FFFFFFFFFFFFFFFFFFFEFF0D460069006E006400200069006E002000460069006C0065007300000000000885000001000000FFFFFFFFFFFFFFFFFFFEFF1541006D0062006900670075006F0075007300200044006500660069006E006900740069006F006E007300010000000985000001000000FFFFFFFFFFFFFFFFFFFEFF0B54006F006F006C0020004F0075007400700075007400000000000C85000001000000FFFFFFFFFFFFFFFF0000000000000000000000000000000000000000000000000000000001000000FFFFFFFF0085000001000000FFFFFFFF00850000000000000000000000000000 CMSIS-Pack @@ -391,7 +391,7 @@ Main - 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000004003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000004003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000040042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 + 00200000010000002000FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000035000000FFFEFF000000000000000000000000000100000001000000018001E100000000000036000000FFFEFF000000000000000000000000000100000001000000018003E100000000000038000000FFFEFF0000000000000000000000000001000000010000000180008100000000000019000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018007E10000000000003B000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000018023E10000000000003D000000FFFEFF000000000000000000000000000100000001000000018022E10000000000003C000000FFFEFF000000000000000000000000000100000001000000018025E10000000000003F000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001802BE100000000000042000000FFFEFF00000000000000000000000000010000000100000001802CE100000000040043000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6E4281000000000000FFFFFFFFFFFEFF0001000000000000000100000000000000010000007800000002002050FFFFFFFFFFFEFF0096000000000000001400FFFEFF054700500049004F004100FFFEFF0A4D004B005600350036004600320034002E006800FFFEFF104700500049004F005F0049006E00690074005400790070006500440065006600FFFEFF0A4700500049004F005F0049006E00690074005400FFFEFF0470006F0072007400FFFEFF045000410069006E00FFFEFF0250004100FFFEFF0F4300500055005F005800540041004C005F0043004C004B005F0048005A00FFFEFF134300500055005F0049004E0054005F0046004100530054005F0043004C004B005F0048005A00FFFEFF085400570052005F004B00560035003600FFFEFF0554004F00570045005200FFFEFF05440065006C0061007900FFFEFF0E440045004D004F005F0055004100520054005F004900520051006E00FFFEFF12440045004D004F005F0055004100520054005F0043004C004B005F004600520045005100FFFEFF0C620061007500640052006100740065005F00420070007300FFFEFF044E00560049004300FFFEFF0D5000720069006F007200690074007900470072006F0075007000FFFEFF0A530065007200690061006C004D0061006E006100FFFEFF12530065007200690061006C004D0061006E0061006700650072005F005700720069007400FFFEFF1B530065007200690061006C004D0061006E0061006700650072005F005700720069007400650042006C006F0063006B0069006E0067000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018021810000000004002C000000FFFEFF000000000000000000000000000100000001000000018024E10000000000003E000000FFFEFF000000000000000000000000000100000001000000018028E100000000040040000000FFFEFF000000000000000000000000000100000001000000018029E100000000000041000000FFFEFF000000000000000000000000000100000001000000018002810000000000001B000000FFFEFF0000000000000000000000000001000000010000000180298100000000000030000000FFFEFF000000000000000000000000000100000001000000018027810000000000002E000000FFFEFF000000000000000000000000000100000001000000018028810000000000002F000000FFFEFF00000000000000000000000000010000000100000001801D8100000000000028000000FFFEFF00000000000000000000000000010000000100000001801E8100000000040029000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800B810000000000001F000000FFFEFF00000000000000000000000000010000000100000001800C8100000000000020000000FFFEFF00000000000000000000000000010000000100000001805F8600000000000034000000FFFEFF00000000000000000000000000010000000100000001800000000001000000FFFFFFFFFFFEFF00000000000000000000000000010000000100000001800E8100000000000022000000FFFEFF00000000000000000000000000010000000100000001800F8100000000000023000000FFFEFF00000000000000000000000000010000000100000000000000FFFEFF044D00610069006E00E8020000 34050 @@ -448,7 +448,7 @@ - 010000000300000001000000000000000000000001000000010000000200000000000000010000000100000000000000280000002800000001000000080000000000000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300370030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300370030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600370037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600390035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00390030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0034003000320033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0034003000320033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0032003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003500360037003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003500360037003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400360035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF25013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00310033003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400350038003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400350038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200330036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200330036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0070006F00720074002E006800010000000180FFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00360039003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400340036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A660073006C005F0070006F00720074002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000001B01000049000000560500000B020000 + 0100000003000000010000000000000000000000010000000100000002000000000000000100000001000000000000002800000028000000010000000C0000000500000001000000FFFEFF172400570053005F0044004900520024005C002E002E005C0075007300650072005C006D00610069006E002E00630001000000FFFF010014004966436F6E74656E7453746F72616765496D706CFFFEFF00FFFEFFFF27013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E00320036003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0031003000360036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0031003000360036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF066D00610069006E002E00630000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003300380036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003300380036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF212400570053005F0044004900520024005C002E002E005C0075007300650072005C0075006100720074005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003100390030003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003100390030003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF1075006100720074005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100340034003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100340034003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF1B2400570053005F0044004900520024005C002E002E005C0075007300650072005C00700069006E005F0049006E00690074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003400360035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003400360035003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A700069006E005F0049006E00690074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003200320036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003200330038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF202400570053005F0044004900520024005C002E002E005C0075007300650072005C006100640063005F0049006E0074006500720072007500700074002E006800010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100310036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100330038003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0F6100640063005F0049006E0074006500720072007500700074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1E2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0070006F00720074002E006800010000000180FFFEFF00FFFEFFFF26013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E0032003400340036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E0032003400360039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0A660073006C005F0070006F00720074002E00680000000000FFFFFFFFFFFFFFFFFFFEFF1F2400570053005F0044004900520024005C002E002E005C0064007200690076006500720073005C00660073006C005F0063006C006F0063006B002E006300010000000180FFFEFF00FFFEFFFF2A013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E003700350037003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00320031003700300033003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00320031003700300033003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF0B660073006C005F0063006C006F0063006B002E00630000000000FFFFFFFFFFFFFFFFFFFEFF182400570053005F0044004900520024005C002E002E005C0075007300650072005C00640065006C00610079002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003600370039003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003600370039003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF07640065006C00610079002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C0075007300650072005C007000690074002E006300010000000180FFFEFF00FFFEFFFF24013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E003100370035003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E003100390031003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057000690074002E00630000000000FFFFFFFFFFFFFFFFFFFEFF162400570053005F0044004900520024005C002E002E005C0075007300650072005C007000690074002E006800010000000180FFFEFF00FFFEFFFF22013C003F0078006D006C002000760065007200730069006F006E003D00220031002E0030002200200065006E0063006F00640069006E0067003D0022005500540046002D00380022003F003E000A003C0052006F006F0074003E000A0020002000200020003C004E0075006D0052006F00770073003E0031003C002F004E0075006D0052006F00770073003E000A0020002000200020003C004E0075006D0043006F006C0073003E0031003C002F004E0075006D0043006F006C0073003E000A0020002000200020003C00580050006F0073003E0030003C002F00580050006F0073003E000A0020002000200020003C00590050006F0073003E0030003C002F00590050006F0073003E000A0020002000200020003C00530065006C00530074006100720074003E0030003C002F00530065006C00530074006100720074003E000A0020002000200020003C00530065006C0045006E0064003E0030003C002F00530065006C0045006E0064003E000A0020002000200020003C00580050006F00730032003E0030003C002F00580050006F00730032003E000A0020002000200020003C00590050006F00730032003E0030003C002F00590050006F00730032003E000A0020002000200020003C00530065006C005300740061007200740032003E00350036003C002F00530065006C005300740061007200740032003E000A0020002000200020003C00530065006C0045006E00640032003E00350036003C002F00530065006C0045006E00640032003E000A003C002F0052006F006F0074003E000A00FFFEFF057000690074002E00680000000000FFFFFFFFFFFFFFFF0000000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000001000000020000001B010000490000005605000003020000 diff --git a/IAR/test01.dep b/IAR/test01.dep index a51c965..ca07800 100644 --- a/IAR/test01.dep +++ b/IAR/test01.dep @@ -1,572 +1,618 @@ 4 - 14492896 + 3827991394 Debug - $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$\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\List\test01.map - $PROJ_DIR$\Debug\Obj\main.o - $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$\Debug\Obj\fsl_clock.xcl - $PROJ_DIR$\Debug\Obj\test01.pbd - $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 - $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$\..\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_pit.c $PROJ_DIR$\..\drivers\fsl_port.h - $PROJ_DIR$\..\utilities\serial_port_uart.c - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.h - $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\pin_Init.c + $PROJ_DIR$\..\user\pit.c $PROJ_DIR$\..\user\main.c - $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\..\user\pit.h + $PROJ_DIR$\..\user\delay.c $PROJ_DIR$\..\drivers\fsl_gpio.c - $PROJ_DIR$\..\user\uart_Interrupt.h - $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\startup\startup_MKV56F24.s + $PROJ_DIR$\..\startup\MKV56F24.h $PROJ_DIR$\..\startup\system_MKV56F24.c - $PROJ_DIR$\Debug\Obj\generic_list.o + $PROJ_DIR$\..\user\adc_Interrupt.c $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$\..\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$\Debug\Obj\fsl_common.xcl - $PROJ_DIR$\..\user\adc_Interrupt.h + $PROJ_DIR$\..\drivers\fsl_common.c $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_str.o + $PROJ_DIR$\Debug\Obj\fsl_gpio.__cstat.et + $PROJ_DIR$\Debug\Obj\uart_adapter.__cstat.et $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 + $TOOLKIT_DIR$\inc\c\yvals.h + $TOOLKIT_DIR$\lib\dl7M_tln.a + $PROJ_DIR$\..\utilities\serial_port_internal.h + $PROJ_DIR$\Debug\Exe\test01.out $TOOLKIT_DIR$\inc\c\DLib_Product_stdlib.h + $PROJ_DIR$\Debug\Obj\serial_port_uart.xcl + $PROJ_DIR$\Debug\Obj\generic_list.xcl + $TOOLKIT_DIR$\inc\c\stdlib.h + $PROJ_DIR$\Debug\Obj\delay.__cstat.et + $PROJ_DIR$\Debug\Obj\main.__cstat.et + $PROJ_DIR$\..\drivers\fsl_clock.h + $PROJ_DIR$\..\user\adc_Interrupt.h + $PROJ_DIR$\Debug\Obj\serial_manager.o + $TOOLKIT_DIR$\inc\c\DLib_Defaults.h + $PROJ_DIR$\..\Include\mpu_armv7.h + $PROJ_DIR$\Debug\Obj\fsl_adc16.o + $PROJ_DIR$\..\user\pin_Init.h + $TOOLKIT_DIR$\lib\shb_l.a + $PROJ_DIR$\Debug\Obj\generic_list.o + $PROJ_DIR$\..\utilities\generic_list.h + $PROJ_DIR$\Debug\Obj\system_MKV56F24.__cstat.et + $PROJ_DIR$\..\utilities\uart_adapter.c + $TOOLKIT_DIR$\inc\c\ycheck.h + $PROJ_DIR$\Debug\Obj\main.xcl + $PROJ_DIR$\..\Include\core_cm7.h + $PROJ_DIR$\..\startup\MKV56F24_features.h + $PROJ_DIR$\Debug\Obj\fsl_common.xcl + $PROJ_DIR$\Debug\Obj\serial_manager.__cstat.et $TOOLKIT_DIR$\inc\c\math.h + $TOOLKIT_DIR$\inc\c\stdint.h $TOOLKIT_DIR$\inc\c\stddef.h - $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h - $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\..\drivers\fsl_uart.h + $PROJ_DIR$\Debug\Obj\adc_Interrupt.xcl + $PROJ_DIR$\Debug\Obj\fsl_debug_console.__cstat.et + $PROJ_DIR$\Debug\Obj\fsl_pit.o + $PROJ_DIR$\..\utilities\uart.h + $TOOLKIT_DIR$\inc\c\DLib_Product.h + $PROJ_DIR$\..\drivers\fsl_pit.h $PROJ_DIR$\Debug\Obj\fsl_clock.o - $PROJ_DIR$\Debug\Obj\serial_manager.__cstat.et - $PROJ_DIR$\Debug\Obj\serial_manager.xcl + $TOOLKIT_DIR$\inc\c\DLib_Config_Normal.h $PROJ_DIR$\Debug\Obj\fsl_assert.o + $PROJ_DIR$\Debug\Obj\fsl_pit.xcl + $PROJ_DIR$\Debug\Obj\pit.o + $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\Debug\Obj\uart_Interrupt.xcl + $PROJ_DIR$\Debug\Obj\pit.xcl $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 + $PROJ_DIR$\Debug\Obj\serial_manager.xcl + $TOOLKIT_DIR$\lib\rt7M_tl.a + $PROJ_DIR$\Debug\Obj\fsl_clock.xcl + $PROJ_DIR$\..\drivers\fsl_common.h + $TOOLKIT_DIR$\inc\c\string.h + $PROJ_DIR$\Debug\Obj\delay.xcl + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.h + $PROJ_DIR$\..\utilities\fsl_assert.c + $PROJ_DIR$\Debug\Obj\serial_port_uart.__cstat.et + $PROJ_DIR$\Debug\List\test01.map + $PROJ_DIR$\Debug\Obj\fsl_uart.xcl + $PROJ_DIR$\..\Include\cmsis_version.h + $TOOLKIT_DIR$\inc\c\stdarg.h + $PROJ_DIR$\Debug\Obj\fsl_str.xcl + $PROJ_DIR$\..\utilities\serial_port_uart.c + $PROJ_DIR$\Debug\Obj\uart_Interrupt.__cstat.et + $PROJ_DIR$\..\user\delay.h + $PROJ_DIR$\..\user\uart_Interrupt.h + $PROJ_DIR$\Debug\Obj\startup_MKV56F24.o + $PROJ_DIR$\Debug\Obj\fsl_gpio.o + $PROJ_DIR$\Debug\Obj\fsl_adc16.xcl + $PROJ_DIR$\Debug\Obj\fsl_str.__cstat.et + $PROJ_DIR$\Debug\Obj\main.o + $PROJ_DIR$\Debug\Obj\adc_Interrupt.o + $PROJ_DIR$\Debug\Obj\fsl_common.o + $PROJ_DIR$\..\user\uart_Interrupt.c + $TOOLKIT_DIR$\inc\c\stdbool.h + $PROJ_DIR$\Debug\Obj\fsl_uart.__cstat.et + $TOOLKIT_DIR$\inc\c\DLib_Product_string.h + $PROJ_DIR$\Debug\Obj\pin_Init.xcl + $PROJ_DIR$\Debug\Obj\delay.o + $PROJ_DIR$\Debug\Obj\fsl_gpio.xcl + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + $TOOLKIT_DIR$\inc\c\iccarm_builtin.h + $PROJ_DIR$\..\drivers\fsl_gpio.h + $PROJ_DIR$\..\drivers\fsl_adc16.h + $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\Debug\Obj\uart_adapter.o + $PROJ_DIR$\..\utilities\serial_manager.h + $PROJ_DIR$\Debug\Obj\pin_Init.__cstat.et + $PROJ_DIR$\Debug\Obj\generic_list.__cstat.et + $PROJ_DIR$\..\utilities\serial_manager.c + $TOOLKIT_DIR$\inc\c\DLib_float_setup.h + $PROJ_DIR$\Debug\Obj\pin_Init.o + $PROJ_DIR$\..\utilities\serial_port_uart.h + $PROJ_DIR$\Debug\Obj\system_MKV56F24.o + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console_conf.h + $PROJ_DIR$\Debug\Obj\fsl_uart.o + $PROJ_DIR$\Debug\Obj\test01.pbd + $PROJ_DIR$\..\utilities\str\fsl_str.h + $PROJ_DIR$\Debug\Obj\uart_adapter.xcl + $PROJ_DIR$\Debug\Obj\uart_Interrupt.o + $PROJ_DIR$\..\Include\cmsis_compiler.h + $PROJ_DIR$\Debug\Obj\fsl_assert.xcl + $PROJ_DIR$\Debug\Obj\system_MKV56F24.xcl + $TOOLKIT_DIR$\inc\c\assert.h + $PROJ_DIR$\Debug\Obj\fsl_common.__cstat.et + $PROJ_DIR$\..\startup\system_MKV56F24.h + $PROJ_DIR$\..\Include\cmsis_iccarm.h + $TOOLKIT_DIR$\lib\m7M_tls.a + $PROJ_DIR$\Debug\Obj\fsl_debug_console.xcl + $TOOLKIT_DIR$\config\linker\NXP\MKV5xF512xxx24.icf + $PROJ_DIR$\..\startup\fsl_device_registers.h + $PROJ_DIR$\Debug\Obj\fsl_debug_console.o - $PROJ_DIR$\..\utilities\serial_manager.c + [ROOT_NODE] - ICCARM - 103 + ILINK + 25 78 + + + + $PROJ_DIR$\..\drivers\fsl_pit.c + - __cstat - 118 + ICCARM + 56 BICOMP - 119 + 63 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 3 26 122 83 + 59 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\utilities\str\fsl_str.c + $PROJ_DIR$\..\user\pin_Init.c ICCARM - 100 + 112 __cstat - 43 + 108 BICOMP - 50 + 98 ICCARM - 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 1 103 38 53 - $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c + $PROJ_DIR$\..\user\pit.c ICCARM - 17 - - - __cstat - 123 + 64 BICOMP - 33 + 67 ICCARM - 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 59 103 86 5 - $PROJ_DIR$\..\utilities\fsl_assert.c + $PROJ_DIR$\..\user\main.c ICCARM - 120 + 91 __cstat - 108 + 31 BICOMP - 21 + 45 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 65 3 26 122 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 103 38 5 85 86 33 53 - [ROOT_NODE] - - - ILINK - 75 34 - - - - - $PROJ_DIR$\..\utilities\serial_port_uart.c + $PROJ_DIR$\..\user\delay.c ICCARM - 111 + 99 __cstat - 66 + 30 BICOMP - 67 + 74 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 3 26 122 83 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 85 - $PROJ_DIR$\..\user\main.c + $PROJ_DIR$\..\drivers\fsl_gpio.c ICCARM - 35 + 88 __cstat - 104 + 18 BICOMP - 0 + 100 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 8 92 38 74 94 80 + 103 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\user\uart_Interrupt.c + $PROJ_DIR$\..\startup\startup_MKV56F24.s + + + AARM + 87 + + + + + $PROJ_DIR$\..\startup\system_MKV56F24.c ICCARM - 11 + 114 __cstat - 41 + 42 BICOMP - 97 + 123 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 74 80 92 8 94 + 51 44 22 35 61 58 131 9 46 80 121 127 102 36 126 47 - $PROJ_DIR$\..\drivers\fsl_gpio.c + $PROJ_DIR$\..\user\adc_Interrupt.c ICCARM - 46 - - - __cstat - 70 + 92 BICOMP - 62 + 54 ICCARM - 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 1 103 33 104 - $PROJ_DIR$\Debug\Exe\test01.out + $PROJ_DIR$\..\drivers\fsl_clock.c - ILINK - 34 + ICCARM + 60 + + + __cstat + 16 + + + BICOMP + 71 - ILINK - 18 39 52 101 117 36 46 30 35 20 59 22 11 82 58 4 98 + ICCARM + 32 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 - $PROJ_DIR$\..\startup\system_MKV56F24.c + $PROJ_DIR$\..\drivers\fsl_uart.c ICCARM - 22 + 116 __cstat - 23 + 96 BICOMP - 15 + 79 ICCARM - 85 99 69 107 115 68 9 86 2 57 31 19 37 110 27 106 + 53 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\drivers\fsl_clock.c + $PROJ_DIR$\..\drivers\fsl_common.c ICCARM - 117 + 93 __cstat - 105 + 125 BICOMP - 47 + 48 ICCARM - 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\user\delay.c + $PROJ_DIR$\..\drivers\fsl_adc16.c ICCARM - 52 - - - __cstat - 29 + 37 BICOMP - 55 + 89 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 + 104 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\drivers\fsl_common.c + $PROJ_DIR$\Debug\Exe\test01.out + + + ILINK + 78 + + + + + ILINK + 130 92 99 37 60 93 88 56 116 91 112 64 87 114 120 39 70 128 23 + + + + + $PROJ_DIR$\..\utilities\uart_adapter.c ICCARM - 36 + 106 __cstat - 25 + 19 BICOMP - 93 + 119 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 53 57 - $PROJ_DIR$\..\drivers\fsl_uart.c + $PROJ_DIR$\..\utilities\generic_list.c ICCARM - 30 + 40 __cstat - 49 + 109 BICOMP - 53 + 28 ICCARM - 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 + 41 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 - $PROJ_DIR$\..\startup\startup_MKV56F24.s + $PROJ_DIR$\..\utilities\fsl_assert.c - AARM - 59 + ICCARM + 62 + + + __cstat + 20 + + + BICOMP + 122 + + + ICCARM + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 75 107 113 57 + + - $PROJ_DIR$\..\user\pin_Init.c + $PROJ_DIR$\..\utilities\serial_port_uart.c ICCARM - 20 + 21 __cstat - 28 + 77 BICOMP - 61 + 27 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 92 80 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 107 113 57 24 - $PROJ_DIR$\..\user\adc_Interrupt.c + $PROJ_DIR$\..\user\uart_Interrupt.c ICCARM - 39 + 120 + + + __cstat + 84 BICOMP - 124 + 66 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 86 53 38 103 59 5 33 - $PROJ_DIR$\..\drivers\fsl_adc16.c + $PROJ_DIR$\..\utilities\debug_console\fsl_debug_console.c ICCARM - 101 + 132 + + + __cstat + 55 BICOMP - 40 + 129 ICCARM - 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 + 81 29 44 22 35 61 58 68 26 115 72 124 95 51 73 97 52 131 9 46 80 121 127 102 36 126 47 32 118 107 113 57 75 - $PROJ_DIR$\..\utilities\uart_adapter.c + $PROJ_DIR$\..\utilities\str\fsl_str.c ICCARM - 12 + 17 __cstat - 1 + 90 BICOMP - 14 + 82 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 80 122 + 50 44 22 35 61 58 111 81 29 68 26 118 72 124 95 51 73 97 52 131 9 46 80 121 127 102 36 126 47 32 115 - $PROJ_DIR$\..\utilities\generic_list.c + $PROJ_DIR$\..\utilities\serial_manager.c ICCARM - 77 + 34 __cstat - 13 + 49 BICOMP - 79 + 69 ICCARM - 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 + 72 124 44 22 35 61 58 95 51 73 68 97 29 26 52 131 9 46 80 121 127 102 36 126 47 32 107 113 57 24 diff --git a/IAR/test01.ewp b/IAR/test01.ewp index 055862a..d59be4f 100644 --- a/IAR/test01.ewp +++ b/IAR/test01.ewp @@ -2121,6 +2121,9 @@ $PROJ_DIR$\..\drivers\fsl_gpio.c + + $PROJ_DIR$\..\drivers\fsl_pit.c + $PROJ_DIR$\..\drivers\fsl_port.h @@ -2154,6 +2157,12 @@ $PROJ_DIR$\..\user\pin_Init.c + + $PROJ_DIR$\..\user\pit.c + + + $PROJ_DIR$\..\user\pit.h + $PROJ_DIR$\..\user\uart_Interrupt.c diff --git a/IAR/test01.ewt b/IAR/test01.ewt index 5b8144c..d5fac01 100644 --- a/IAR/test01.ewt +++ b/IAR/test01.ewt @@ -2383,6 +2383,9 @@ $PROJ_DIR$\..\drivers\fsl_gpio.c + + $PROJ_DIR$\..\drivers\fsl_pit.c + $PROJ_DIR$\..\drivers\fsl_port.h @@ -2416,6 +2419,12 @@ $PROJ_DIR$\..\user\pin_Init.c + + $PROJ_DIR$\..\user\pit.c + + + $PROJ_DIR$\..\user\pit.h + $PROJ_DIR$\..\user\uart_Interrupt.c diff --git a/user/adc_Interrupt.c b/user/adc_Interrupt.c index d56ca16..961eec0 100644 --- a/user/adc_Interrupt.c +++ b/user/adc_Interrupt.c @@ -6,36 +6,48 @@ #include "fsl_adc16.h" -uint32_t g_Adc16ConversionValue = 0; -uint32_t g_Adc16Count = 0; +uint32_t g_Adc12ConversionValue = 0; +uint32_t g_Adc12Count = 0; -/*****************ADC初始化*************************/ -void ADC16_InterrputInit() //ADC初始化 +/*****************ADC初始化************************* + * adc16ConfigStruct.referenceVoltageSource = kADC16_ReferenceVoltageSourceVref; //选择VREFL为参考电压 + * adc16ConfigStruct.clockSource = kADC16_ClockSourceAsynchronousClock; + * adc16ConfigStruct.enableAsynchronousClock = true; + * adc16ConfigStruct.clockDivider = kADC16_ClockDivider8; + * adc16ConfigStruct.resolution = kADC16_ResolutionSE12Bit; //分辨率为12位,最大值4096 + * adc16ConfigStruct.longSampleMode = kADC16_LongSampleDisabled; + * adc16ConfigStruct.enableHighSpeed = false; + * adc16ConfigStruct.enableLowPower = false; + * adc16ConfigStruct.enableContinuousConversion = false; +*******************************************************/ +void ADC12_InterrputInit() //ADC初始化 { + /*ADC分辨率选择12位,最大值4096*/ + /*参考电压选择VREFL,连接VDDA(3.3V)*/ adc16_config_t adc16ConfigStruct; adc16_channel_config_t adc16ChannelConfigStruct; EnableIRQ(ADC0_IRQn); ADC16_GetDefaultConfig(&adc16ConfigStruct); - adc16ConfigStruct.enableContinuousConversion = true; + 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_EnableHardwareTrigger(ADC0, false); //ADC软件触发 + adc16ChannelConfigStruct.channelNumber = 2u; //选择通道2 + adc16ChannelConfigStruct.enableInterruptOnConversionCompleted = true; //使能ADC中断触发标志 ADC16_SetChannelConfig(ADC0, 0u, &adc16ChannelConfigStruct); } uint32_t adc_ReturnValue() { - return g_Adc16ConversionValue; + return g_Adc12ConversionValue / g_Adc12_12bitFullRange * 3300; //放大1000倍 } void ADC0_IRQHandler(void) { /* Read conversion result to clear the conversion completed flag. */ - g_Adc16ConversionValue = ADC16_GetChannelConversionValue(ADC0, 0u); - g_Adc16Count++; - g_Adc16Count %= 1000; + g_Adc12ConversionValue = ADC16_GetChannelConversionValue(ADC0, 0u); + g_Adc12Count++; + g_Adc12Count %= 1000; SDK_ISR_EXIT_BARRIER; } diff --git a/user/adc_Interrupt.h b/user/adc_Interrupt.h index f9b9f70..d28d220 100644 --- a/user/adc_Interrupt.h +++ b/user/adc_Interrupt.h @@ -2,9 +2,9 @@ #define _ADC_INTERRUPT_H_ /*****************宏定义*************************/ - +#define g_Adc12_12bitFullRange 4096U //最大测量范围4096 /*****************函数声明*************************/ -void ADC16_InterrputInit(); //ADC初始化 -uint32_t adc_ReturnValue(); +void ADC12_InterrputInit(); //ADC初始化 +uint32_t adc_ReturnValue(); //获取ADC返回值 #endif \ No newline at end of file diff --git a/user/main.c b/user/main.c index 3d7bcea..0df0412 100644 --- a/user/main.c +++ b/user/main.c @@ -2,11 +2,13 @@ #include "fsl_common.h" #include "fsl_gpio.h" #include "pin_Init.h" +#include "pit.h" #include "delay.h" #include "uart_Interrupt.h" #include "adc_Interrupt.h" #include "fsl_uart.h" #include "system_MKV56F24.h" + /********************************************* PTA15——LED灯闪烁 **********************************************/ @@ -24,19 +26,19 @@ void main() pin_Init(); //GPIO初始化 UART1_InterrputInit(); //UART1初始化 UART2_InterrputInit(); //UART2初始化 - ADC16_InterrputInit(); //ADC初始化 + 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(); - Delay_ms(500U); + // UART1_sendData(); RS485_Recieve_Data(); ADC16_Recieve_Data(); UART2_sendData(); - Delay_ms(500U); + Delay_ms(1000U); } diff --git a/user/pit.c b/user/pit.c new file mode 100644 index 0000000..263a441 --- /dev/null +++ b/user/pit.c @@ -0,0 +1,20 @@ +/*****************头文件*************************/ +#include "fsl_common.h" +#include "fsl_pit.h" +#include "fsl_clock.h" +#include "fsl_gpio.h" +#include "uart_Interrupt.h" +#include "pit.h" + + +void Pit_MyInit() +{ + pit_config_t pitConfig; + PIT_GetDefaultConfig(&pitConfig); + PIT_Init(PIT, &pitConfig); //初始化PIT + PIT_SetTimerPeriod(PIT, DEMO_PIT_CHANNEL, USEC_TO_COUNT(50000U, PIT_SOURCE_CLOCK)); //设置通道0 + PIT_EnableInterrupts(PIT, DEMO_PIT_CHANNEL, kPIT_TimerInterruptEnable); //使能定时器0中断 + EnableIRQ(PIT0_IRQn); //使能PIT中断 + PIT_StartTimer(PIT, DEMO_PIT_CHANNEL); //开启通道0定时 +} + diff --git a/user/pit.h b/user/pit.h new file mode 100644 index 0000000..923c6c0 --- /dev/null +++ b/user/pit.h @@ -0,0 +1,12 @@ +#ifndef _PIT_H_ +#define _PIT_H_ + + +#define DEMO_PIT_CHANNEL kPIT_Chnl_0 +#define PIT_SOURCE_CLOCK CLOCK_GetFreq(kCLOCK_BusClk) //得到PIT BusClk时钟频率 +#define USEC_TO_COUNT(us, clockFreqInHz) (uint64_t)(((uint64_t)(us) * (clockFreqInHz)) / 1000000U) + + +void Pit_MyInit(); + +#endif \ No newline at end of file diff --git a/user/uart_Interrupt.c b/user/uart_Interrupt.c index c7b6526..ffa8827 100644 --- a/user/uart_Interrupt.c +++ b/user/uart_Interrupt.c @@ -4,13 +4,15 @@ #include "fsl_uart.h" #include "pin_Init.h" #include "fsl_gpio.h" +#include "fsl_pit.h" +#include "pit.h" #include "adc_Interrupt.h" /*****************变量声明*************************/ uint8_t demoRingBuffer[DEMO_RING_BUFFER_SIZE]; uint16_t txIndex; //发送数据计数 uint16_t rxIndex; //接收数据计数 -volatile uint16_t UART1rxIndex = 0; //接收数据计数 +uint16_t UART1rxIndex = 0; //接收数据计数 uint8_t RS485_Buf_Arr[DEMO_RS485_ARR_SIZE]; //RS485缓存数据数组 uint16_t UART2_SendData_len; //记录UART2发送数据长度 uint16_t UART2_SendData_OK; //UART2发送结束标志 @@ -65,6 +67,7 @@ void UART1_RX_TX_IRQHandler(void) UART1rxIndex %= DEMO_RING_BUFFER_SIZE; } } + UART2_SendData_len = UART1rxIndex; SDK_ISR_EXIT_BARRIER; } @@ -106,9 +109,7 @@ void UART1_sendData() UART2_SendData_OK %= 100; GPIO_PinWrite(GPIOE, 3, 1); //PTE3写 UART_WriteByte(UART1, 0x1A); //发送一帧数据(一个字节,8个数据位) - UART_WriteByte(UART1, 0x1A); //发送一帧数据(一个字节,8个数据位) - UART_WriteByte(UART1, 0x1A); //发送一帧数据(一个字节,8个数据位) - // UART_WriteByte(UART1, 0x00); //发送一帧数据(一个字节,8个数据位) + UART_WriteByte(UART1, 0x2A); //发送一帧数据(一个字节,8个数据位) while (!(kUART_TxDataRegEmptyFlag & UART_GetStatusFlags(UART1))); //发送中断标志 UART_ClearStatusFlags(UART1, kUART_TransmissionCompleteFlag); GPIO_PinWrite(GPIOE, 3, 0); //PTE3写 @@ -144,6 +145,10 @@ void RS485_Recieve_Data() // 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; + } 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'; @@ -151,8 +156,6 @@ void RS485_Recieve_Data() 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'; - UART2_SendData_len = UART1rxIndex; - UART1rxIndex = 0; } /*************刷新电压数据******************/ @@ -166,3 +169,12 @@ void ADC16_Recieve_Data() UART2_Buf_Arr[10] = (adc_GetValue % 100 / 10) + '0'; UART2_Buf_Arr[11] = (adc_GetValue % 10) + '0'; } + +void PIT0_IRQHandler() +{ + PIT_ClearStatusFlags(PIT, DEMO_PIT_CHANNEL, kPIT_TimerFlag); //清除中断标志 + UART1_sendData(); //UART1发送 + UART1rxIndex = 0; + //GPIO_PortToggle(GPIOA, 1 << 15); + +}