From 9bfefe7171abd37ec7af68e095d220b28d183a20 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期二, 02 十一月 2021 16:24:35 +0800 Subject: [PATCH] V2.43 时间片测试发货 --- 源码/核心板/Src/application/global_param.c | 3 源码/核心板/Src/main.c | 13 源码/核心板/MDK-ARM/Project.uvguix.zhyin | 564 ++++++++++++++------------ 源码/核心板/Src/stm32f10x_it.c | 39 源码/核心板/MDK-ARM/Project.uvoptx | 57 ++ 源码/核心板/Src/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s | 2 源码/核心板/Src/application/dw_app.c | 567 ++------------------------ 7 files changed, 438 insertions(+), 807 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.zhyin" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.zhyin" index 76a06c5..a481003 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.zhyin" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.zhyin" @@ -15,17 +15,17 @@ <View> <WinId>38003</WinId> <ViewName>Registers</ViewName> - <TableColWidths>139 140</TableColWidths> + <TableColWidths>140 141</TableColWidths> </View> <View> <WinId>346</WinId> <ViewName>Code Coverage</ViewName> - <TableColWidths>770 486</TableColWidths> + <TableColWidths>770 160</TableColWidths> </View> <View> <WinId>204</WinId> <ViewName>Performance Analyzer</ViewName> - <TableColWidths>878 139 139 100</TableColWidths> + <TableColWidths>930</TableColWidths> </View> </SECTreeCtrl> @@ -34,7 +34,7 @@ <WinId>35141</WinId> <ViewName>Event Statistics</ViewName> <UserString></UserString> - <TableColWidths>250 50 634</TableColWidths> + <TableColWidths>200 50 700</TableColWidths> </View> <View> <WinId>1506</WinId> @@ -69,7 +69,7 @@ <View> <WinId>466</WinId> <ViewName>Source Browser</ViewName> - <UserString>500</UserString> + <UserString>276</UserString> <TableColWidths>166</TableColWidths> </View> </TreeListPane> @@ -91,7 +91,7 @@ <WindowPosition> <length>44</length> <flags>2</flags> - <showCmd>3</showCmd> + <showCmd>2</showCmd> <MinPosition> <xPos>-32000</xPos> <yPos>-32000</yPos> @@ -101,17 +101,17 @@ <yPos>-1</yPos> </MaxPosition> <NormalPosition> - <Top>-742</Top> - <Left>-821</Left> - <Right>331</Right> - <Bottom>-149</Bottom> + <Top>122</Top> + <Left>90</Left> + <Right>397</Right> + <Bottom>287</Bottom> </NormalPosition> </WindowPosition> <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>1640</Len> - <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000F00000007000000010000003C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000C5D4F200FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000FFDC7800FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F646D612E63000000000F73746D3332663130785F646D612E6300000000BECEA100FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F646D612E68000000000F73746D3332663130785F646D612E6800000000F0A0A100FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E63000000009CC1B600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000F7B88600FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000D9ADC200FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000A5C2D700FFFFFFFF42453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C64775F6472697665722E63000000000B64775F6472697665722E6300000000B3A6BE00FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F657874692E63000000001073746D3332663130785F657874692E6300000000EAD6A300FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963655F6170692E680000000011646563615F6465766963655F6170692E6800000000F6FA7D00FFFFFFFF51453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C436F7265537570706F72745C636F72655F636D332E68000000000A636F72655F636D332E6800000000B5E99D00FFFFFFFF47453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6800000000125263635F4E7669635F5379737469636B2E68000000005FC3CF00FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000C1838300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000DAFCFFFF2EFCFFFF96030000E0FEFFFF</Data> + <Len>2094</Len> + <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001300000004000000010000003C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000C5D4F200FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000FFDC7800FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F646D612E63000000000F73746D3332663130785F646D612E6300000000BECEA100FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F646D612E68000000000F73746D3332663130785F646D612E6800000000F0A0A100FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000BCA8E100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E63000000009CC1B600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000F7B88600FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000D9ADC200FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000A5C2D700FFFFFFFF42453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C64775F6472697665722E63000000000B64775F6472697665722E6300000000B3A6BE00FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F657874692E63000000001073746D3332663130785F657874692E6300000000EAD6A300FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963655F6170692E680000000011646563615F6465766963655F6170692E6800000000F6FA7D00FFFFFFFF51453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C436F7265537570706F72745C636F72655F636D332E68000000000A636F72655F636D332E6800000000B5E99D00FFFFFFFF47453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6800000000125263635F4E7669635F5379737469636B2E68000000005FC3CF00FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000C1838300FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000CACAD500FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000C5D4F200FFFFFFFF3D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F726567732E68000000000B646563615F726567732E6800000000FFDC7800FFFFFFFF78453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C446576696365537570706F72745C53545C53544D3332463130785C737461727475705C61726D5C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002384FFFF4F83FFFF0089FFFF0986FFFF</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -134,7 +134,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>DAFCFFFF2EFCFFFF860000009CFCFFFF</Data> + <Data>FF0100005C020000AB050000CA020000</Data> </RectRecentFloat> </Window> <Window> @@ -150,11 +150,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000E8020000</Data> + <Data>03000000660000001C010000F0020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>A4000000BB000000640100005B010000</Data> </RectRecentFloat> </Window> <Window> @@ -170,11 +170,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000E8020000</Data> + <Data>03000000660000001C010000F0020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>A4000000BB0000008701000077020000</Data> </RectRecentFloat> </Window> <Window> @@ -194,7 +194,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -214,7 +214,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -234,7 +234,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>A4000000BB000000DC02000029010000</Data> </RectRecentFloat> </Window> <Window> @@ -254,7 +254,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>A4000000BB000000DC02000029010000</Data> </RectRecentFloat> </Window> <Window> @@ -274,7 +274,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -294,7 +294,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -314,7 +314,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -334,7 +334,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -354,7 +354,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -374,7 +374,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -394,7 +394,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -414,7 +414,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -434,7 +434,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -450,11 +450,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000E8020000</Data> + <Data>03000000660000001C010000F0020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>A4000000BB0000008701000077020000</Data> </RectRecentFloat> </Window> <Window> @@ -470,11 +470,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000E8020000</Data> + <Data>03000000660000001C010000F0020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>A4000000BB0000008701000077020000</Data> </RectRecentFloat> </Window> <Window> @@ -490,11 +490,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>00000000210300000006000021030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -514,13 +514,13 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> <RegID>199</RegID> <PaneID>199</PaneID> - <IsVisible>1</IsVisible> + <IsVisible>0</IsVisible> <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> @@ -530,11 +530,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>03000000240300002001000024030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -554,7 +554,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -574,7 +574,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -614,7 +614,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -634,7 +634,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>A4000000BB000000DC02000029010000</Data> </RectRecentFloat> </Window> <Window> @@ -654,7 +654,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -674,7 +674,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -694,7 +694,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -714,7 +714,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -734,7 +734,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -754,7 +754,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -774,7 +774,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -794,7 +794,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -814,7 +814,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -834,7 +834,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -854,7 +854,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -874,7 +874,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -894,7 +894,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -914,7 +914,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -934,7 +934,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -954,7 +954,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -974,7 +974,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -994,7 +994,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1014,7 +1014,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1034,7 +1034,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1054,7 +1054,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1074,7 +1074,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1094,7 +1094,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1114,7 +1114,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1134,7 +1134,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1150,11 +1150,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000BD000000E8020000</Data> + <Data>03000000660000001C01000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>220000003900000005010000F5010000</Data> </RectRecentFloat> </Window> <Window> @@ -1170,11 +1170,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>03000000240300002001000024030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -1190,11 +1190,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>03000000240300002001000024030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>220000003900000005010000F5010000</Data> </RectRecentFloat> </Window> <Window> @@ -1214,7 +1214,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1234,7 +1234,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1250,11 +1250,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>03000000240300002001000024030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>220000003900000005010000F5010000</Data> </RectRecentFloat> </Window> <Window> @@ -1270,11 +1270,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000001C0300007D070000CD030000</Data> + <Data>03000000240300002001000024030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>220000003900000005010000F5010000</Data> </RectRecentFloat> </Window> <Window> @@ -1294,7 +1294,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>22000000390000005A020000A7000000</Data> </RectRecentFloat> </Window> <Window> @@ -1314,7 +1314,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1334,7 +1334,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1354,7 +1354,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1374,7 +1374,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1394,7 +1394,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1414,7 +1414,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1434,7 +1434,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1454,7 +1454,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1474,7 +1474,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1494,7 +1494,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1514,7 +1514,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1534,7 +1534,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1554,7 +1554,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1574,7 +1574,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1594,7 +1594,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <Window> @@ -1614,7 +1614,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</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>00000000E603000080070000F9030000</Data> + <Data>000000000E0300000006000021030000</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> @@ -1794,19 +1794,19 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>2200000039000000E2000000D9000000</Data> </RectRecentFloat> </Window> <DockMan> <Len>3312</Len> - <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000DAFCFFFF2EFCFFFF860000009CFCFFFFC40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000C6FFFFFF2EFCFFFF8600000084FDFFFFB00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000001030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000016FCFFFF2EFCFFFFD6FCFFFFE0FEFFFF000000004F000000C0000000010300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000016FCFFFF74FDFFFF86000000F6FDFFFF0000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000001030000800700000503000001000000010000100400000001000000E0FCFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000016FCFFFFE4FEFFFF96030000C5FFFFFF000000000503000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000FF0100005C020000AB050000CA020000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000EB0400005C020000AB050000B2030000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF1F0100004F00000023010000090300000100000002000010040000000100000042FFFFFF37050000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000016FCFFFF2EFCFFFF93FDFFFF53FFFFFF000000004F0000001F010000090300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000003B010000A2030000AB050000240400000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000009030000000600000D030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000016FCFFFF57FFFFFF96030000C5FFFFFF000000000D030000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2946</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001446494E414C5F52585F54494D454F55545F555553960000000000000014001446494E414C5F52585F54494D454F55545F5555530C74696D655F6D6F6E69746F720E554152545F436865636B53656E64146D5F624555415254436865636B696E6753656E640D554152545F506F704672616D650E554152545F507573684672616D651145554152545F54585F46524D5F53495A451445554152545F54585F46524D4255465F53495A4509444D415F49545F54430945554152545F444D41104558554152545F5553455F5458444D410474696D6D0274690A7374617475735F726567106477745F736574696E74657272757074094C45445F54425F4F4E3E2048414C5F4750494F5F577269746550696E284C4544315F475F4750494F5F506F72742C204C4544315F475F50696E2C204750494F5F50494E5F534554290B4241534553594E43534551046C656E70074C45445F4C525F0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2922</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D68617264776172655F74797065960000000000000014000D68617264776172655F7479706509494D555F54485245531173616C7665626173655F6D696E6469737404307832310B675F5265737474696D65720E6477745F727863616C6C6261636B0E6477745F747863616C6C6261636B04706F6C6C0A726573705F72785F747311675F73746172745F73796E635F666C61670E7461676F66666C696E6574696D650F6865617274626561745F74696D65720B74696D6533325F696E63720E73796E636C6F73745F636F756E740C416E63686F725F5374617274094C45445F54425F4F4E3E2048414C5F4750494F5F577269746550696E284C4544315F475F4750494F5F506F72742C204C4544315F475F50696E2C204750494F5F50494E5F534554290B4241534553594E43534551046C656E70074C45445F4C525F0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -1821,8 +1821,8 @@ <RegID>59399</RegID> <Name>Build</Name> <Buttons> - <Len>970</Len> - <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> + <Len>988</Len> + <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000E426F6F744C6F616465724C343331960000000000000001000E426F6F744C6F616465724C343331000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000</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> @@ -1871,11 +1871,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>250100004F00000017060000BE000000</Data> + <Data>E80000004F0000000104000050000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3BFDFFFF2EFCFFFF2D0200009DFCFFFF</Data> + <Data>E8000000660000000104000067000000</Data> </RectRecentFloat> </Window> <Window> @@ -1891,11 +1891,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000001E0100007D020000</Data> + <Data>0300000066000000E100000031020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -1911,11 +1911,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000001E0100007D020000</Data> + <Data>0300000066000000E100000031020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -1931,11 +1931,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -1951,11 +1951,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -1971,11 +1971,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -1991,11 +1991,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2015,7 +2015,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2031,11 +2031,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2051,11 +2051,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2071,11 +2071,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2091,11 +2091,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2111,11 +2111,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2131,11 +2131,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2151,11 +2151,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2171,11 +2171,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2191,11 +2191,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000001E0100007D020000</Data> + <Data>0300000066000000E100000031020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -2211,11 +2211,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000001E0100007D020000</Data> + <Data>0300000066000000E100000031020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -2231,17 +2231,17 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> <RegID>198</RegID> <PaneID>198</PaneID> - <IsVisible>1</IsVisible> + <IsVisible>0</IsVisible> <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> @@ -2251,11 +2251,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000009A020000170600001C030000</Data> + <Data>00000000A5020000DD04000009030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2267,15 +2267,15 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentFrameAlignment>32768</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2291,11 +2291,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>250100006300000017060000BE000000</Data> + <Data>E8000000630000000104000063000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2311,11 +2311,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2355,7 +2355,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2371,11 +2371,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2391,11 +2391,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2411,11 +2411,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2431,11 +2431,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2451,11 +2451,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2475,7 +2475,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2495,7 +2495,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2515,7 +2515,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2535,7 +2535,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2555,7 +2555,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2575,7 +2575,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2595,7 +2595,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2615,7 +2615,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2635,7 +2635,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2655,7 +2655,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2675,7 +2675,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2695,7 +2695,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2715,7 +2715,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2735,7 +2735,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2755,7 +2755,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2775,7 +2775,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2795,7 +2795,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2815,7 +2815,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2835,7 +2835,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2855,7 +2855,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2875,7 +2875,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -2891,11 +2891,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000001E0100007D020000</Data> + <Data>0300000066000000E100000031020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -2907,15 +2907,15 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentFrameAlignment>32768</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -2927,15 +2927,15 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentFrameAlignment>32768</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -2951,11 +2951,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2971,11 +2971,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <Window> @@ -2987,15 +2987,15 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentFrameAlignment>32768</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -3007,15 +3007,15 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentFrameAlignment>32768</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000003703000014060000CD030000</Data> + <Data>0300000065020000FE030000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000A101000091020000</Data> + <Data>3C000000530000001F0100000F020000</Data> </RectRecentFloat> </Window> <Window> @@ -3031,11 +3031,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>280100006600000014060000A5000000</Data> + <Data>EB00000066000000FE03000066000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D5000000F602000043010000</Data> + <Data>3C0000005300000074020000C1000000</Data> </RectRecentFloat> </Window> <Window> @@ -3055,7 +3055,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3075,7 +3075,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3095,7 +3095,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3115,7 +3115,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3135,7 +3135,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3155,7 +3155,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3175,7 +3175,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3195,7 +3195,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3215,7 +3215,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3235,7 +3235,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3255,7 +3255,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3275,7 +3275,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3295,7 +3295,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3315,7 +3315,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3335,7 +3335,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3355,7 +3355,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3375,7 +3375,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3395,7 +3395,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3415,7 +3415,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3435,7 +3435,7 @@ </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>BE000000D50000007E01000075010000</Data> + <Data>3C00000053000000FC000000F3000000</Data> </RectRecentFloat> </Window> <Window> @@ -3471,7 +3471,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000E603000080070000F9030000</Data> + <Data>000000000E0300000006000021030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3511,7 +3511,7 @@ <RecentRowIndex>2</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>050000001C0000007402000038000000</Data> + <Data>000000001C0000006F02000038000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3531,23 +3531,23 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>1E060000660000007D070000CD030000</Data> + <Data>0804000066000000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>21020000E8FDFFFFDD0500006AFEFFFF</Data> + <Data>38050000A50100003408000027020000</Data> </RectRecentFloat> </Window> <DockMan> <Len>3415</Len> - <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFF25010000BE00000017060000C20000000100000001000010040000000100000094FFFFFF28020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000010000003BFDFFFF2EFCFFFF2D0200009DFCFFFF250100004F00000017060000BE0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000C6FFFFFF2EFCFFFF8600000084FDFFFFB00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF210100004F00000025010000960200000100000002000010040000000100000042FFFFFFB7060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000016FCFFFF2EFCFFFF37FDFFFF75FEFFFF000000004F00000021010000960200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000096020000170600009A02000001000000010000100400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFC0030000F2020000C40300007403000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000001C03000017060000200300000100000001000010040000000100000053FDFFFF6C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000016FCFFFFFFFEFFFF2D020000C5FFFFFF000000002003000017060000E60300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF170600004F0000001B060000E603000001000000020000100400000001000000DBFCFFFF2B03000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800040000001000000310200002EFCFFFF96030000C5FFFFFF1B0600004F00000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000000000000000000</Data> + <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFFE8000000500000000104000054000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000E8000000660000000104000067000000E80000004F00000001040000500000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFE40000004F000000E80000004A0200000100000002000010040000000100000001000000D3040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000E400000061020000000000004F000000E40000004A0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000A1020000DD040000A502000000000000010000000400000001000000E0FCFFFFFFFFFFFF00000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFF000300002802000004030000AA02000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000004A020000010400004E0200000100000001000010040000000100000067FEFFFF16010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000650200000104000025030000000000004E020000010400000E0300000000000040820056060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365010000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF010400004F000000050400000E03000001000000020000100400000001000000A4FCFFFFB101000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180004000000100000005040000660000000006000025030000050400004F000000000600000E03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2946</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001446494E414C5F52585F54494D454F55545F555553960000000000000014001446494E414C5F52585F54494D454F55545F5555530C74696D655F6D6F6E69746F720E554152545F436865636B53656E64146D5F624555415254436865636B696E6753656E640D554152545F506F704672616D650E554152545F507573684672616D651145554152545F54585F46524D5F53495A451445554152545F54585F46524D4255465F53495A4509444D415F49545F54430945554152545F444D41104558554152545F5553455F5458444D410474696D6D0274690A7374617475735F726567106477745F736574696E74657272757074094C45445F54425F4F4E3E2048414C5F4750494F5F577269746550696E284C4544315F475F4750494F5F506F72742C204C4544315F475F50696E2C204750494F5F50494E5F534554290B4241534553594E43534551046C656E70074C45445F4C525F0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2965</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000864656C61795F6D73960000000000000014000D506F7765725F494E545F4953520F506F73747572655F494E545F4953520C6261745F70657263656E7432000864656C61795F6D7321534F434B45545F53544154455F434C4F53455F4245464F52455F434F4E4E4543544420202020696628534F434B45545F53544154455F434C4F53455F4245464F52455F434F4E4E454354203D3D20707374536F636B6574446174612D3E6D5F655374617465291B534F434B45545F53544154455F434F4E4E4543545F4641494C4544064543363030530C4543363030534950506F6C6C12534F434B45545F53544154455F434C4F5345064661696C6564106C5F693332544350436C69656E7449440D536F636B65745F437265617465043E3D2033114543363030535F4556454E545F4F50454E033C20331B534F434B45545F4556454E545F434F4E4E4543545F4641494C4544033E3D3313454336303053536F636B6574436F6E6E6563740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -3563,7 +3563,7 @@ <Name>Build</Name> <Buttons> <Len>955</Len> - <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> + <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> </Buttons> <OriginalItems> <Len>583</Len> @@ -3579,7 +3579,7 @@ <Name>Debug</Name> <Buttons> <Len>2362</Len> - <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> + <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> @@ -3603,12 +3603,12 @@ <ActiveMDIGroup>0</ActiveMDIGroup> <MDIGroup> <Size>100</Size> - <ActiveTab>7</ActiveTab> + <ActiveTab>4</ActiveTab> <Doc> <Name>..\Src\OnChipDevices\Usart.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>418</TopLine> - <CurrentLine>433</CurrentLine> + <TopLine>421</TopLine> + <CurrentLine>454</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3616,7 +3616,7 @@ <Doc> <Name>..\Src\OnChipDevices\Usart.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>17</TopLine> + <TopLine>20</TopLine> <CurrentLine>38</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3625,7 +3625,7 @@ <Doc> <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c</Name> <ColumnNumber>18</ColumnNumber> - <TopLine>305</TopLine> + <TopLine>320</TopLine> <CurrentLine>319</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3634,7 +3634,7 @@ <Doc> <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_dma.h</Name> <ColumnNumber>19</ColumnNumber> - <TopLine>210</TopLine> + <TopLine>230</TopLine> <CurrentLine>229</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3642,18 +3642,18 @@ </Doc> <Doc> <Name>..\Src\main.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>195</TopLine> - <CurrentLine>214</CurrentLine> + <ColumnNumber>10</ColumnNumber> + <TopLine>100</TopLine> + <CurrentLine>114</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name>..\Src\application\dw_app.c</Name> - <ColumnNumber>11</ColumnNumber> - <TopLine>931</TopLine> - <CurrentLine>945</CurrentLine> + <ColumnNumber>8</ColumnNumber> + <TopLine>659</TopLine> + <CurrentLine>660</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3661,7 +3661,7 @@ <Doc> <Name>..\Src\OnChipDevices\Spi.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>131</TopLine> + <TopLine>134</TopLine> <CurrentLine>161</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3669,18 +3669,18 @@ </Doc> <Doc> <Name>..\Src\stm32f10x_it.c</Name> - <ColumnNumber>3</ColumnNumber> - <TopLine>132</TopLine> - <CurrentLine>166</CurrentLine> + <ColumnNumber>2</ColumnNumber> + <TopLine>75</TopLine> + <CurrentLine>76</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name>..\Src\decadriver\deca_device.c</Name> - <ColumnNumber>19</ColumnNumber> - <TopLine>957</TopLine> - <CurrentLine>982</CurrentLine> + <ColumnNumber>10</ColumnNumber> + <TopLine>2449</TopLine> + <CurrentLine>2448</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3688,7 +3688,7 @@ <Doc> <Name>..\Src\ExternalDevices\dw_driver.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>55</TopLine> + <TopLine>86</TopLine> <CurrentLine>91</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3697,7 +3697,7 @@ <Doc> <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>211</TopLine> + <TopLine>225</TopLine> <CurrentLine>224</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3705,8 +3705,8 @@ </Doc> <Doc> <Name>..\Src\decadriver\deca_device_api.h</Name> - <ColumnNumber>43</ColumnNumber> - <TopLine>1411</TopLine> + <ColumnNumber>46</ColumnNumber> + <TopLine>1425</TopLine> <CurrentLine>1424</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3715,7 +3715,7 @@ <Doc> <Name>..\Src\Libraries\CMSIS\CM3\CoreSupport\core_cm3.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>1502</TopLine> + <TopLine>1516</TopLine> <CurrentLine>1515</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> @@ -3732,9 +3732,45 @@ </Doc> <Doc> <Name>..\Src\application\dw_app.h</Name> - <ColumnNumber>33</ColumnNumber> - <TopLine>54</TopLine> - <CurrentLine>67</CurrentLine> + <ColumnNumber>0</ColumnNumber> + <TopLine>82</TopLine> + <CurrentLine>81</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\serial_at_cmd_app.c</Name> + <ColumnNumber>40</ColumnNumber> + <TopLine>163</TopLine> + <CurrentLine>162</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\global_param.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>21</TopLine> + <CurrentLine>20</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\decadriver\deca_regs.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>258</TopLine> + <CurrentLine>257</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\arm\startup_stm32f10x_md.s</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>150</TopLine> + <CurrentLine>148</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" index 8c53990..d7271d2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" @@ -285,6 +285,61 @@ <WinNumber>1</WinNumber> <ItemText>ttt</ItemText> </Ww> + <Ww> + <count>24</count> + <WinNumber>1</WinNumber> + <ItemText>pwtag.remain_time</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>pwtag</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>status_reg</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>Ra</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>Rb</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>Da</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>Db</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>resp_rx_ts,0x0A</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>poll_tx_ts,0x0A</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>goodtimes,0x0A</ItemText> + </Ww> + <Ww> + <count>34</count> + <WinNumber>1</WinNumber> + <ItemText>errortimes,0x0A</ItemText> + </Ww> </WatchWindow1> <MemoryWindow1> <Mm> @@ -668,7 +723,7 @@ <Group> <GroupName>STM32F1xx_StdPeriph_Driver</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s" index 74da96c..f95553e 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/Libraries/CMSIS/CM3/DeviceSupport/ST/STM32F10x/startup/arm/startup_stm32f10x_md.s" @@ -8,7 +8,7 @@ ;* This module performs: ;* - Set the initial SP ;* - Set the initial PC == Reset_Handler -;* - Set the vector table entries with the exceptions ISR address +;* - Set the vector table entries with the exceptions ssISR address ;* - Configure the clock system ;* - Branches to __main in the C library (which eventually ;* calls main()). diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" index a75e8ea..699c256 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.c" @@ -7,7 +7,7 @@ NEARPOLL, }tag_state=GETNEARMSG; static dwt_config_t config = { - 5, /* Channel number. */ + 2, /* Channel number. */ DWT_PRF_64M, /* Pulse repetition frequency. */ DWT_PLEN_64, /* Preamble length. */ DWT_PAC8, /* Preamble acquisition chunk size. Used in RX only. */ @@ -31,9 +31,6 @@ uint32_t frame_seq_nb = 0, frame_seq_nb2 = 0; static uint32_t status_reg = 0; static uint8_t rx_buffer[100]; -static uint64_t poll_tx_ts; -static uint64_t resp_rx_ts; -static uint64_t final_tx_ts; static uint64_t poll_rx_ts; static uint64_t resp_tx_ts; static uint64_t final_rx_ts; @@ -101,10 +98,7 @@ void TagDistClear(void) { static uint16_t clear_judge_cnt; - uint16_t i; - if(clear_judge_cnt++>1000) //设定1S分频,每秒进一次。判断标志位大于等于2,2s没收到数据就把数据变成0xffff,不触发警报。 - { - clear_judge_cnt=0; + uint16_t i; for(i=0;i<255;i++) { g_flag_Taggetdist[i]++; @@ -113,7 +107,6 @@ tagdist_list[i]=0x1ffff; } } - } } void Dw1000_Init(void) { @@ -179,7 +172,7 @@ u8 g_start_sync_flag; void SyncPoll(u8 sync_seq) {u8 result; - g_start_sync_flag=1; //中断模式,退出终端后,需要重新来过 +// g_start_sync_flag=1; //中断模式,退出终端后,需要重新来过 dwt_forcetrxoff(); //关闭接收,以防在RX ON 状态 @@ -193,7 +186,10 @@ while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成 { }; } - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清楚标志位 + dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清楚标志位 + + dwt_setrxtimeout(0);//设定接收超时时间,0位没有超时时间 + dwt_rxenable(0);//打开接收 } uint16_t g_Resttimer; uint8_t result; @@ -334,483 +330,8 @@ // min_power = - 10 * log10((F1 *F1 + F2 * F2 + F3 * F3) / (C *B)); return min_power; } -void Poll(void) -{ - uint32_t frame_len; - uint32_t final_tx_time; - u32 start_poll; - int32_t mindist=999999,minid=-1,temp_dist; - u8 i,getsync_flag=0; - dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收,并设定延迟时间 - dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS); - tag_succ_times = 0; - GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET); - for(i=0;i<g_com_map[MAX_REPORT_ANC_NUM];i++) - { - /* Write frame data to DW1000 and prepare transmission. See NOTE 7 below. */ - tx_poll_msg[ANC_TYPE_IDX] = i; - dwt_writetxdata(sizeof(tx_poll_msg), tx_poll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 - dwt_writetxfctrl(sizeof(tx_poll_msg), 0);//设置超宽带发送数据长度 - dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置 - start_poll = time32_incr; - /* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */ - while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误 - { if(time32_incr - start_poll>20) - NVIC_SystemReset(); - }; - if(status_reg==0xffffffff) - { - NVIC_SystemReset(); - } - if (status_reg & SYS_STATUS_RXFCG)//如果成功接收 - { - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位 - frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度 - dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据 - if (rx_buffer[MESSAGE_TYPE_IDX] == RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据 - { - poll_tx_ts = get_tx_timestamp_u64(); //获得POLL发送时间T1 - resp_rx_ts = get_rx_timestamp_u64(); //获得RESPONSE接收时间T4 - if(getsync_flag==0) - { - getsync_flag=1; - memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2); - memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2); - memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2); - tmp_time=tmp_time+450; - if(tmp_time>999) - { - tmp_time-=999; - sync_timer++; - if(sync_timer>=1010) - {sync_timer=0;} - } - TIM3->CNT=tmp_time; - if(tagslotpos>max_slotpos) - tagslotpos=tagslotpos%(max_slotpos+1); - tyncpoll_time=(tagslotpos-1)*slottime; - } - - memcpy(&temp_dist, &rx_buffer[DIST_IDX], 4); - memcpy(&tx_final_msg[ANCHOR_ID_IDX], &rx_buffer[ANCHOR_ID_IDX], 4); - /* Compute final message transmission time. See NOTE 9 below. */ - final_tx_time = (resp_rx_ts + (RESP_RX_TO_FINAL_TX_DLY_UUS * UUS_TO_DWT_TIME)) >> 8;//计算final包发送时间,T5=T4+Treply2 - dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 - final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay - final_msg_set_ts(&tx_final_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据 - final_msg_set_ts(&tx_final_msg[FINAL_MSG_RESP_RX_TS_IDX], resp_rx_ts); - final_msg_set_ts(&tx_final_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts); - dwt_writetxdata(sizeof(tx_final_msg), tx_final_msg, 0);//将发送数据写入DW1000 - dwt_writetxfctrl(sizeof(tx_final_msg), 0);//设定发送数据长度 - result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - tag_succ_times++; - LED0_BLINK; - - if(temp_dist<mindist) - { - memcpy(&minid, &rx_buffer[ANCHOR_ID_IDX], 4); - tag_state=GETNEARMSG; - trygetnearmsg_times=5; - mindist=temp_dist; - } - if(result==0) - {while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成 - { }; - } - /* Clear TXFRS event. */ - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清除标志位 - random_delay_tim = 0; - } - else - { - random_delay_tim = DFT_RAND_DLY_TIM_MS; //如果通讯失败,将间隔时间增加5ms,避开因为多标签同时发送引起的冲突。 - } - } - else - { - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR); - random_delay_tim = DFT_RAND_DLY_TIM_MS; - } -} - if(getsync_flag==0) - { - tagslotpos--; - if(tagslotpos==0||tagslotpos>max_slotpos) - { - tagslotpos=max_slotpos; - } - tyncpoll_time=(tagslotpos-1)*slottime; - } - mainbase_id=minid; -} + u8 nearmsg_mainbase=0,rec_tagpos_emptylist[32]; -void GetNearMsg(void) -{ - u32 start_poll,frame_len; - - memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2); - memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2); - tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG; - - dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收,并设定延迟时间 - dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS); - dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 - dwt_writetxfctrl(12, 0);//设置超宽带发送数据长度 - dwt_starttx(DWT_START_TX_IMMEDIATE| DWT_RESPONSE_EXPECTED); - start_poll = time32_incr; - /* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */ - while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误 - { if(time32_incr - start_poll>20) - NVIC_SystemReset(); - }; - if(status_reg==0xffffffff) - { - NVIC_SystemReset(); - } - if (status_reg & SYS_STATUS_RXFCG)//如果成功接收 - { - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位 - frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度 - dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据 - if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据 - { - next_nearbase_num=rx_buffer[NEARBASENUM_INDEX]; - memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4); - tagslotpos=GetRandomSlotPos(rec_tagpos_binary); - //tagslotpos=rx_buffer[TAGSLOTPOS]; - memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],next_nearbase_num*2); - //slottime=ceil((nearbase_num+2)*0.4)+2; - tyncpoll_time=tagslotpos*slottime; - tag_state=NEARPOLL; - }else{ - tyncpoll_time = (tagslotpos--%max_slotpos)*slottime; - } - }else{ - tyncpoll_time = (tagslotpos--%max_slotpos)*slottime; - } - -} - void NearPoll(void) -{ - static u8 mainbase_lost_count=0,flag_finalsend,flag_rxon; - uint32_t temp1,temp2,dw_systime; - uint32_t frame_len; - uint32_t final_tx_time; - u32 start_poll; - u8 i,j,getsync_flag=0,timeout; -// printf("%d",sync_timer); - dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收,并设定延迟时间 - dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS); - tag_succ_times = 0; - GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET); - if(next_nearbase_num>=MAX_NEARBASE_NUM) - { - next_nearbase_num = MAX_NEARBASE_NUM-1; - } - //nearbase_num=0; - last_nearbase_num=next_nearbase_num; - nearbase_num=next_nearbase_num; - recbase_num=0; - tx_nearpoll_msg[BATTARY_IDX] = Get_Battary(); - tx_nearpoll_msg[BUTTON_IDX] = !READ_KEY0; - tx_nearpoll_msg[SEQUENCE_IDX] = frame_seq_nb++; - tx_nearpoll_msg[NEARBASENUM_INDEX] = nearbase_num; - memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX],&nearbaseid_list,nearbase_num*2); - tx_nearpoll_msg[MESSAGE_TYPE_IDX] = NEAR_POLL; - memcpy(&tx_nearpoll_msg[ANCHOR_ID_IDX],&mainbase_id,2); - dwt_writetxdata(13+2*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 - dwt_writetxfctrl(13+2*nearbase_num, 0);//设置超宽带发送数据长度 - dwt_starttx(DWT_START_TX_IMMEDIATE | DWT_RESPONSE_EXPECTED);//开启发送,发送完成后等待一段时间开启接收,等待时间在dwt_setrxaftertxdelay中设置 - - flag_finalsend=0; - flag_rxon=1; - neartimout_timer=0; - get_newbase=0; - timeout=ceil((float)nearbase_num*SLOT_SCALE)+2; - //timeout=5; - mainbase_dist=100000; - mainbase_lost_count++; - while(neartimout_timer<timeout) - { - while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误 - { - if(flag_finalsend) - { - dw_systime=dwt_readsystimestamphi32(); - if(dw_systime>temp1&&dw_systime<temp2) - { - flag_finalsend=0; - flag_rxon=0; - dwt_forcetrxoff(); - dwt_setdelayedtrxtime(final_tx_time); - result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - #ifdef DEBUG_INF - USART_putc(0x33); - #endif - break; - } - } - if(neartimout_timer>timeout) - break; - }; - if(status_reg==0xffffffff) - { - NVIC_SystemReset(); - } - if (status_reg & SYS_STATUS_RXFCG)//如果成功接收 - { - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位 - frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度 - dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据 - dwt_setrxtimeout(0);//DELAY_BETWEEN_TWO_FRAME_UUS*(nearbase_num+1-recbase_num)+10);//设定接收超时时间,0位没有超时时间 - dwt_rxenable(0);//打开接收 - if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_RESPONSE&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据 - { u16 rec_nearbaseid,rec_nearbasepos; - int32_t temp_dist; - poll_tx_ts = get_tx_timestamp_u64(); //获得POLL发送时间T1 - resp_rx_ts = get_rx_timestamp_u64(); //获得RESPONSE接收时间T4 - recbase_num++; - memcpy(&rec_nearbaseid,&rx_buffer[ANCHOR_ID_IDX],2); - - if(rec_nearbaseid==mainbase_id) - { - //////////////////////////////////时间同步 - temp_sync_timer2=sync_timer; - memcpy(&temp_sync_timer1,&rx_buffer[ANCTIMEMS],2); - memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2); - - - if(g_com_map[DEV_ROLE]!=0) - { - sync_timer=temp_sync_timer1; -//// memcpy(&tagslotpos,&rx_buffer[TAGSLOTPOS],2); -// - - tmp_time=tmp_time+650; - if(tmp_time>999) - { - tmp_time-=999; - sync_timer++; - if(sync_timer>=1000) - {sync_timer=0;} - } - TIM3->CNT=tmp_time; - } - current_slotnum=temp_sync_timer1/g_com_map[COM_INTERVAL]; -// if(tagslotpos>max_slotpos) -// tagslotpos=tagslotpos%(max_slotpos+1); -// tyncpoll_time=(tagslotpos-1)*slottime; - //////////////////////////// - #ifdef DEBUG_INF - USART_putc(0x31); - #endif - rec_nearbasepos=0; - - memcpy(&temp_dist,&rx_buffer[DIST_IDX],4); - mainbase_dist = temp_dist; - if(temp_dist!=0x1ffff) - exsistbase_list[rec_nearbasepos]=KEEP_TIMES; - - mainbase_lost_count=0; - flag_finalsend=1; - final_tx_time = (resp_rx_ts + ((RESP_RX_TO_FINAL_TX_DLY_UUS+DELAY_BETWEEN_TWO_FRAME_UUS*nearbase_num+500) * UUS_TO_DWT_TIME)) >> 8; - temp1=final_tx_time-((350*UUS_TO_DWT_TIME)>>8); - temp2=final_tx_time+((100*UUS_TO_DWT_TIME)>>8); - // dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 - final_tx_ts = (((uint64_t)(final_tx_time & 0xFFFFFFFE)) << 8) + TX_ANT_DLY;//final包实际发送时间是计算时间加上发送天线delay - final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_POLL_TX_TS_IDX], poll_tx_ts);//将T1,T4,T5写入发送数据 - final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX], resp_rx_ts); - final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_FINAL_TX_TS_IDX], final_tx_ts); - tx_nearfinal_msg[MESSAGE_TYPE_IDX]=NEAR_FINAL; - dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000 - dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度 - memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4); - - }else{ - rec_nearbasepos=FindNearBasePos(rec_nearbaseid); - if(rec_nearbasepos>=last_nearbase_num) //发现新的基站 - { - get_newbase=1; - nearbase_num++; - nearbaseid_list[rec_nearbasepos] = rec_nearbaseid; - memcpy(&tx_nearfinal_msg[ANCHOR_ID_IDX],&rec_nearbaseid,2); - } - #ifdef DEBUG_INF - USART_putc(0x32); - #endif - memcpy(&temp_dist,&rx_buffer[DIST_IDX],4); - nearbase_distlist[rec_nearbasepos]=temp_dist; - - if(temp_dist!=0x1ffff) - exsistbase_list[rec_nearbasepos]=KEEP_TIMES; - - final_msg_set_ts(&tx_nearfinal_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos)*4], resp_rx_ts); - dwt_writetxdata(28+nearbase_num*4, tx_nearfinal_msg, 0);//将发送数据写入DW1000 - dwt_writetxfctrl(28+nearbase_num*4, 0);//设定发送数据长度 - LED0_BLINK; -// memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4); -// tagslotpos=GetRandomSlotPos(rec_tagpos_binary); - if(temp_dist!=0x1ffff) - { - #ifdef TAG_OUTPUT - #ifndef USART_INTEGRATE_OUTPUT - usart_send[2] = 1;//正常模式 - usart_send[3] = 17;//数据段长度 - usart_send[4] = frame_seq_nb;//数据段长度 - if(g_com_map[DEV_ROLE]) - { - memcpy(&usart_send[5],&dev_id,2); - memcpy(&usart_send[7],&rec_nearbaseid,2); - }else{ - memcpy(&usart_send[5],&rec_nearbaseid,2); - memcpy(&usart_send[7],&dev_id,2); - } - memcpy(&usart_send[9],&rx_buffer[DIST_IDX],4); - usart_send[13] = battary; - usart_send[14] = button; - checksum = Checksum_u16(&usart_send[2],17); - memcpy(&usart_send[19],&checksum,2); - UART_PushFrame(usart_send,21); - #endif - #endif - //dwt_setdelayedtrxtime(final_tx_time);//设置final包发送时间T5 - // result=dwt_starttx(DWT_START_TX_DELAYED);//设定为延迟发送 - //dwt_writetxdata(4,&tx_near_msg[FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4], FINAL_MSG_RESP_RX_NEARBASE_IDX+(rec_nearbasepos+1)*4);//将发送数据写入DW1000 - } - } - } - }else{ - #ifdef DEBUG_INF - printf("response包失败:%x/n",status_reg); - #endif - dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR); - if(flag_rxon) - {dwt_rxenable(0); - } - } - } - GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET); -// if(result==0) -// { -// while (!(dwt_read32bitreg(SYS_STATUS_ID) & SYS_STATUS_TXFRS))//不断查询芯片状态直到发送完成 -// { }; -// } -// dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_TXFRS);//清楚标志位 - - dwt_write32bitreg(SYS_STATUS_ID,SYS_STATUS_RXFCG| SYS_STATUS_ALL_RX_ERR); - nearbase_num=recbase_num; - j=0; - if(exsistbase_list[0]==0) - { -// u8 temp_adc,random_value; -// random_value=0; -// for(i=0;i<8;i++) -// { -// temp_adc=Get_ADC_Value(); -// random_value=random_value|((temp_adc&0x01)<<i); -// } - tagslotpos=GetRandomSlotPos(rec_tagpos_binary|tagpos_binary); - tyncpoll_time = (tagslotpos--%max_slotpos)*slottime; - tag_state=GETNEARMSG; - } - // tyncpoll_time=0; - next_nearbase_num=0; - for(i=0;i<last_nearbase_num+get_newbase;i++) - { - if(exsistbase_list[i]>0) - { - next_nearbase_num++; - true_exsistbase_list[j]=exsistbase_list[i]; - true_nearbase_idlist[j]=nearbaseid_list[i]; - true_nearbase_distlist[j++]=nearbase_distlist[i]; - exsistbase_list[i]--; - } - } - - if(recbase_num<3) - {next_nearbase_num=next_nearbase_num;} - last_nearbase_num = next_nearbase_num; - for(i=0;i<last_nearbase_num-1;i++) - { - for(j=0;j<last_nearbase_num-1;j++) - { - if(true_nearbase_distlist[j]>true_nearbase_distlist[j+1]) - { - u32 temp_dist,temp_id,temp_exsis; - temp_dist=true_nearbase_distlist[j]; - temp_id = true_nearbase_idlist[j]; - temp_exsis=true_exsistbase_list[i]; - true_nearbase_distlist[j]=true_nearbase_distlist[j+1]; - true_nearbase_idlist[j]=true_nearbase_idlist[j+1]; - true_exsistbase_list[j]=true_exsistbase_list[j+1]; - - true_nearbase_distlist[j+1]=temp_dist; - true_nearbase_idlist[j+1]=temp_id; - true_exsistbase_list[j+1]=temp_exsis; - } - } - } - - report_num=0; - - for(i=0;i<MAX_NEARBASE_NUM;i++) - { - nearbase_distlist[i]=0x1ffff; - } - - // printf("%d,%d",temp_sync_timer2,temp_sync_timer1); - #ifdef USART_INTEGRATE_OUTPUT - usart_send[2] = 4;//正常模式 - usart_send[3] = report_num*6+2;//正常模式 - checksum = Checksum_u16(&usart_send[2],report_num*6+2); - memcpy(&usart_send[4+report_num*6],&checksum,2); - UART_PushFrame(usart_send,6+report_num*6); - #endif - #ifdef DEBUG_INF - printf("序号:%d,基站数量:%d/n",(frame_seq_nb-1)&0xff,nearbase_num); - #endif -// if(mainbase_lost_count>5) -// { -// //tag_state=DISCPOLL; -// } -// NearAncSelect(); -// if(recbase_num<g_com_map[MIN_REPORT_ANC_NUM] ) -// { -// anclost_times++; -// if(anclost_times>3) -// { -// tagslotpos=poll_tx_ts%(max_slotpos+1); -// } -// }else{ -// anclost_times=0; -// } -dwt_forcetrxoff(); - dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR| SYS_STATUS_TXFRS |SYS_STATUS_RXFCG); -} - -void Tag_App(void)//发送模式(TAG标签) -{ - //LED0_ON; - dwt_forcetrxoff(); - g_Resttimer=0; - GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET); - switch(tag_state) - { - case DISCPOLL: - Poll(); - break; - case GETNEARMSG: - GetNearMsg(); - break; - case NEARPOLL: - NearPoll(); - break; - } - - SetNextPollTime(tyncpoll_time); - g_start_send_flag = 0; - GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET); -} int8_t correction_time,new_tagid=0; extern uint8_t sync_seq; @@ -954,6 +475,11 @@ extern u8 remotetag_paralen; u8 finalsend=0; u16 signalpower_list[TAG_NUM_IN_SYS]; +uint32_t poll_tx_ts, resp_rx_ts, final_tx_ts; +uint32_t poll_rx_ts_32, resp_tx_ts_32, final_rx_ts_32; +double Ra, Rb, Da, Db; +int64_t tof_dtu; +u32 errortimes,goodtimes; u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase 1 first near_base { @@ -1026,7 +552,7 @@ if(result==0) { - while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_sync_flag)///不断查询芯片状态直到接收成功或者出现错误 + while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))///不断查询芯片状态直到接收成功或者出现错误 { }; }else{ result++; @@ -1044,10 +570,7 @@ } if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_FINAL&&!memcmp(&rx_buffer[TAG_ID_IDX],&tag_id_recv,2)) //判断是否为Final包 { - uint32_t poll_tx_ts, resp_rx_ts, final_tx_ts; - uint32_t poll_rx_ts_32, resp_tx_ts_32, final_rx_ts_32; - double Ra, Rb, Da, Db; - int64_t tof_dtu; + resp_tx_ts = get_tx_timestamp_u64();//获得response发送时间T3 final_rx_ts = get_rx_timestamp_u64();//获得final接收时间T6 @@ -1071,9 +594,9 @@ distance = tof * SPEED_OF_LIGHT;//距离=光速*飞行时间 dist_no_bias = distance - dwt_getrangebias(config.chan, (float)distance, config.prf); //距离减去矫正系数 dist_cm = dist_no_bias * 100; //dis 为单位为cm的距离 - // dwt_readdiagnostics(&d1); + dwt_readdiagnostics(&d1); // time_monitor[2] = sync_timer*1000+TIM3->CNT; - // LOS(&d1); + LOS(&d1); // time_monitor[3] = sync_timer*1000+TIM3->CNT; /*--------------------------以下为非测距逻辑------------------------*/ //dist_cm=33000; @@ -1087,40 +610,44 @@ g_flag_Taggetdist[taglist_pos]=0; if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3) { + goodtimes++; misdist_num[taglist_pos]=0; tagdist_list[taglist_pos] = hex_dist; his_dist[taglist_pos]=hex_dist; g_Tagdist[taglist_pos]=hex_dist; signalpower_list[taglist_pos] = ((uint8_t)firstpath_power<<8)|(uint8_t)((rx_power-firstpath_power)*10); - #ifndef USART_INTEGRATE_OUTPUT - usart_send[2] = 1;//正常模式 - usart_send[3] = 17;//数据段长度 - usart_send[4] = frame_seq_nb2;//数据段长度 - memcpy(&usart_send[5],&tag_id_recv,2); - memcpy(&usart_send[7],&dev_id,2); - memcpy(&usart_send[9],&tagdist_list[taglist_pos],4); - usart_send[13] = battary; - usart_send[14] = button; - usart_send[15] = firstpath_power; - usart_send[16] = (rx_power-firstpath_power)*10; - usart_send[17] = tag_frequency; - usart_send[18] = tag_slotpos; - checksum = Checksum_u16(&usart_send[2],17); - memcpy(&usart_send[19],&checksum,2); - // UART_PushFrame(usart_send,21); - #else - memcpy(&usart_send_anc[4+6*anc_report_num],&tag_id_recv,2); - memcpy(&usart_send_anc[6+6*anc_report_num],&tagdist_list[taglist_pos],4); - anc_report_num++; - #endif - #ifdef DEBUG_INF - printf("序号:%d\r\n",frame_seq_nb2); - #endif +// #ifndef USART_INTEGRATE_OUTPUT +// usart_send[2] = 1;//正常模式 +// usart_send[3] = 17;//数据段长度 +// usart_send[4] = frame_seq_nb2;//数据段长度 +// memcpy(&usart_send[5],&tag_id_recv,2); +// memcpy(&usart_send[7],&dev_id,2); +// memcpy(&usart_send[9],&tagdist_list[taglist_pos],4); +// usart_send[13] = battary; +// usart_send[14] = button; +// usart_send[15] = firstpath_power; +// usart_send[16] = (rx_power-firstpath_power)*10; +// usart_send[17] = tag_frequency; +// usart_send[18] = tag_slotpos; +// checksum = Checksum_u16(&usart_send[2],17); +// memcpy(&usart_send[19],&checksum,2); +// // UART_PushFrame(usart_send,21); +// #else +// memcpy(&usart_send_anc[4+6*anc_report_num],&tag_id_recv,2); +// memcpy(&usart_send_anc[6+6*anc_report_num],&tagdist_list[taglist_pos],4); +// anc_report_num++; +// #endif +// #ifdef DEBUG_INF +// printf("序号:%d\r\n",frame_seq_nb2); +// #endif }else{ // printf("%d",hex_dist); misdist_num[taglist_pos]++; } - } + }else{ + errortimes++; + usart_send[13] = battary; + } if(rx_buffer[TAGCONFIGSUCCESS_INDEX]==1) { @@ -1292,7 +819,7 @@ synclost_count = 0; flag_syncbase=0; sync_seq=rx_buffer[SYNC_SEQ_IDX]+1; - TIM3->CNT = (sync_seq*325%1000)-80; + TIM3->CNT = (sync_seq*325%1000)-27; sync_timer = (sync_seq*325/1000); synclost_timer=0; if(g_com_map[BASESYNCSEQ]==2) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" index 37bc3c7..7bf29c2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.c" @@ -54,6 +54,7 @@ memcpy(&g_com_map[BOARD_TYPE],boardtype,4); //save_com_map_to_flash(); } - + // g_com_map[BASESYNCSEQ] = 1; + //g_com_map[SYNCBASEID] = 0x9801; } 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 175b9b4..1fcab1c 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" @@ -96,7 +96,7 @@ #endif OUT485_ENABLE; ComMapCheck(); - g_com_map[VERSION] = 0x021e; + g_com_map[VERSION] = 0x022b; dev_id = g_com_map[DEV_ID]; slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3; max_slotpos=g_com_map[COM_INTERVAL]/slottime; @@ -162,6 +162,12 @@ memcpy(&hbsend[14],&checksum,2); UART_PushFrame(hbsend,16); } +u32 onesecondtimer; +void OneSecondTask(void) +{ + TagListUpdate(); + TagDistClear(); +} extern u8 g_start_sync_flag,usart_send_flag,anc_report_num; u16 heartbeat_timer=58,poll_timer; int16_t sync_timer; @@ -188,6 +194,11 @@ if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0) HeatBeat(); } + if(time32_incr-onesecondtimer>=1000) + { + onesecondtimer = time32_incr; + OneSecondTask(); + } // if(flag_newsecond) // { // flag_newsecond=0; diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" index 4684280..a60802e 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" @@ -47,13 +47,13 @@ { TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx?????? // main_logic(); -// time32_incr++; + time32_incr++; // heartbeat_timer++; sync_timer++; // neartimout_timer++; // synclost_timer++; // GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_RESET); - GPIOA->BRR = GPIO_Pin_8; +GPIOA->BRR = GPIO_Pin_8; if(sync_timer==10) { GPIOA->BSRR = GPIO_Pin_8; @@ -74,21 +74,22 @@ flag_newsecond=1; // GPIO_WriteBit(GPIOA, GPIO_Pin_8, Bit_SET); sync_timer=0; -// synclost_count++; -// TagListUpdate(); -// if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站 -// { -// synclost_count = 0; -// current_syncid = 1; -// sync_seq=0; -// SyncPoll(sync_seq); -// } -// } + synclost_count++; + + if(g_Resttimer++>12) + { + NVIC_SystemReset(); + } + if(g_com_map[BASESYNCSEQ]==1) //本模块是同步基站 + { + synclost_count = 0; + current_syncid = 1; + sync_seq=0; + SyncPoll(sync_seq); + } + } // -// if(g_Resttimer++>12000) -// { -// NVIC_SystemReset(); -// } + @@ -121,7 +122,7 @@ // g_start_send_flag=1; // } // - } + } } @@ -152,10 +153,10 @@ { EXTI_ClearITPendingBit(EXTI_Line0); - // GPIOA->BSRR = GPIO_Pin_8; + //GPIOA->BSRR = GPIO_Pin_8; //if(ttt==0) Anchor_App(); - // GPIOA->BRR = GPIO_Pin_8; + //GPIOA->BRR = GPIO_Pin_8; } } void USART1_IRQHandler(void) -- Gitblit v1.9.3