From 7e864f1d0b26f0e5dd4c073f8fe764eb286fe961 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 06 五月 2021 12:59:59 +0800 Subject: [PATCH] 回退V1.41 无滤波 --- 源码/核心板/Src/application/dw_app.h | 3 源码/核心板/Src/application/global_param.c | 20 源码/核心板/Src/main.c | 69 +--- 源码/核心板/Src/application/serial_at_cmd_app.c | 3 源码/核心板/Src/stm32f10x_it.c | 2 源码/核心板/MDK-ARM/Project.uvoptx | 46 -- 源码/核心板/Src/application/global_param.h | 3 源码/核心板/MDK-ARM/Project.uvguix.Administrator | 806 +++++++++++++++++++++++++++------------------- 源码/核心板/Src/application/dw_app.c | 62 +-- 9 files changed, 522 insertions(+), 492 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" index 2965d1d..fd52bff 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" @@ -6,7 +6,7 @@ <Header>### uVision Project, (C) Keil Software</Header> <PrjGuiSettings> - <LastAddFilePath>E:\GIT\UWB_SmallModule\婧愮爜\鏍稿績鏉縗MDK-ARM</LastAddFilePath> + <LastAddFilePath>E:\GIT\UWB_SmallModule\婧愮爜\鏍稿績鏉縗Src\algorithm</LastAddFilePath> </PrjGuiSettings> <ViewPool/> @@ -15,17 +15,17 @@ <View> <WinId>38003</WinId> <ViewName>Registers</ViewName> - <TableColWidths>116 116</TableColWidths> + <TableColWidths>158 158</TableColWidths> </View> <View> <WinId>346</WinId> <ViewName>Code Coverage</ViewName> - <TableColWidths>770 160</TableColWidths> + <TableColWidths>610 160</TableColWidths> </View> <View> <WinId>204</WinId> <ViewName>Performance Analyzer</ViewName> - <TableColWidths>930</TableColWidths> + <TableColWidths>770</TableColWidths> </View> </SECTreeCtrl> @@ -93,8 +93,8 @@ <flags>2</flags> <showCmd>3</showCmd> <MinPosition> - <xPos>-32000</xPos> - <yPos>-32000</yPos> + <xPos>-1</xPos> + <yPos>-1</yPos> </MinPosition> <MaxPosition> <xPos>-1</xPos> @@ -110,8 +110,8 @@ <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>1547</Len> - <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E0000000D000000010000002D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000FFDC7800FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000BECEA100FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000F0A0A100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000BCA8E100FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E63000000009CC1B600FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000F7B88600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000D9ADC200FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000A5C2D700FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000B3A6BE00FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C466C6173682E630000000007466C6173682E6300000000EAD6A300FFFFFFFF47453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6300000000125263635F4E7669635F5379737469636B2E6300000000F6FA7D00FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F697764672E63000000001073746D3332663130785F697764672E6300000000B5E99D00FFFFFFFF7D453A5CD7CAC1CF5C494D555C53544D656D735F5374616E646172645F435F647269766572732D6D61737465725C53544D656D735F5374616E646172645F435F647269766572732D6D61737465725C6C736D366473725F535464435C6578616D706C65735C6C736D366473725F6D756C74695F726561645F6669666F2E6300000000196C736D366473725F6D756C74695F726561645F6669666F2E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F60000006600000000060000B3020000</Data> + <Len>3068</Len> + <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000001E000000040000000100000046453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000C5D4F200FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000BECEA100FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C7372635C73746D3332663130785F657874692E63000000001073746D3332663130785F657874692E6300000000F0A0A100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000BCA8E100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E68000000009CC1B600FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000F7B88600FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000D9ADC200FFFFFFFF3D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F726567732E68000000000B646563615F726567732E6800000000A5C2D700FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000B3A6BE00FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6800000000055370692E6800000000EAD6A300FFFFFFFF42453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C64775F6472697665722E63000000000B64775F6472697665722E6300000000F6FA7D00FFFFFFFF42453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C64775F6472697665722E68000000000B64775F6472697665722E6800000000B5E99D00FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E63000000005FC3CF00FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000C1838300FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000CACAD500FFFFFFFF78453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C446576696365537570706F72745C53545C53544D3332463130785C737461727475705C61726D5C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000C5D4F200FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C4144432E6800000000054144432E6800000000FFDC7800FFFFFFFF47453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6300000000125263635F4E7669635F5379737469636B2E6300000000BECEA100FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F6770696F2E68000000001073746D3332663130785F6770696F2E6800000000F0A0A100FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C6C65642E6300000000056C65642E6300000000BCA8E100FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C6C65642E6800000000056C65642E68000000009CC1B600FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000F7B88600FFFFFFFF5F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F7263632E68000000000F73746D3332663130785F7263632E6800000000D9ADC200FFFFFFFF3D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C45787465726E616C446576696365735C626565702E680000000006626565702E6800000000A5C2D700FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C4144432E6300000000054144432E6300000000B3A6BE00FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C616C676F726974686D5C547261636B696E67446966662E63000000000E547261636B696E67446966662E6300000000EAD6A300FFFFFFFF51453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C436F7265537570706F72745C636F72655F636D332E68000000000A636F72655F636D332E6800000000F6FA7D00FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E68000000001373657269616C5F61745F636D645F6170702E6800000000B5E99D00FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C616C676F726974686D5C66696C746572732E63000000000966696C746572732E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000004A01000066000000000600005E020000</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -130,11 +130,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C40000004F00000070040000BD000000</Data> + <Data>A40000004F000000B0030000B3000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>C40000006600000070040000D4000000</Data> + <Data>A400000066000000B0030000CA000000</Data> </RectRecentFloat> </Window> <Window> @@ -150,11 +150,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000EF00000083020000</Data> + <Data>0300000066000000430100002E020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -170,11 +170,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000EF00000083020000</Data> + <Data>0300000066000000430100002E020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -190,11 +190,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -210,11 +210,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -230,11 +230,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -250,11 +250,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -270,11 +270,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -290,11 +290,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -310,11 +310,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -330,11 +330,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -350,11 +350,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -370,11 +370,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -390,11 +390,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -410,11 +410,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -430,11 +430,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -450,11 +450,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000EF00000083020000</Data> + <Data>0300000066000000430100002E020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -470,11 +470,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000EF00000083020000</Data> + <Data>0300000066000000430100002E020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -490,11 +490,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B7020000FD050000F5020000</Data> + <Data>0300000062020000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -510,11 +510,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000950100007004000017020000</Data> + <Data>000000003B010000B0030000A7010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -530,11 +530,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B7020000FD050000F5020000</Data> + <Data>0300000062020000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -550,11 +550,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -570,11 +570,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -610,11 +610,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -630,11 +630,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -650,11 +650,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -670,11 +670,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -690,11 +690,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -710,11 +710,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -730,11 +730,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -750,11 +750,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -770,11 +770,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -790,11 +790,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -810,11 +810,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -830,11 +830,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -850,11 +850,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -870,11 +870,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -890,11 +890,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -910,11 +910,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -930,11 +930,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -950,11 +950,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -970,11 +970,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -990,11 +990,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1010,11 +1010,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1030,11 +1030,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1050,11 +1050,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1070,11 +1070,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1090,11 +1090,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1110,11 +1110,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1130,11 +1130,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1150,17 +1150,17 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000EF0000005B030000</Data> + <Data>03000000660000004301000021020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> <RegID>38007</RegID> <PaneID>38007</PaneID> - <IsVisible>0</IsVisible> + <IsVisible>1</IsVisible> <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> @@ -1170,11 +1170,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200007D070000F5020000</Data> + <Data>0300000062020000FD050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -1190,11 +1190,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200007D070000F5020000</Data> + <Data>0300000062020000FA050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -1210,11 +1210,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1230,11 +1230,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1250,11 +1250,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200007D070000F5020000</Data> + <Data>0300000062020000FA050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -1270,11 +1270,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000B70200007D070000F5020000</Data> + <Data>0300000062020000FA050000F5020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>220000003900000005010000F5010000</Data> + <Data>70000000870000002C010000E9010000</Data> </RectRecentFloat> </Window> <Window> @@ -1290,11 +1290,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>C7000000660000006D040000A4000000</Data> + <Data>A700000066000000AD0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>22000000390000005A020000A7000000</Data> + <Data>700000008700000048020000DF000000</Data> </RectRecentFloat> </Window> <Window> @@ -1310,11 +1310,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1330,11 +1330,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1350,11 +1350,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1370,11 +1370,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1390,11 +1390,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1410,11 +1410,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1430,11 +1430,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1450,11 +1450,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1470,11 +1470,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1490,11 +1490,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1510,11 +1510,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1530,11 +1530,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1550,11 +1550,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1570,11 +1570,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1590,11 +1590,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1610,11 +1610,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1630,11 +1630,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1650,11 +1650,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1670,11 +1670,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1690,11 +1690,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>B3030000660000006D0400008C010000</Data> + <Data>1303000066000000AD03000026010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <Window> @@ -1790,23 +1790,23 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000AC0100006D040000FE010000</Data> + <Data>0300000052010000AD0300008E010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>2200000039000000E2000000D9000000</Data> + <Data>7000000087000000100100000A010000</Data> </RectRecentFloat> </Window> <DockMan> <Len>3312</Len> - <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFC4000000BD00000070040000C1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000C40000006600000070040000D4000000C40000004F00000070040000BD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF20000004F000000F60000009C0200000100000002000010040000000100000008FFFFFFFD040000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F20000008B030000000000004F000000F20000009C0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000091010000700400009501000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000AC010000700400002E0200000000000095010000700400001702000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF38020000950100003C0200001702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000009C02000000060000A0020000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000008F03000080070000FD03000000000000A0020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF01000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000B3000000B0030000B7000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A400000066000000B0030000CA000000A40000004F000000B0030000B30000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF0C0300004F000000100300003F010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000001003000066000000B003000056010000100300004F000000B00300003F01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF460100004F0000004A010000470200000100000002000010040000000100000062FFFFFFD7060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000004601000051020000000000004F00000046010000470200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000037010000B00300003B01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000000000000000000052010000B0030000BE010000000000003B010000B0030000A701000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFD80100003B010000DC010000A701000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000047020000000600004B02000001000000010000100400000001000000C5FEFFFF79010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000000000000055020000FD05000018030000000000004B020000000600000E0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2944</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000016544147434F4E464947535543434553535F494E44455896000000000000001400176C736D366473725F6933635F64697361626C655F736574196C736D366473725F786C5F66756C6C5F7363616C655F736574156C736D366473725F6465766963655F69645F67657416544147434F4E464947535543434553535F494E4445581628666C6F617429312F7461675F6672657175656E6379094D4F544F525F4F46460A4D4F544F525F4F46463B124D41585F5245504F52545F414E435F4E554D09696E7468656967687401690F63757272656E745F736C6F746E756D094C45445F4C475F4F4E0F5365744E657874506F6C6C54696D6511675F666C61675F546167676574646973740C746167646973745F6C69737409675F54616764697374054558544931114765745072657373416E644865696768740F75736172745F73656E645B3130305D0B75736172745F73656E645B0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2925</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000009495744475F466565649600000000000000140009495744475F466565640B675F5265737474696D6572176C736D366473725F6933635F64697361626C655F736574196C736D366473725F786C5F66756C6C5F7363616C655F736574156C736D366473725F6465766963655F69645F67657416544147434F4E464947535543434553535F494E4445581628666C6F617429312F7461675F6672657175656E6379094D4F544F525F4F46460A4D4F544F525F4F46463B124D41585F5245504F52545F414E435F4E554D09696E7468656967687401690F63757272656E745F736C6F746E756D094C45445F4C475F4F4E0F5365744E657874506F6C6C54696D6511675F666C61675F546167676574646973740C746167646973745F6C69737409675F54616764697374054558544931114765745072657373416E644865696768740000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -1822,7 +1822,7 @@ <Name>Build</Name> <Buttons> <Len>970</Len> - <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> + <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> </Buttons> <OriginalItems> <Len>583</Len> @@ -1871,11 +1871,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>6D0100004F0000007E04000094000000</Data> + <Data>6D0100004F0000007B040000B2000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>6D010000660000007E040000AB000000</Data> + <Data>6F0100007100000080040000D4000000</Data> </RectRecentFloat> </Window> <Window> @@ -1891,7 +1891,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000660100002D020000</Data> + <Data>030000006600000066010000BD010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1911,7 +1911,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000660100002D020000</Data> + <Data>030000006600000066010000CA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1931,7 +1931,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1951,7 +1951,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1971,7 +1971,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1991,7 +1991,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2011,7 +2011,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2031,7 +2031,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2051,7 +2051,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2071,7 +2071,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2091,7 +2091,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2111,7 +2111,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2131,7 +2131,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2151,7 +2151,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2171,7 +2171,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2191,7 +2191,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000660100002D020000</Data> + <Data>030000006600000066010000CA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2211,7 +2211,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000660100002D020000</Data> + <Data>030000006600000066010000CA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2231,7 +2231,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000610200007B040000DF020000</Data> + <Data>03000000720200007B040000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2241,7 +2241,7 @@ <Window> <RegID>198</RegID> <PaneID>198</PaneID> - <IsVisible>0</IsVisible> + <IsVisible>1</IsVisible> <IsFloating>0</IsFloating> <IsTabbed>0</IsTabbed> <IsActivated>0</IsActivated> @@ -2251,7 +2251,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0000000053030000FE050000D0030000</Data> + <Data>00000000DA0100007B04000057020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2271,7 +2271,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>00000000F802000000060000AE030000</Data> + <Data>00000000EB020000FD050000A1030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2291,7 +2291,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>6D010000630000007E04000094000000</Data> + <Data>6D010000630000007B040000B2000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2311,7 +2311,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2351,7 +2351,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2371,7 +2371,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2391,7 +2391,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2411,7 +2411,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2431,7 +2431,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2451,7 +2451,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2471,7 +2471,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2491,7 +2491,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2511,7 +2511,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2531,7 +2531,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2551,7 +2551,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2571,7 +2571,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2591,7 +2591,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2611,7 +2611,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2631,7 +2631,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2651,7 +2651,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2671,7 +2671,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2691,7 +2691,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2711,7 +2711,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2731,7 +2731,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2751,7 +2751,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2771,7 +2771,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2791,7 +2791,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2811,7 +2811,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2831,7 +2831,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2851,7 +2851,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2871,7 +2871,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2891,7 +2891,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000066000000660100002D020000</Data> + <Data>030000006600000066010000BD010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2907,11 +2907,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>4096</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000005E0200007E040000F8020000</Data> + <Data>000000006F0200007B040000EB020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2927,11 +2927,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>4096</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000610200007B040000DF020000</Data> + <Data>03000000720200007B040000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2951,7 +2951,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2971,7 +2971,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2987,11 +2987,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>4096</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000610200007B040000DF020000</Data> + <Data>03000000720200007B040000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3007,11 +3007,11 @@ <IsActivated>0</IsActivated> <MRUWidth>32767</MRUWidth> <PinState>0</PinState> - <RecentFrameAlignment>32768</RecentFrameAlignment> + <RecentFrameAlignment>4096</RecentFrameAlignment> <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000610200007B040000DF020000</Data> + <Data>03000000720200007B040000D2020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3031,7 +3031,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>70010000660000007B0400007B000000</Data> + <Data>70010000660000007B04000099000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3051,7 +3051,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3071,7 +3071,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3091,7 +3091,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3111,7 +3111,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3131,7 +3131,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3151,7 +3151,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3171,7 +3171,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3191,7 +3191,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3211,7 +3211,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3231,7 +3231,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3251,7 +3251,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3271,7 +3271,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3291,7 +3291,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3311,7 +3311,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3331,7 +3331,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3351,11 +3351,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>0A0000000A0000006E0000006E000000</Data> + <Data>8A000000A10000002A01000024010000</Data> </RectRecentFloat> </Window> <Window> @@ -3371,7 +3371,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3391,7 +3391,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3411,7 +3411,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3431,7 +3431,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>7F020000660000007B0400002D020000</Data> + <Data>80030000660000007C05000030030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3451,7 +3451,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0400000000000000D50300001C000000</Data> + <Data>0100000000000000D20300001C000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3471,7 +3471,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000000E0300000006000021030000</Data> + <Data>0000000001030000FD05000014030000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3511,7 +3511,7 @@ <RecentRowIndex>2</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>080000001C0000007702000038000000</Data> + <Data>040000001C0000007302000038000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3531,7 +3531,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>8504000066000000FD050000DF020000</Data> + <Data>8204000066000000FA050000DF020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -3539,15 +3539,15 @@ </RectRecentFloat> </Window> <DockMan> - <Len>3431</Len> - <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFF6D010000940000007E04000098000000010000000100001004000000010000009FFFFFFF3D020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000010000006D010000660000007E040000AB0000006D0100004F0000007E040000940000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF780200004F0000007C0200004602000000000000020000000400000001000000CDF9FFFF9E000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000007C020000660000007E0400005D0200007C0200004F0000007E0400004602000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF084669726577616C6C00000000408C000001000000FFFFFFFFFFFFFFFF054750494F4200000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF690100004F0000006D010000460200000100000002000010040000000100000099FEFFFF0C030000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000690100005D020000000000004F00000069010000460200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000004F030000FE0500005303000000000000010000000400000001000000ADFEFFFFD600000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFBF030000D0020000C30300004D03000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000460200007E0400004A02000001000000010000100400000001000000F8FEFFFF4D010000FFFFFFFF05000000C5000000B4010000D2010000CF010000779400000180008000000100000000000000610200007E0400000F030000000000004A0200007E040000F80200000000000040820056050000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF7E0400004F00000082040000F80200000100000002000010040000000100000073FDFFFFFB01000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000400000010000008204000066000000000600000F030000820400004F00000000060000F802000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F0700000000000001000000C70000000080000001000000000000000F03000000060000C503000001000000010000000100000000000000</Data> + <Len>3432</Len> + <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFF6D010000B20000007B040000B6000000010000000100001004000000010000009EFFFFFFCF010000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E6500200000010000006F0100007100000080040000D40000006D0100004F0000007B040000B20000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF790300004F0000007D0300004903000000000000020000000400000001000000CDF9FFFF9E000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000007F03000071000000810500006B0300007D0300004F0000007F0500004903000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF084669726577616C6C00000000408C000001000000FFFFFFFFFFFFFFFF0655534152543100000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF690100004F0000006D010000D60100000100000002000010040000000100000062FFFFFFD1040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000002000000710000006B01000005020000000000004F00000069010000D60100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000D60100007B040000DA01000001000000010000100400000001000000ADFEFFFFD600000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFBF030000D0020000C30300004D03000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000570200007B0400005B02000001000000010000100400000001000000F1FCFFFF00000000FFFFFFFF05000000C5000000B4010000D2010000CF0100007794000001800080000001000000020000008A020000800400001A030000000000005B0200007B040000EB0200000000000040820056050000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF7B0400004F0000007F040000EB0200000100000002000010040000000100000073FDFFFFFB01000000000000000000000000000001000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000400000010000008404000071000000020600001A0300007F0400004F000000FD050000EB02000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F0700000000000001000000C70000000080000001000000020000000D030000FF050000C303000001000000010000000100000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2906</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000124D41585F5245504F52545F414E435F4E554D96000000000000001400124D41585F5245504F52545F414E435F4E554D13524553505F52585F54494D454F55545F55555316544147434F4E464947535543434553535F494E4445581628666C6F617429312F7461675F6672657175656E6379094D4F544F525F4F46460A4D4F544F525F4F46463B09696E7468656967687401690F63757272656E745F736C6F746E756D094C45445F4C475F4F4E0F5365744E657874506F6C6C54696D6511675F666C61675F546167676574646973740C746167646973745F6C69737409675F54616764697374054558544931114765745072657373416E644865696768740F75736172745F73656E645B3130305D0B75736172745F73656E645B0A75736172745F73656E6406627574746F6E0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> + <Len>2839</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000B675F5265737474696D6572960000000000000014000B675F5265737474696D65720A44454255475F4D4F44450F5365744E657874506F6C6C54696D650F63757272656E745F736C6F746E756D06627574746F6E035544500A746573745F6D6F746F72094D4F544F525F4F4646084D4F544F525F4F4E1148414C5F54494D5F50574D5F53746172740E6D6F746F725F6B65657074696D65104E5649435F53797374656D52657365740B72656D61696E5F74696D650741542053454E44064556454E543A0446534D3A0653544154453A0553544154450A4849444F5F446562756708706F7765726F66660000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -3563,7 +3563,7 @@ <Name>Build</Name> <Buttons> <Len>970</Len> - <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> + <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data> </Buttons> <OriginalItems> <Len>583</Len> @@ -3579,7 +3579,7 @@ <Name>Debug</Name> <Buttons> <Len>2362</Len> - <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> + <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> @@ -3603,66 +3603,57 @@ <ActiveMDIGroup>0</ActiveMDIGroup> <MDIGroup> <Size>100</Size> - <ActiveTab>13</ActiveTab> + <ActiveTab>4</ActiveTab> + <Doc> + <Name>..\Src\application\serial_at_cmd_app.c</Name> + <ColumnNumber>14</ColumnNumber> + <TopLine>31</TopLine> + <CurrentLine>43</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> <Doc> <Name>..\Src\main.c</Name> - <ColumnNumber>16</ColumnNumber> - <TopLine>266</TopLine> - <CurrentLine>5</CurrentLine> + <ColumnNumber>31</ColumnNumber> + <TopLine>221</TopLine> + <CurrentLine>75</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\Usart.c</Name> + <ColumnNumber>8</ColumnNumber> + <TopLine>185</TopLine> + <CurrentLine>198</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>217</TopLine> + <CurrentLine>232</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name>..\Src\application\dw_app.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>881</TopLine> - <CurrentLine>3</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\application\global_param.c</Name> - <ColumnNumber>22</ColumnNumber> - <TopLine>18</TopLine> - <CurrentLine>49</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\application\global_param.h</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>38</TopLine> - <CurrentLine>69</CurrentLine> + <ColumnNumber>13</ColumnNumber> + <TopLine>938</TopLine> + <CurrentLine>1</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name>..\Src\application\dw_app.h</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>1</TopLine> - <CurrentLine>24</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\stm32f10x_it.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>56</TopLine> - <CurrentLine>72</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\decadriver\deca_device.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>1040</TopLine> - <CurrentLine>1050</CurrentLine> + <ColumnNumber>18</ColumnNumber> + <TopLine>15</TopLine> + <CurrentLine>22</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3670,35 +3661,107 @@ <Doc> <Name>..\Src\OnChipDevices\Spi.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>125</TopLine> - <CurrentLine>135</CurrentLine> + <TopLine>136</TopLine> + <CurrentLine>161</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\OnChipDevices\Usart.c</Name> + <Name>..\Src\decadriver\deca_device.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>122</TopLine> - <CurrentLine>141</CurrentLine> + <TopLine>1045</TopLine> + <CurrentLine>1052</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\application\serial_at_cmd_app.c</Name> + <Name>..\Src\decadriver\deca_regs.h</Name> + <ColumnNumber>73</ColumnNumber> + <TopLine>253</TopLine> + <CurrentLine>271</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\stm32f10x_it.c</Name> + <ColumnNumber>24</ColumnNumber> + <TopLine>67</TopLine> + <CurrentLine>68</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\Spi.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>112</TopLine> + <TopLine>1</TopLine> + <CurrentLine>8</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\ExternalDevices\dw_driver.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>79</TopLine> + <CurrentLine>92</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\ExternalDevices\dw_driver.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>18</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\beep_logic_app.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1</TopLine> <CurrentLine>1</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\OnChipDevices\Flash.c</Name> + <Name>..\Src\OnChipDevices\Usart.h</Name> + <ColumnNumber>21</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>9</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\global_param.h</Name> + <ColumnNumber>34</ColumnNumber> + <TopLine>25</TopLine> + <CurrentLine>49</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>54</TopLine> - <CurrentLine>68</CurrentLine> + <TopLine>139</TopLine> + <CurrentLine>148</CurrentLine> + <Folding>0</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\ADC.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>1</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -3713,28 +3776,105 @@ <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c</Name> + <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_gpio.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>120</TopLine> - <CurrentLine>125</CurrentLine> + <TopLine>66</TopLine> + <CurrentLine>73</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>E:\璧勬枡\IMU\STMems_Standard_C_drivers-master\STMems_Standard_C_drivers-master\lsm6dsr_STdC\examples\lsm6dsr_multi_read_fifo.c</Name> - <ColumnNumber>47</ColumnNumber> - <TopLine>154</TopLine> - <CurrentLine>158</CurrentLine> + <Name>..\Src\ExternalDevices\led.c</Name> + <ColumnNumber>19</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>18</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\ExternalDevices\led.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>14</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\global_param.c</Name> + <ColumnNumber>11</ColumnNumber> + <TopLine>25</TopLine> + <CurrentLine>51</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_rcc.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>493</TopLine> + <CurrentLine>498</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\ExternalDevices\beep.h</Name> + <ColumnNumber>17</ColumnNumber> + <TopLine>3</TopLine> + <CurrentLine>28</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\ADC.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>18</TopLine> + <CurrentLine>43</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\algorithm\TrackingDiff.c</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>17</TopLine> + <CurrentLine>43</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\Libraries\CMSIS\CM3\CoreSupport\core_cm3.h</Name> + <ColumnNumber>0</ColumnNumber> + <TopLine>1711</TopLine> + <CurrentLine>1719</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\application\serial_at_cmd_app.h</Name> + <ColumnNumber>3</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>5</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\algorithm\filters.c</Name> + <ColumnNumber>1</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>23</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> </MDIGroup> </MDIGroups> - - <Bookmarks> - <ListItem>..\Src\application\dw_app.c 444</ListItem> - </Bookmarks> </ProjectGui> 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 5bb77d4..dc664c2 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" @@ -158,24 +158,7 @@ <Name>-T0</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>287</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134260040</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\main.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\UWB_Projects\../Src/main.c\287</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -235,32 +218,7 @@ <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>g_Resttimer,0x0A</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buffer[MESSAGE_TYPE_IDX]</ItemText> - </Ww> - <Ww> - <count>13</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> - </Ww> - <Ww> - <count>14</count> - <WinNumber>1</WinNumber> - <ItemText>g_start_send_flag</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>1</WinNumber> - <ItemText>hex_dist,0x0A</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>1</WinNumber> - <ItemText>rlv,0x0A</ItemText> + <ItemText>g_Resttimer</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> 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 f5c4a53..3d19917 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" @@ -338,17 +338,10 @@ 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); - for(i=0;i<nearbase_num;i++) - { memcpy(&tx_nearpoll_msg[NEARBASEID_INDEX+nearbase_num*2+i*2],&nearbase_distlist[i],2);} - - for(i=0;i<MAX_NEARBASE_NUM;i++) - { - nearbase_distlist[i]=0x1ffff; - } tx_nearpoll_msg[MESSAGE_TYPE_IDX] = NEAR_POLL; memcpy(&tx_nearpoll_msg[ANCHOR_ID_IDX],&mainbase_id,2); - dwt_writetxdata(13+4*nearbase_num, tx_nearpoll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 - dwt_writetxfctrl(13+4*nearbase_num, 0);//设置超宽带发送数据长度 + 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; @@ -457,8 +450,7 @@ if(temp_dist!=0x1ffff) { g_Resttimer=0; - IWDG_Feed(); - #ifdef USART_SINGLE_OUTPUT + #ifndef USART_INTEGRATE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 usart_send[4] = frame_seq_nb;//数据段长度 @@ -508,7 +500,7 @@ // tagslotpos=GetRandomSlotPos(rec_tagpos_binary); if(temp_dist!=0x1ffff) { - #ifdef USART_SINGLE_OUTPUT + #ifndef USART_INTEGRATE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 usart_send[4] = frame_seq_nb;//数据段长度 @@ -615,7 +607,10 @@ report_num++; } } - + 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 @@ -829,7 +824,6 @@ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR); } } -extern u16 dist_threshold; u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor,getrange_success=0; u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase 1 first near_base { @@ -880,7 +874,9 @@ } result = dwt_starttx(DWT_START_TX_DELAYED | DWT_RESPONSE_EXPECTED);//延迟发送,等待接收 - + battary = rx_buffer[BATTARY_IDX]; + button = rx_buffer[BUTTON_IDX]; + frame_seq_nb2 = rx_buffer[SEQUENCE_IDX]; if(result==0) { while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR))&&!g_start_sync_flag)///不断查询芯片状态直到接收成功或者出现错误 @@ -926,18 +922,16 @@ /*--------------------------以下为非测距逻辑------------------------*/ //dist_cm=33000; getrange_success = 1; - + g_Resttimer=0; LED0_BLINK; //每成功一次通讯则闪烁一次 dis_after_filter=dist_cm; hex_dist = dist_cm+(int16_t)g_com_map[DIST_OFFSET]*10; g_flag_Taggetdist[taglist_pos]=0; if(hex_dist>0&&hex_dist<2000000) { - if(abs(hex_dist-his_dist[taglist_pos])<dist_threshold||misdist_num[taglist_pos]>3) + if(abs(hex_dist-his_dist[taglist_pos])<10000||misdist_num[taglist_pos]>3) { int32_t filter_dist; - g_Resttimer=0; - IWDG_Feed(); #ifdef TDFILTER NewTrackingDiffUpdate(taglist_pos, (float)hex_dist); filter_dist=pos_predict[taglist_pos]/10; @@ -948,7 +942,7 @@ tagdist_list[taglist_pos] = filter_dist; his_dist[taglist_pos]=hex_dist; g_Tagdist[taglist_pos]=filter_dist; - #ifdef USART_SINGLE_OUTPUT + #ifndef USART_INTEGRATE_OUTPUT usart_send[2] = 1;//正常模式 usart_send[3] = 17;//数据段长度 usart_send[4] = frame_seq_nb2;//数据段长度 @@ -979,7 +973,7 @@ uint32_t current_syncid=0xffffffff,synclost_timer; extern u8 flag_syncbase; u8 tagpos_rec[50],tagpos_send[50],ancidlist_num; -u16 ancidlist_rec[20],ancidlist_send[20],rec_ancidlist[20],rec_ancdistlist[20]; +u16 ancidlist_rec[20],ancidlist_send[20]; void Anchor_App(void) { @@ -1057,28 +1051,8 @@ } break; - case NEAR_POLL: - frame_seq_nb2 = rx_buffer[SEQUENCE_IDX]; - battary = rx_buffer[BATTARY_IDX]; - button = rx_buffer[BUTTON_IDX]; - rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX]; + case NEAR_POLL: memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2); - memcpy(&rec_ancidlist,&rx_buffer[NEARBASEID_INDEX],2*rec_nearbase_num); - memcpy(&rec_ancdistlist,&rx_buffer[NEARBASEID_INDEX+2*rec_nearbase_num],2*rec_nearbase_num); - #ifdef USART_ALL_OUTPUT - usart_send[2] = 0x0c;//正常模式 - usart_send[3] = 8+rec_nearbase_num*4;//数据段长度 - usart_send[4] = frame_seq_nb2;//数据段长度 - usart_send[5] = battary; - usart_send[6] = button; - usart_send[7] = rec_nearbase_num; - memcpy(&usart_send[8],&tag_id_recv,2); - memcpy(&usart_send[10],&rec_ancidlist,2*rec_nearbase_num); - memcpy(&usart_send[10+rec_nearbase_num*2],&rec_ancdistlist,2*rec_nearbase_num); - checksum = Checksum_u16(&usart_send[2],8+4*rec_nearbase_num); - memcpy(&usart_send[10+4*rec_nearbase_num],&checksum,2); - UART_PushFrame(usart_send,12+rec_nearbase_num*4); - #endif if(tag_id_recv>=g_com_map[WHITELIST1_START]&&tag_id_recv<=g_com_map[WHITELIST1_END]) {break;} taglist_pos=CmpTagInList(tag_id_recv); @@ -1092,9 +1066,9 @@ new_tagid=0; } tagofflinetime[taglist_pos]=0; - temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime); + temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime); tagpos_rec[(u8)temp_tagpos]=1; - + rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX]; if(rec_nearbase_num>ancidlist_num) { diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" index 708049b..771b8c7 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" @@ -19,10 +19,7 @@ #include "beep.h" #include <math.h> #include "TrackingDiff.h" - -//#define USART_SINGLE_OUTPUT #define USART_INTEGRATE_OUTPUT -//#define USART_ALL_OUTPUT //#define NEWBOARD 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 9d7dee0..3bf5b38 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" @@ -17,9 +17,14 @@ __enable_irq(); return result; } -void FactorySettings(void) + +void parameter_init(void) { - g_com_map[0] = 0x55AA; + FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1)); + + if(g_com_map[0] != 0x55AA) + { + g_com_map[0] = 0x55AA; g_com_map[DEV_ID] =0x04;//DEFAULT_DEV_ID; //默认设备ID g_com_map[COM_INTERVAL]=100; @@ -42,20 +47,9 @@ g_com_map[CNT_UPDATE]=0; g_com_map[NEARBASE_NUM]=0; g_com_map[POWER]=30; - g_com_map[SPEEDFILTER_THRES]=10000; g_com_map[FILTER_COEFFICIENT]=40; //memcpy(&g_com_map[BOARD_TYPE],boardtype,4); save_com_map_to_flash(); - delay_ms(100); -} -void parameter_init(void) -{ - FLASH_Read(FLASH_IAP_CTRL_MAP, (uint8_t*)&g_com_map, (COM_MAP_SIZE<<1)); - - if(g_com_map[0] != 0x55AA&&g_com_map[CNT_REBOOT]!=0) - { - FactorySettings(); - NVIC_SystemReset(); } } diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" index 4b7f7db..c2cd41e 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/global_param.h" @@ -46,7 +46,6 @@ #define MOTOR_ENABLE 0x1E #define IMU_ENABLE 0x1F #define FILTER_COEFFICIENT 0x20 -#define SPEEDFILTER_THRES 0x24 //滤波参数 #define WHITELIST1_START 0x25 #define WHITELIST1_END 0x26 #define SW_TYPE 0x27 @@ -66,6 +65,6 @@ extern uint32_t save_com_map_to_flash(void); extern void parameter_init(void); -void FactorySettings(void); + #endif diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" index 2993869..c81b079 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/serial_at_cmd_app.c" @@ -35,11 +35,12 @@ send_frame[3] = 8; send_frame[4] = pack_msgtype; send_frame[5] = pack_length; - +OUT485_ENABLE; checksum = Checksum_u16(&send_frame[2],8); memcpy(&send_frame[10],&checksum,2); USART_puts(send_frame, 12); + OUT485_DISABLE; } void SendComMap(uint8_t data_length, uint8_t index) { 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 f4eee9c..003a31c 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" @@ -12,34 +12,7 @@ #include "ADC.h" //#define DEBUG_MODE -/* - * rlv:重装载寄存器的值,取值范围为:0-0XFFF - * 函数调用举例: - * IWDG_Config(IWDG_Prescaler_64 ,625); // IWDG 1s 超时溢出 - * (64/40)*625 = 1s - */ -void IWDG_Config(uint8_t prv ,uint16_t rlv) -{ - // 使能 预分频寄存器PR和重装载寄存器RLR可写 - IWDG_WriteAccessCmd( IWDG_WriteAccess_Enable ); - - // 设置预分频器值 - IWDG_SetPrescaler( prv ); - - // 设置重装载寄存器值 - IWDG_SetReload( rlv ); - - // 把重装载寄存器的值放到计数器中 - IWDG_ReloadCounter(); - - // 使能 IWDG - IWDG_Enable(); -} -void IWDG_Feed(void) -{ - IWDG_ReloadCounter(); -} void Device_Init(void) { RCC_Configuration(); @@ -54,8 +27,7 @@ Uart1_Init(); Spi_Init(); ADC_Configuration(); - IWDG_Config(IWDG_Prescaler_128 ,4095); //10s - IWDG_Feed(); + GPIO_PinRemapConfig(GPIO_Remap_SWJ_JTAGDisable, ENABLE); } u8 anchor_type; @@ -73,7 +45,7 @@ memcpy(&hbsend[14],&checksum,2); } uint16_t vel_factor,pos_factor; -u16 tyncpoll_time,dist_threshold; +u16 tyncpoll_time; u16 slottime,max_slotpos; extern u8 module_power; extern u16 total_slotnum; @@ -100,13 +72,7 @@ { g_com_map[COM_INTERVAL]=100; } - - g_com_map[VERSION] = 0x012e; -dist_threshold = (g_com_map[SPEEDFILTER_THRES]*10)/(1000/g_com_map[COM_INTERVAL]); - if(dist_threshold<300) - {dist_threshold = 300;} - if(dist_threshold>15000) - {dist_threshold = 15000;} + g_com_map[VERSION] = 0x012a; g_com_map[SW_TYPE] = SW_FANGZHUANG; dev_id = g_com_map[DEV_ID]; slottime=ceil((double)g_com_map[MAX_REPORT_ANC_NUM]*SLOT_SCALE)+3; @@ -191,15 +157,15 @@ if(flag_newsecond) { uint32_t temp23; -// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ; -// if(temp23!=0x4A480022) -// { -// temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ; -// if(temp23!=0x4A480022) -// { -// NVIC_SystemReset(); -// } -// } + temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ; + if(temp23!=0x4A480022) + { + temp23 = dwt_read32bitreg(CHAN_CTRL_ID) ; + if(temp23!=0x4A480022) + { + NVIC_SystemReset(); + } + } flag_newsecond=0; tagpos_binary=0; memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2); @@ -242,10 +208,12 @@ // Delay_ms(100); SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader } - if(g_com_map[CNT_REBOOT]==1) + if(g_com_map[CNT_REBOOT]==1) { - FactorySettings(); - + g_com_map[CNT_REBOOT]=0; + g_com_map[MAP_SIGN_INDEX]=0; + save_com_map_to_flash(); + delay_ms(100); SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader } if(g_com_map[CNT_RESTART]==1) @@ -255,13 +223,12 @@ delay_ms(100); SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader } - if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0) + if(g_com_map[MAP_SIGN_INDEX]!=0x55AA||g_com_map[COM_INTERVAL]==0) { SCB->AIRCR = 0X05FA0000|(unsigned int)0x04; //软复位回到bootloader } } - int main(void) { 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 58eb6ef..3905386 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" @@ -65,7 +65,7 @@ TagListUpdate(); } - if(g_Resttimer++>10000) + if(g_Resttimer++>20000) { NVIC_SystemReset(); } -- Gitblit v1.9.3