From c7bcc24c444c9b9197beb9ce6541f85e6b4f8c5c Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 06 四月 2021 11:00:08 +0800
Subject: [PATCH] 增加WIFI串口输出模式，待测试
---
源码/核心板/Src/main.c | 6
源码/核心板/Src/OnChipDevices/Usart.c | 135 ++++++++++++++
源码/核心板/MDK-ARM/Project.uvguix.Administrator | 390 ++++++++++++++++++++++--------------------
源码/核心板/Src/OnChipDevices/Usart.h | 7
4 files changed, 347 insertions(+), 191 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
index 43774e4..a980d5f 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
@@ -15,17 +15,17 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
- <TableColWidths>117 118</TableColWidths>
+ <TableColWidths>115 67</TableColWidths>
</View>
<View>
<WinId>346</WinId>
<ViewName>Code Coverage</ViewName>
- <TableColWidths>500 100</TableColWidths>
+ <TableColWidths>770 160</TableColWidths>
</View>
<View>
<WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName>
- <TableColWidths>930 90 90 100</TableColWidths>
+ <TableColWidths>930</TableColWidths>
</View>
</SECTreeCtrl>
@@ -90,8 +90,8 @@
<sActiveDebugView></sActiveDebugView>
<WindowPosition>
<length>44</length>
- <flags>2</flags>
- <showCmd>3</showCmd>
+ <flags>0</flags>
+ <showCmd>1</showCmd>
<MinPosition>
<xPos>-32000</xPos>
<yPos>-32000</yPos>
@@ -101,17 +101,17 @@
<yPos>-1</yPos>
</MaxPosition>
<NormalPosition>
- <Top>3</Top>
+ <Top>2</Top>
<Left>-6</Left>
- <Right>1543</Right>
- <Bottom>830</Bottom>
+ <Right>1541</Right>
+ <Bottom>829</Bottom>
</NormalPosition>
</WindowPosition>
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
- <Len>1158</Len>
- <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B00000004000000010000002D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000FFDC7800FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000BECEA100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000F0A0A100FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000BCA8E100FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E63000000009CC1B600FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000F7B88600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000D9ADC200FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000A5C2D700FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000B3A6BE00FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E6300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000C4000000660000000006000051020000</Data>
+ <Len>1418</Len>
+ <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D00000005000000010000002D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000FFDC7800FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000BECEA100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000F0A0A100FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000BCA8E100FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E63000000009CC1B600FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000F7B88600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000D9ADC200FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000A5C2D700FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000B3A6BE00FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E6300000000EAD6A300FFFFFFFF61453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F75736172742E68000000001173746D3332663130785F75736172742E6800000000F6FA7D00FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F7263632E68000000000F73746D3332663130785F7263632E6800000000B5E99D00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000006D01000070000000FD05000050020000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -134,7 +134,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>C40000006600000070040000D4000000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -150,11 +150,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000BD00000021020000</Data>
+ <Data>03000000660000006401000016020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -170,11 +170,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000BD00000021020000</Data>
+ <Data>03000000660000006401000016020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -190,11 +190,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>00000000A90100007004000017020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -210,11 +210,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -230,11 +230,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -250,11 +250,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -270,11 +270,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D040000D6000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -294,7 +294,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -314,7 +314,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -330,11 +330,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -350,11 +350,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -370,11 +370,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -390,11 +390,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -410,11 +410,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -430,11 +430,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -450,11 +450,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000BD00000021020000</Data>
+ <Data>03000000660000006401000016020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -470,11 +470,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000BD00000021020000</Data>
+ <Data>03000000660000006401000016020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -490,11 +490,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>030000004A020000F8050000E8020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -514,7 +514,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -530,11 +530,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>030000004A020000F8050000E8020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -550,11 +550,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>C7000000660000006D040000A4000000</Data>
+ <Data>C40000006300000070040000BD000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -574,7 +574,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -610,11 +610,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B00300006300000070040000A5010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -630,11 +630,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>00000000A90100007004000003020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -654,7 +654,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -674,7 +674,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -690,11 +690,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>C7000000660000006D040000A4000000</Data>
+ <Data>C40000006300000070040000BD000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -714,7 +714,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -730,11 +730,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -750,11 +750,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -770,11 +770,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -790,11 +790,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -810,11 +810,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -830,11 +830,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -850,11 +850,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -870,11 +870,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -890,11 +890,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -910,11 +910,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -930,11 +930,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -950,11 +950,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -970,11 +970,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -990,11 +990,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1010,11 +1010,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1030,11 +1030,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1050,11 +1050,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1070,11 +1070,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1090,11 +1090,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1110,11 +1110,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1130,11 +1130,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1150,11 +1150,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000BD00000021020000</Data>
+ <Data>0300000066000000BD000000FE010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1170,11 +1170,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>000000004702000070040000A1020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1190,11 +1190,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>030000004A0200006D04000088020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1210,11 +1210,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1230,11 +1230,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1250,11 +1250,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>030000004A0200006D04000088020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1270,11 +1270,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000055020000FD050000F5020000</Data>
+ <Data>030000004A0200006D04000088020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000006D0100005D020000</Data>
+ <Data>A4000000BB0000008701000077020000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1294,7 +1294,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A1000000C20200000F010000</Data>
+ <Data>A4000000BB000000DC02000029010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1310,11 +1310,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1330,11 +1330,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1350,11 +1350,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1370,11 +1370,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1390,11 +1390,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1410,11 +1410,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1430,11 +1430,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1450,11 +1450,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1470,11 +1470,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1490,11 +1490,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1510,11 +1510,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1530,11 +1530,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1550,11 +1550,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1570,11 +1570,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1590,17 +1590,17 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
<RegID>50015</RegID>
<PaneID>50015</PaneID>
- <IsVisible>1</IsVisible>
+ <IsVisible>0</IsVisible>
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
@@ -1610,11 +1610,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>C7000000660000006D04000081000000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>0A0000000A0000006E0000006E000000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1630,11 +1630,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1650,11 +1650,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1670,11 +1670,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1690,11 +1690,11 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>B3030000660000006D0400008C010000</Data>
+ <Data>B3030000660000006D0400001A010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -1704,7 +1704,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>966</MRUWidth>
+ <MRUWidth>32767</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
@@ -1730,7 +1730,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>000000000E0300000006000021030000</Data>
+ <Data>0000000001030000FB05000014030000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1744,7 +1744,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>476</MRUWidth>
+ <MRUWidth>32767</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>1</RecentRowIndex>
@@ -1764,7 +1764,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>612</MRUWidth>
+ <MRUWidth>32767</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>2</RecentRowIndex>
@@ -1790,23 +1790,23 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000AC0100006D040000FE010000</Data>
+ <Data>03000000AC0100006D040000EA010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>8A000000A10000004A01000041010000</Data>
+ <Data>A4000000BB000000640100005B010000</Data>
</RectRecentFloat>
</Window>
<DockMan>
<Len>3312</Len>
- <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000C40000006600000070040000D4000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C40000003A020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C000000051020000000000004F000000C00000003A0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000AC010000700400002E0200000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000003A020000000600003E02000001000000010000100400000001000000B8FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000550200000006000025030000000000003E020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+ <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A4000000BB000000DC02000029010000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A4000000BB000000640100005B010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF670100004F0000006B0100002F0200000100000002000010040000000100000042FFFFFF32050000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A4000000BB000000640100005B010000000000004F000000670100002F0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000A4000000BB000000640100005B0100000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002F020000FB0500003302000001000000010000100400000001000000C5FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000A4000000BB000000DC020000290100000000000033020000FB050000010300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
</DockMan>
<ToolBar>
<RegID>59392</RegID>
<Name>File</Name>
<Buttons>
- <Len>2882</Len>
- <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E6D6F746F725F6B65657074696D65960000000000000014000E6D6F746F725F6B65657074696D65104E5649435F53797374656D52657365740B72656D61696E5F74696D650741542053454E44064556454E543A0446534D3A0653544154453A0553544154450A4849444F5F446562756708706F7765726F6666104849444F5F5368656C6C5072696E7466104849444F5F41545F4556454E545F4F4B0E4849444F5F46534D5F535441544513454336303053536F636B657453656E6441636B0A5368656C6C5F496E666F04696E666F166C5F666E506F7765724576656E7443616C6C6261636B166C5F61624D6F64756C654E656564506F7765724F6666044350494E116C5F6173744154436D645365744C6973740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+ <Len>2898</Len>
+ <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4750535F50494E5F454E960000000000000014000D554152545F506F704672616D650E55415254325F506F704672616D650E554152545F507573684672616D650F55415254325F507573684672616D650F45554152545F52585F444D415F43480A4750535F50494E5F454E1D6477745F636F6E666967636F6E74696E756F75736672616D656D6F64650870646F615F76616C11464C4153485F494150464C41475F4D41500B4750494F5F50494E5F31300844454D4F5F4C4F47076C5F62417574680D536F636B65745F4372656174650E554450436C69656E745F496E6974066F66667365740B6D6F746F725F73746174650A4849444F5F4465627567084849444F5F44424710554450436C69656E745F55706C6F61640C64656D6F5F6F6E5F646174610000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000</Data>
</Buttons>
<OriginalItems>
<Len>1423</Len>
@@ -1822,7 +1822,7 @@
<Name>Build</Name>
<Buttons>
<Len>970</Len>
- <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+ <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000</Data>
</Buttons>
<OriginalItems>
<Len>583</Len>
@@ -1838,7 +1838,7 @@
<Name>Debug</Name>
<Buttons>
<Len>2373</Len>
- <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
+ <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000</Data>
</Buttons>
<OriginalItems>
<Len>898</Len>
@@ -3603,21 +3603,21 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
- <ActiveTab>4</ActiveTab>
+ <ActiveTab>5</ActiveTab>
<Doc>
<Name>..\Src\main.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>151</TopLine>
- <CurrentLine>163</CurrentLine>
+ <ColumnNumber>11</ColumnNumber>
+ <TopLine>150</TopLine>
+ <CurrentLine>162</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Src\application\dw_app.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>943</TopLine>
- <CurrentLine>967</CurrentLine>
+ <ColumnNumber>26</ColumnNumber>
+ <TopLine>1060</TopLine>
+ <CurrentLine>1077</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3642,27 +3642,27 @@
</Doc>
<Doc>
<Name>..\Src\application\serial_at_cmd_app.c</Name>
- <ColumnNumber>44</ColumnNumber>
+ <ColumnNumber>32</ColumnNumber>
<TopLine>110</TopLine>
- <CurrentLine>122</CurrentLine>
+ <CurrentLine>123</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Src\OnChipDevices\Usart.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>186</TopLine>
- <CurrentLine>211</CurrentLine>
+ <ColumnNumber>4</ColumnNumber>
+ <TopLine>191</TopLine>
+ <CurrentLine>207</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Src\OnChipDevices\Usart.h</Name>
- <ColumnNumber>51</ColumnNumber>
- <TopLine>9</TopLine>
- <CurrentLine>34</CurrentLine>
+ <ColumnNumber>0</ColumnNumber>
+ <TopLine>34</TopLine>
+ <CurrentLine>39</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3687,7 +3687,7 @@
</Doc>
<Doc>
<Name>..\Src\application\global_param.h</Name>
- <ColumnNumber>19</ColumnNumber>
+ <ColumnNumber>22</ColumnNumber>
<TopLine>23</TopLine>
<CurrentLine>48</CurrentLine>
<Folding>1</Folding>
@@ -3697,12 +3697,30 @@
<Doc>
<Name>..\Src\application\beep_logic_app.c</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>40</TopLine>
+ <TopLine>1</TopLine>
<CurrentLine>1</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
+ <Doc>
+ <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_usart.h</Name>
+ <ColumnNumber>0</ColumnNumber>
+ <TopLine>265</TopLine>
+ <CurrentLine>273</CurrentLine>
+ <Folding>1</Folding>
+ <ContractedFolders></ContractedFolders>
+ <PaneID>0</PaneID>
+ </Doc>
+ <Doc>
+ <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_rcc.h</Name>
+ <ColumnNumber>0</ColumnNumber>
+ <TopLine>509</TopLine>
+ <CurrentLine>510</CurrentLine>
+ <Folding>1</Folding>
+ <ContractedFolders></ContractedFolders>
+ <PaneID>0</PaneID>
+ </Doc>
</MDIGroup>
</MDIGroups>
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
index c7b8874..fec7f44 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c"
@@ -203,7 +203,8 @@
}
//发送一个字节数据
- EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
+ EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
+ EXT_UART2->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count];
s_count++;
if(s_count >= m_EUART_TxFrames[m_EUART_TxFrm_Tail].len) //一帧数据发送完毕
{
@@ -322,4 +323,136 @@
while (!(USART1->SR & USART_FLAG_TXE));
return (ch);
}
+//////////////////////////////////////////////////////////////USART2
+
+void UART2_DMAConfiguration(void)
+{
+ DMA_InitTypeDef DMA_InitStructure;
+
+ RCC_AHBPeriphClockCmd(RCC_AHBPeriph_DMA1, ENABLE);
+
+ //UART的DMA数据接收初始化
+ DMA_DeInit(UART2_RX_DMA_CH);
+ DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)( &(EXT_UART2->DR)); //外设数据寄存器
+ DMA_InitStructure.DMA_MemoryBaseAddr = (uint32_t)m_EUART_DMA_RXBuf; //数据Buf
+ DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralSRC; //外设作源头
+ DMA_InitStructure.DMA_BufferSize = EUART_RX_BUF_SIZE; //Buf大小
+ DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; //外设地址不增加
+ DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; //内存地址增加
+ DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; //字节
+ DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte; //字节（注意与上一个变量名称不同！！）
+ DMA_InitStructure.DMA_Mode = DMA_Mode_Circular; //循环模式
+ DMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh; //优先级
+ DMA_InitStructure.DMA_M2M = DMA_M2M_Disable; //非内存到内存
+ DMA_Init(UART2_RX_DMA_CH, &DMA_InitStructure);
+ USART_DMACmd(EXT_UART2, USART_DMAReq_Rx, ENABLE);
+ DMA_Cmd(UART2_RX_DMA_CH, ENABLE);
+
+#ifdef EXUART_USE_TXDMA
+ //UART的DMA数据发送初始化
+ DMA_DeInit(EUART_TX_DMA_CH);
+ DMA_InitStructure.DMA_PeripheralBaseAddr = (uint32_t)(&(EXT_UART->DR)); //外设数据寄存器
+ DMA_InitStructure.DMA_MemoryBaseAddr = 0; //数据Buf
+ DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralDST; //外设作目标
+ DMA_InitStructure.DMA_BufferSize = 0; //Buf大小
+ DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable; //外设地址寄存器不递增
+ DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable; //内存地址递增
+ DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte; //外设字节为单位
+ DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte; //内存字节为单位（注意与上一个变量名称不同！！）
+ DMA_InitStructure.DMA_Mode = DMA_Mode_Normal; //普通模式
+ DMA_InitStructure.DMA_Priority = DMA_Priority_High; //优先级
+ DMA_InitStructure.DMA_M2M = DMA_M2M_Disable; //非内存到内存
+ DMA_Init(EUART_TX_DMA_CH, &DMA_InitStructure);
+
+// DMA_ITConfig(EUART_TX_DMA_CH, DMA_IT_TC, ENABLE); //DMA传输完成中断
+ USART_DMACmd(EXT_UART,USART_DMAReq_Tx,ENABLE); //外设使能DMA // */
+#endif
+}
+
+void Uart2_Init(void)
+{
+ GPIO_InitTypeDef GPIO_InitStructure;
+ USART_InitTypeDef USART_InitStructure;
+ USART_ClockInitTypeDef USART_ClockInitStructure;
+
+ /* Enable GPIO clock */
+ // RCC_APB2PeriphClockCmd(EU_RCC_GPIO | RCC_APB2Periph_AFIO, ENABLE);
+ /* Enable USART clock */
+ RCC_APB1PeriphClockCmd(RCC_APB1Periph_USART2, ENABLE);
+
+ Usart1InitVariables();
+
+ //初始化管脚
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_3;
+ GPIO_InitStructure.GPIO_Mode =GPIO_Mode_IN_FLOATING; //Rx上拉输入
+ GPIO_InitStructure.GPIO_Speed = GPIO_Speed_50MHz;
+ GPIO_Init(EU_RX_GPIO, &GPIO_InitStructure);
+
+ GPIO_InitStructure.GPIO_Pin = GPIO_Pin_2;
+ GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP
+ GPIO_Init(EU_TX_GPIO, &GPIO_InitStructure);
+
+
+#ifdef UART_GPIO_REMAP_ENABLE
+ GPIO_PinRemapConfig(UART_GPIO_REMAP, ENABLE);
+#endif
+
+ USART_DeInit(EXT_UART2);
+ USART_InitStructure.USART_BaudRate = EXUART_BAUD_RADE;
+ USART_InitStructure.USART_WordLength = USART_WordLength_8b;
+ USART_InitStructure.USART_StopBits = USART_StopBits_1;
+ USART_InitStructure.USART_Parity = USART_Parity_No;
+ USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
+ USART_InitStructure.USART_Mode = USART_Mode_Rx | USART_Mode_Tx;
+
+ USART_ClockInitStructure.USART_Clock = USART_Clock_Disable;
+ USART_ClockInitStructure.USART_CPOL = USART_CPOL_Low;
+ USART_ClockInitStructure.USART_CPHA = USART_CPHA_2Edge;
+ USART_ClockInitStructure.USART_LastBit = USART_LastBit_Disable;
+
+ USART_ClockInit(EXT_UART2, &USART_ClockInitStructure);
+ USART_Init(EXT_UART2, &USART_InitStructure);
+// USART_ITConfig(EXT_UART, USART_IT_RXNE, ENABLE);//??????,????? ??????????
+ // Enable the USARTx
+ USART_Cmd(EXT_UART2, ENABLE);
+ //DMA配置（须放到UART初始化之后）
+ UART2_DMAConfiguration();
+
+}
+
+void UART2_CheckReceive(void)
+{
+ int32_t DMACnt = 0;
+ int32_t MaxDataLen = EUART_RX_BUF_SIZE;
+
+ //如果正在往发送队列中添加数据，退出
+ if(m_bEUARTPushingFrms)
+ return;
+ //判断是否正在Check
+ if(m_bEUARTCheckingRec)
+ return;
+ m_bEUARTCheckingRec = 1;
+ if(UART2_RX_DMA_CH->CNDTR == 0)
+ {
+ m_bEUARTCheckingRec = 0;
+ return;
+ }
+ DMACnt = EUART_RX_BUF_SIZE - (UART2_RX_DMA_CH->CNDTR);
+ while( m_EUART_DMA_RXPtr != DMACnt && MaxDataLen > 0)
+ {
+ Usart1ParseDataCallback(m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]);
+ delay_us(10);
+ m_EUART_DMA_RXPtr++;
+ if( m_EUART_DMA_RXPtr >= EUART_RX_BUF_SIZE )
+ {
+ m_EUART_DMA_RXPtr = 0;
+ }
+ DMACnt = EUART_RX_BUF_SIZE - (UART2_RX_DMA_CH->CNDTR);
+ MaxDataLen--;
+ }
+ m_bEUARTCheckingRec = 0;
+}
+
+
+
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
index 320c7dc..7201f11 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h"
@@ -30,6 +30,8 @@
#define EUART_RX_DMA_CH DMA1_Channel5
#define EUART_TX_DMA_CH DMA1_Channel4
+
+
#define EUART_TX_FRM_SIZE 14 //发送队列中的最大帧数
#define EUART_TX_FRMBUF_SIZE 200 //发送队列每帧缓存大小
#define EUART_RX_BUF_SIZE 200 //接收缓存大小
@@ -49,7 +51,8 @@
void UART_PushFrame(uint8_t* pdata, int32_t data_len);
void UART_PopFrame(void);
extern void (*Usart1ParseDataCallback)(uint8_t);
-
-
+//////////////////////////////////////////////////////////
+#define EXT_UART2 USART2
+#define UART2_RX_DMA_CH DMA1_Channel6
#endif
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
index a96983c..3b3dd22 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/main.c"
@@ -158,8 +158,10 @@
void IdleTask(void)
{
- UART_CheckReceive();
- UART_CheckSend();
+ UART_CheckReceive();
+ UART_CheckSend();
+ UART_CheckReceive();
+
if(heartbeat_timer>1000)
{
heartbeat_timer=0;
--
Gitblit v1.9.3