From fd498f8f31ff9428fa4c042337ac2fba895d4794 Mon Sep 17 00:00:00 2001 From: yincheng.zhong <zhyinch@gmail.com> Date: 星期五, 01 十一月 2019 13:29:49 +0800 Subject: [PATCH] 实现10us精度基站与标签时间同步 --- 源码/核心板/Src/main.c | 31 源码/核心板/Src/OnChipDevices/Rcc_Nvic_Systick.h | 2 源码/核心板/MDK-ARM/Project.uvprojx | 61 - 源码/核心板/Src/stm32f10x_it.c | 46 + 源码/核心板/MDK-ARM/EventRecorderStub.scvd | 9 源码/核心板/MDK-ARM/Project.uvoptx | 100 -- 源码/核心板/Src/OnChipDevices/Rcc_Nvic_Systick.c | 33 + 源码/核心板/Src/OnChipDevices/Usart.c | 9 源码/核心板/MDK-ARM/Project.uvguix.Administrator | 1390 +++++++++++++++++++++++++++++++++++++---------- 源码/核心板/Src/OnChipDevices/Usart.h | 5 源码/核心板/Src/application/dw_app.c | 52 + 11 files changed, 1,258 insertions(+), 480 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/EventRecorderStub.scvd" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/EventRecorderStub.scvd" new file mode 100644 index 0000000..2956b29 --- /dev/null +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/EventRecorderStub.scvd" @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="utf-8"?> + +<component_viewer schemaVersion="0.1" xmlns:xs="http://www.w3.org/2001/XMLSchema-instance" xs:noNamespaceSchemaLocation="Component_Viewer.xsd"> + +<component name="EventRecorderStub" version="1.0.0"/> <!--name and version of the component--> + <events> + </events> + +</component_viewer> 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 9647777..4a687a5 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" @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8" standalone="no" ?> <ProjectGui xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="project_guix.xsd"> - <SchemaVersion>-5.1</SchemaVersion> + <SchemaVersion>-6.1</SchemaVersion> <Header>### uVision Project, (C) Keil Software</Header> @@ -11,17 +11,17 @@ <View> <WinId>38003</WinId> <ViewName>Registers</ViewName> - <TableColWidths>115 275</TableColWidths> + <TableColWidths>115 141</TableColWidths> </View> <View> <WinId>346</WinId> <ViewName>Code Coverage</ViewName> - <TableColWidths>370 160</TableColWidths> + <TableColWidths>370 164</TableColWidths> </View> <View> <WinId>204</WinId> <ViewName>Performance Analyzer</ViewName> - <TableColWidths>530</TableColWidths> + <TableColWidths>188 123 123 100</TableColWidths> </View> </SECTreeCtrl> @@ -58,6 +58,8 @@ </View> </TreeListPane> + <CompViewPool/> + <WindowSettings> <LogicAnalizer> <ShowLACursor>0</ShowLACursor> @@ -75,25 +77,25 @@ <flags>2</flags> <showCmd>3</showCmd> <MinPosition> - <xPos>-1</xPos> - <yPos>-1</yPos> + <xPos>-32000</xPos> + <yPos>-32000</yPos> </MinPosition> <MaxPosition> <xPos>-1</xPos> <yPos>-1</yPos> </MaxPosition> <NormalPosition> - <Top>104</Top> - <Left>104</Left> - <Right>1064</Right> - <Bottom>585</Bottom> + <Top>78</Top> + <Left>78</Left> + <Right>1103</Right> + <Bottom>603</Bottom> </NormalPosition> </WindowPosition> <MDIClientArea> <RegID>0</RegID> <MDITabState> - <Len>1139</Len> - <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A000000010000000100000043453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E6300000000B3A6BE00FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000A5C2D700FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000D9ADC200FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000F7B88600FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E68000000009CC1B600FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000BCA8E100FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E6300000000F0A0A100FFFFFFFF46453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C73657269616C5F61745F636D645F6170702E63000000001373657269616C5F61745F636D645F6170702E6300000000BECEA100FFFFFFFF78453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C434D5349535C434D335C446576696365537570706F72745C53545C53544D3332463130785C737461727475705C61726D5C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000094010000660000000005000007020000</Data> + <Len>903</Len> + <Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000008000000050000000100000029463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF31463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000BECEA100FFFFFFFF43463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6300000000125263635F4E7669635F5379737469636B2E6300000000F0A0A100FFFFFFFF5B463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F74696D2E68000000000F73746D3332663130785F74696D2E6800000000BCA8E100FFFFFFFF43463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5263635F4E7669635F5379737469636B2E6800000000125263635F4E7669635F5379737469636B2E68000000009CC1B600FFFFFFFF37463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000F7B88600FFFFFFFF38463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000D9ADC200FFFFFFFF3D463A5C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000000E01000066000000560500000A020000</Data> </MDITabState> </MDIClientArea> <ViewEx> @@ -112,11 +114,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>940100004F000000B0030000B3000000</Data> + <Data>AE0000004F000000F1030000B3000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>9401000066000000B0030000CA000000</Data> + <Data>AE00000066000000F1030000CA000000</Data> </RectRecentFloat> </Window> <Window> @@ -132,11 +134,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000D7010000</Data> + <Data>030000006600000007010000DA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -152,11 +154,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000D7010000</Data> + <Data>030000006600000007010000DA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000F8000000B5010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -172,11 +174,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -192,11 +194,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -212,11 +214,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -232,11 +234,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -252,11 +254,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -272,11 +274,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -292,11 +294,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -312,11 +314,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -332,11 +334,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -352,11 +354,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -372,11 +374,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -392,11 +394,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -412,11 +414,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -432,11 +434,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000D7010000</Data> + <Data>030000006600000007010000DA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000F8000000B5010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -452,11 +454,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000D7010000</Data> + <Data>030000006600000007010000DA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000F8000000B5010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -472,11 +474,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000000B020000FD04000065020000</Data> + <Data>030000000E0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -492,11 +494,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000003B010000B0030000A7010000</Data> + <Data>000000005E010000F1030000D3010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -512,11 +514,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000000B020000FD04000065020000</Data> + <Data>030000000E0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -532,11 +534,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -552,11 +554,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -592,11 +594,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -612,11 +614,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -632,11 +634,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -652,11 +654,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -672,11 +674,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000AD0300009A000000</Data> + <Data>B100000066000000EE0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -692,11 +694,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -712,11 +714,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -732,11 +734,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -752,11 +754,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -772,11 +774,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -792,11 +794,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -812,11 +814,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -832,11 +834,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -852,11 +854,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -872,11 +874,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -892,11 +894,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -912,11 +914,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -932,11 +934,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -952,11 +954,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -972,11 +974,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -992,11 +994,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1012,11 +1014,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1032,11 +1034,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1052,11 +1054,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1072,11 +1074,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1092,11 +1094,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1112,17 +1114,17 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000D7010000</Data> + <Data>03000000660000000701000008020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000F8000000B5010000</Data> + <Data>A4000000BB0000006D01000040020000</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> @@ -1132,11 +1134,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000000B020000FD04000065020000</Data> + <Data>030000000E0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C0000005300000014020000AB000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1152,11 +1154,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000000B020000FD04000065020000</Data> + <Data>030000000E0200005305000067020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000F8000000B5010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -1172,11 +1174,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1192,11 +1194,411 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0300000052010000AD0300008E010000</Data> + <Data>0300000075010000EE030000BA010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>3C00000053000000CC010000E3010000</Data> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50000</RegID> + <PaneID>50000</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50001</RegID> + <PaneID>50001</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50002</RegID> + <PaneID>50002</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50003</RegID> + <PaneID>50003</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50004</RegID> + <PaneID>50004</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50005</RegID> + <PaneID>50005</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50006</RegID> + <PaneID>50006</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50007</RegID> + <PaneID>50007</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50008</RegID> + <PaneID>50008</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50009</RegID> + <PaneID>50009</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50010</RegID> + <PaneID>50010</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50011</RegID> + <PaneID>50011</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50012</RegID> + <PaneID>50012</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50013</RegID> + <PaneID>50013</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50014</RegID> + <PaneID>50014</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50015</RegID> + <PaneID>50015</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50016</RegID> + <PaneID>50016</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50017</RegID> + <PaneID>50017</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50018</RegID> + <PaneID>50018</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50019</RegID> + <PaneID>50019</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>03000000250200002400000040020000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>0A0000000A0000006E0000006E000000</Data> </RectRecentFloat> </Window> <Window> @@ -1232,7 +1634,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000007E0200000005000091020000</Data> + <Data>00000000AE02000056050000C1020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -1280,15 +1682,15 @@ </RectRecentFloat> </Window> <DockMan> - <Len>2619</Len> - <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFF94010000B3000000B0030000B7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000000000009401000066000000B0030000CA000000940100004F000000B0030000B30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1C0200004F000000200200003F010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000002002000066000000B003000056010000200200004F000000B00300003F0100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF900100004F00000094010000F0010000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000009001000007020000000000004F00000090010000F00100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000037010000B00300003B01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000000000000052010000B0030000BE010000000000003B010000B0030000A701000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFD80100003B010000DC010000A701000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000F001000000050000F401000001000000010000100400000001000000AAFEFFFFCE000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000000B020000000500009502000000000000F4010000000500007E0200000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> + <Len>3119</Len> + <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFAE000000B3000000F1030000B7000000000000000100000004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E650020000000000000AE00000066000000F1030000CA000000AE0000004F000000F1030000B30000000000000040280046060000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F000000470300006B010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000004703000066000000F103000082010000470300004F000000F10300006B01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0A0100004F0000000E010000F30100000100000002000010040000000100000058FFFFFFA3040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000000A01000038020000000000004F0000000A010000F30100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000005A010000F10300005E01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB090000018000800000000000000000000075010000F1030000EA010000000000005E010000F1030000D301000000000000404100460E0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFF90100005E010000FD010000D301000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000F301000056050000F70100000100000001000010040000000100000033FEFFFF87000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000001000000000000003C02000056050000C502000000000000F701000056050000AE0200000000000040820056040000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2370</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D414E43484F525F49445F494458960000000000000014000D414E43484F525F49445F4944580B74785F73796E635F6D7367104D4553534147455F545950455F494458097461675F74696D65720F636F7272656374696F6E5F74696D650E7461675F726563765F74696D657213675F636F6D5F6D61705B4445565F524F4C455D0546494E414C05434E4454521645554152545F52585F444D415F43482D3E434E445452116D5F45554152545F444D415F52585074720A4D6178446174614C656E0E554152545F507573684672616D65036873650F747275737476616C75655F73656E641145554152545F54585F46524D5F53495A450C6672616D655F7365715F6E620D7461675F64656C617974696D650E5245504F45545F414E435F4E554D0B616E63686F725F747970650000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data> + <Len>2389</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A706F6C6C5F74696D6572960000000000000014000D7461675F64656C617974696D65097461675F74696D65720A706F6C6C5F74696D6572156C6F63616C697A6174696F6E5461736B456E7472791759415753544154494F4E4152595F5448524553484F4C440F416E67756C6172466565644261636B07416E67756C6172124C7066416E67756C6172466565644261636B1B434F4D4D5F4D41505F56454849434C455F5455524E5F53504545440F434F4D4D5F4D41505F494D555F475A10434F4D4D5F4D41505F494D555F5941570A73696D756C6174696F6E0F454B465F50726553746174655B305D05454B465F5A065B335D5B335D0A7061636B5F73656E642E04667265650E675F63686173736973537065656410784D425254555265636569766546534D1770784D424672616D6543424279746552656365697665640000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020000001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -1319,8 +1721,8 @@ <RegID>59400</RegID> <Name>Debug</Name> <Buttons> - <Len>2220</Len> - <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000000000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> + <Len>2373</Len> + <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> @@ -1333,8 +1735,8 @@ </ToolBar> <ControlBarsSummary> <Bars>0</Bars> - <ScreenCX>1280</ScreenCX> - <ScreenCY>720</ScreenCY> + <ScreenCX>1366</ScreenCX> + <ScreenCY>768</ScreenCY> </ControlBarsSummary> </ViewEx> <ViewEx> @@ -1353,11 +1755,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>940100004F000000CE030000B3000000</Data> + <Data>0E0100004F0000002E030000B3000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>9401000066000000CE030000CA000000</Data> + <Data>0E010000660000002E030000CA000000</Data> </RectRecentFloat> </Window> <Window> @@ -1373,11 +1775,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000F5010000</Data> + <Data>030000006600000007010000F0010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1393,11 +1795,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000F5010000</Data> + <Data>030000006600000007010000F0010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000002C010000E9010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -1413,11 +1815,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1433,11 +1835,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1453,11 +1855,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1473,11 +1875,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1493,11 +1895,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1513,11 +1915,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000CB0300009A000000</Data> + <Data>11010000660000002B0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1533,11 +1935,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1553,11 +1955,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1573,11 +1975,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1593,11 +1995,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1613,11 +2015,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1633,11 +2035,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1653,11 +2055,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1673,11 +2075,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000F5010000</Data> + <Data>030000006600000007010000F0010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000002C010000E9010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -1693,11 +2095,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000F5010000</Data> + <Data>030000006600000007010000F0010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000002C010000E9010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -1713,11 +2115,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000005A010000AD0300008E010000</Data> + <Data>030000003C0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1733,11 +2135,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>0000000012020000CE0300007E020000</Data> + <Data>000000000D0200002E030000AE020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1753,11 +2155,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000005A010000AD0300008E010000</Data> + <Data>030000003C0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1773,11 +2175,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9401000063000000CE030000B3000000</Data> + <Data>0E010000630000002E030000B3000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1793,11 +2195,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000CB0300009A000000</Data> + <Data>11010000660000002B0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1833,11 +2235,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1853,11 +2255,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -1873,11 +2275,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000CB0300009A000000</Data> + <Data>11010000660000002B0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1893,11 +2295,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000CB0300009A000000</Data> + <Data>11010000660000002B0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1913,11 +2315,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>9701000066000000CB0300009A000000</Data> + <Data>11010000660000002B0300009A000000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -1933,11 +2335,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1953,11 +2355,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1973,11 +2375,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -1993,11 +2395,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2013,11 +2415,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2033,11 +2435,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2053,11 +2455,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2073,11 +2475,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2093,11 +2495,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2113,11 +2515,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2133,11 +2535,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2153,11 +2555,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2173,11 +2575,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2193,11 +2595,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2213,11 +2615,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2233,11 +2635,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2253,11 +2655,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2273,11 +2675,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2293,11 +2695,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2313,11 +2715,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2333,11 +2735,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>2302000066000000AD03000026010000</Data> + <Data>4A03000066000000EE03000052010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000000002000017020000</Data> + <Data>A4000000BB0000004E01000048010000</Data> </RectRecentFloat> </Window> <Window> @@ -2353,11 +2755,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>03000000660000008D010000F5010000</Data> + <Data>030000006600000007010000F0010000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000002C010000E9010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -2373,11 +2775,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000005A010000AD0300008E010000</Data> + <Data>030000003C0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>700000008700000048020000DF000000</Data> + <Data>A4000000BB0000009C0200001C010000</Data> </RectRecentFloat> </Window> <Window> @@ -2393,11 +2795,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>030000005A010000AD0300008E010000</Data> + <Data>030000003C0200005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>70000000870000002C010000E9010000</Data> + <Data>A4000000BB0000006D01000040020000</Data> </RectRecentFloat> </Window> <Window> @@ -2413,11 +2815,11 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> </RectRecentFloat> </Window> <Window> @@ -2433,11 +2835,411 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>D503000066000000FD04000065020000</Data> + <Data>35030000660000005305000095020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> - <Data>A0030000820100001C060000EE010000</Data> + <Data>A3040000790100004A0700001A020000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50000</RegID> + <PaneID>50000</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50001</RegID> + <PaneID>50001</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50002</RegID> + <PaneID>50002</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50003</RegID> + <PaneID>50003</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50004</RegID> + <PaneID>50004</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50005</RegID> + <PaneID>50005</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50006</RegID> + <PaneID>50006</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50007</RegID> + <PaneID>50007</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50008</RegID> + <PaneID>50008</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50009</RegID> + <PaneID>50009</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50010</RegID> + <PaneID>50010</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50011</RegID> + <PaneID>50011</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50012</RegID> + <PaneID>50012</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50013</RegID> + <PaneID>50013</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50014</RegID> + <PaneID>50014</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50015</RegID> + <PaneID>50015</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50016</RegID> + <PaneID>50016</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50017</RegID> + <PaneID>50017</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50018</RegID> + <PaneID>50018</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>4A03000066000000EE03000052010000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>A4000000BB0000004E01000048010000</Data> + </RectRecentFloat> + </Window> + <Window> + <RegID>50019</RegID> + <PaneID>50019</PaneID> + <IsVisible>0</IsVisible> + <IsFloating>0</IsFloating> + <IsTabbed>0</IsTabbed> + <IsActivated>0</IsActivated> + <MRUWidth>32767</MRUWidth> + <PinState>0</PinState> + <RecentFrameAlignment>4096</RecentFrameAlignment> + <RecentRowIndex>0</RecentRowIndex> + <RectRecentDocked> + <Len>16</Len> + <Data>0300000053020000240000006E020000</Data> + </RectRecentDocked> + <RectRecentFloat> + <Len>16</Len> + <Data>0A0000000A0000006E0000006E000000</Data> </RectRecentFloat> </Window> <Window> @@ -2473,7 +3275,7 @@ <RecentRowIndex>0</RecentRowIndex> <RectRecentDocked> <Len>16</Len> - <Data>000000007E0200000005000091020000</Data> + <Data>00000000AE02000056050000C1020000</Data> </RectRecentDocked> <RectRecentFloat> <Len>16</Len> @@ -2521,15 +3323,15 @@ </RectRecentFloat> </Window> <DockMan> - <Len>2722</Len> - <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFF94010000B3000000CE030000B7000000010000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000010000009401000066000000CE030000CA000000940100004F000000CE030000B30000000000000040280056060000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1C0200004F000000200200003F010000000000000200000004000000010000000000000000000000FFFFFFFF17000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C0000018000400000000000002002000066000000B003000056010000200200004F000000B00300003F0100000000000040410046170000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF900100004F000000940100000E020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000009001000025020000000000004F000000900100000E0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF000000000E020000CE0300001202000001000000010000100400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFF8002000012020000840200007E02000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF000000003F010000B003000043010000000000000100000004000000010000000000000000000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000000000000000000005A010000B0030000BE0100000000000043010000B0030000A70100000000000040820046040000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFFCE0300004F000000D20300007E0200000100000002000010040000000100000053FEFFFFB401000000000000000000000000000001000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800040000001000000D2030000660000000005000095020000D20300004F000000000500007E02000000000000404100560E0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000000000000000000</Data> + <Len>3223</Len> + <Data>000000000C000000000000000020000001000000FFFFFFFFFFFFFFFF0E010000B30000002E030000B7000000010000000100001004000000010000000000000000000000FFFFFFFF06000000CB00000057010000CC000000F08B00005A01000079070000FFFF02000B004354616262656450616E6500200000010000000E010000660000002E030000CA0000000E0100004F0000002E030000B30000000000000040280056060000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF430300004F000000470300006B010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000004703000066000000F103000082010000470300004F000000F10300006B01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF0A0100004F0000000E010000090200000100000002000010040000000100000058FFFFFFA3040000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000000A01000020020000000000004F0000000A010000090200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000090200002E0300000D02000001000000010000100400000001000000000000000000000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFAB0200000D020000AF020000AE02000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000210200005605000025020000000000000100000004000000010000000EFEFFFF62000000FFFFFFFF04000000C5000000C7000000B40100007794000001800080000000000000000000003C02000056050000C5020000000000002502000056050000AE0200000000000040820046040000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF2E0300004F00000032030000AE02000001000000020000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF0E0000008F070000930700009407000095070000960700009007000091070000B5010000B8010000B9050000BA050000BB050000BC050000CB09000001800040000001000000320300006600000056050000C5020000320300004F00000056050000AE02000000000000404100560E0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0500000000000000000000000000000000000000000000000000000001000000FFFFFFFF8F07000001000000FFFFFFFF8F070000000000000000000000000000</Data> </DockMan> <ToolBar> <RegID>59392</RegID> <Name>File</Name> <Buttons> - <Len>2256</Len> - <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000097461675F74696D657296000000000000000E00097461675F74696D65720D7461675F64656C617974696D650E5245504F45545F414E435F4E554D0B616E63686F725F7479706508414E435F504F4C4C05696E6465780B675F70616972737461727409675F5461676469737410574F524B5F4D4F44455F414E43484F520D574F524B5F4D4F44455F5441470A7061636B5F696E646578125573617274526563765061636B537461746515557361727452656365697665576169744865616430116D5573617274526563656976655061636B0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020001001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F50726F6A6563742057696E646F7773000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data> + <Len>2402</Len> + <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A706F6C6C5F74696D6572960000000000000014000A706F6C6C5F74696D6572156C6F63616C697A6174696F6E5461736B456E7472791759415753544154494F4E4152595F5448524553484F4C440F416E67756C6172466565644261636B07416E67756C6172124C7066416E67756C6172466565644261636B1B434F4D4D5F4D41505F56454849434C455F5455524E5F53504545440F434F4D4D5F4D41505F494D555F475A10434F4D4D5F4D41505F494D555F5941570A73696D756C6174696F6E0F454B465F50726553746174655B305D05454B465F5A065B335D5B335D0A7061636B5F73656E642E04667265650E675F63686173736973537065656410784D425254555265636569766546534D1770784D424672616D6543424279746552656365697665641070654D424672616D65526563656976651370654D424672616D65526563656976654375720000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018022800000020003001500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000000180C8880000000000001700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E4C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002880DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002880DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002880E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002880E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000288018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000028800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002880D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002880E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65AC030000</Data> </Buttons> <OriginalItems> <Len>1423</Len> @@ -2544,8 +3346,8 @@ <RegID>59399</RegID> <Name>Build</Name> <Buttons> - <Len>657</Len> - <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000</Data> + <Len>672</Len> + <Data>00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E00000000000000000000000000000000010000000100000001809E8A0000000000001F0000000000000000000000000000000001000000010000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64CF010000</Data> </Buttons> <OriginalItems> <Len>583</Len> @@ -2560,8 +3362,8 @@ <RegID>59400</RegID> <Name>Debug</Name> <Buttons> - <Len>2220</Len> - <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000002001380D88B000000000000310000000757617463682031000000000000000000000000010000000100000000000000000000000100000000001380D98B0000000000003100000007576174636820320000000000000000000000000100000001000000000000000000000001000000000013800F01000002000100320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000084D656D6F72792031000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000084D656D6F72792032000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000084D656D6F72792033000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000084D656D6F727920340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000755415254202331000000000000000000000000010000000100000000000000000000000100000000001380940700000000000033000000075541525420233200000000000000000000000001000000010000000000000000000000010000000000138095070000000000003300000007554152542023330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000000E49544D2F525441205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380658A000000000000340000000E4C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E00000014506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000D436F646520436F76657261676500000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000138001890000020000003600000007546F6F6C626F7800000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> + <Len>2362</Len> + <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000020000003400000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data> </Buttons> <OriginalItems> <Len>898</Len> @@ -2574,8 +3376,8 @@ </ToolBar> <ControlBarsSummary> <Bars>0</Bars> - <ScreenCX>1280</ScreenCX> - <ScreenCY>720</ScreenCY> + <ScreenCX>1366</ScreenCX> + <ScreenCY>768</ScreenCY> </ControlBarsSummary> </ViewEx> </WinLayoutEx> @@ -2585,12 +3387,12 @@ <ActiveMDIGroup>0</ActiveMDIGroup> <MDIGroup> <Size>100</Size> - <ActiveTab>1</ActiveTab> + <ActiveTab>5</ActiveTab> <Doc> - <Name>..\Src\application\beep_logic_app.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>15</TopLine> - <CurrentLine>16</CurrentLine> + <Name>..\Src\main.c</Name> + <ColumnNumber>8</ColumnNumber> + <TopLine>8</TopLine> + <CurrentLine>26</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -2598,35 +3400,53 @@ <Doc> <Name>..\Src\stm32f10x_it.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>61</TopLine> - <CurrentLine>70</CurrentLine> + <TopLine>36</TopLine> + <CurrentLine>51</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\main.c</Name> + <Name>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>7</TopLine> - <CurrentLine>8</CurrentLine> + <TopLine>32</TopLine> + <CurrentLine>43</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> - <Name>..\Src\OnChipDevices\Spi.c</Name> + <Name>..\Src\Libraries\STM32F10x_StdPeriph_Driver\inc\stm32f10x_tim.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>144</TopLine> - <CurrentLine>161</CurrentLine> + <TopLine>340</TopLine> + <CurrentLine>349</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\Rcc_Nvic_Systick.h</Name> + <ColumnNumber>28</ColumnNumber> + <TopLine>1</TopLine> + <CurrentLine>16</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> </Doc> <Doc> <Name>..\Src\application\dw_app.c</Name> - <ColumnNumber>46</ColumnNumber> - <TopLine>278</TopLine> - <CurrentLine>279</CurrentLine> + <ColumnNumber>0</ColumnNumber> + <TopLine>617</TopLine> + <CurrentLine>383</CurrentLine> + <Folding>1</Folding> + <ContractedFolders></ContractedFolders> + <PaneID>0</PaneID> + </Doc> + <Doc> + <Name>..\Src\OnChipDevices\Usart.c</Name> + <ColumnNumber>33</ColumnNumber> + <TopLine>82</TopLine> + <CurrentLine>91</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> @@ -2634,44 +3454,8 @@ <Doc> <Name>..\Src\application\global_param.h</Name> <ColumnNumber>0</ColumnNumber> - <TopLine>9</TopLine> - <CurrentLine>13</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\application\dw_app.h</Name> - <ColumnNumber>18</ColumnNumber> - <TopLine>13</TopLine> - <CurrentLine>14</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\application\global_param.c</Name> - <ColumnNumber>2</ColumnNumber> - <TopLine>30</TopLine> - <CurrentLine>37</CurrentLine> - <Folding>1</Folding> - <ContractedFolders></ContractedFolders> - <PaneID>0</PaneID> - </Doc> - <Doc> - <Name>..\Src\application\serial_at_cmd_app.c</Name> - <ColumnNumber>0</ColumnNumber> - <TopLine>1</TopLine> - <CurrentLine>1</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>132</TopLine> - <CurrentLine>133</CurrentLine> + <TopLine>10</TopLine> + <CurrentLine>17</CurrentLine> <Folding>1</Folding> <ContractedFolders></ContractedFolders> <PaneID>0</PaneID> diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" index 0d15a1b..ac42785 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" @@ -78,33 +78,6 @@ <IsCurrentTarget>1</IsCurrentTarget> </OPTFL> <CpuCode>18</CpuCode> - <Books> - <Book> - <Number>0</Number> - <Title>Quick Start Guide (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/STM32E_QSG.pdf</Path> - </Book> - <Book> - <Number>1</Number> - <Title>Base Board Schematics (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e-base-board-schematics.pdf</Path> - </Book> - <Book> - <Number>2</Number> - <Title>Display Board Schematics (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e-display-board-schematics.pdf</Path> - </Book> - <Book> - <Number>3</Number> - <Title>User Manual (MCBSTM32E)</Title> - <Path>d:\Keil_v5\ARM\PACK\Keil\STM32F1xx_DFP\2.3.0\Boards/Keil/MCBSTM32E/Documentation/mcbstm32e.chm</Path> - </Book> - <Book> - <Number>4</Number> - <Title>MCBSTM32E Evaluation Board Web Page (MCBSTM32E)</Title> - <Path>http://www.keil.com/mcbstm32e/</Path> - </Book> - </Books> <DebugOpt> <uSim>0</uSim> <uTrg>1</uTrg> @@ -127,7 +100,8 @@ <tRSysVw>1</tRSysVw> <sRunDeb>0</sRunDeb> <sLrtime>0</sLrtime> - <nTsel>6</nTsel> + <bEvRecOn>1</bEvRecOn> + <nTsel>3</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -144,7 +118,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>鍥�?</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -154,7 +128,7 @@ <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20090928 -O2254 -S1 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103T8$Flash\STM32F10x_128.FLM)</Name> + <Name>-U20090928 -O2254 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103T8$Flash\STM32F10x_128.FLM)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -169,7 +143,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGTARM</Key> - <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=747,81,1158,476,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name> + <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=747,81,1158,476,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,30,744,724,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -264,6 +238,16 @@ <WinNumber>1</WinNumber> <ItemText>hex_dist,0x0A</ItemText> </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>timer3,0x0A</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <ItemText>time32_incr,0x0A</ItemText> + </Ww> </WatchWindow1> <MemoryWindow1> <Mm> @@ -312,6 +296,13 @@ </DebugFlag> <LintExecutable></LintExecutable> <LintConfigFile></LintConfigFile> + <bLintAuto>0</bLintAuto> + <bAutoGenD>0</bAutoGenD> + <LntExFlags>0</LntExFlags> + <pMisraName></pMisraName> + <pszMrule></pszMrule> + <pSingCmds></pSingCmds> + <pMultCmds></pMultCmds> <DebugDescription> <Enable>1</Enable> <EnableLog>0</EnableLog> @@ -332,7 +323,6 @@ <FileNumber>1</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\dw_app.c</PathWithFileName> @@ -345,7 +335,6 @@ <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\serial_at_cmd_app.c</PathWithFileName> @@ -358,7 +347,6 @@ <FileNumber>3</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\beep_logic_app.c</PathWithFileName> @@ -371,7 +359,6 @@ <FileNumber>4</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\global_param.c</PathWithFileName> @@ -392,7 +379,6 @@ <FileNumber>5</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\main.c</PathWithFileName> @@ -405,7 +391,6 @@ <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\stm32f10x_it.c</PathWithFileName> @@ -426,7 +411,6 @@ <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\algorithm\filters.c</PathWithFileName> @@ -447,7 +431,6 @@ <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\decadriver\deca_device.c</PathWithFileName> @@ -460,7 +443,6 @@ <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\decadriver\deca_params_init.c</PathWithFileName> @@ -473,7 +455,6 @@ <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\decadriver\deca_range_tables.c</PathWithFileName> @@ -494,7 +475,6 @@ <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\ExternalDevices\dw_driver.c</PathWithFileName> @@ -507,7 +487,6 @@ <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\ExternalDevices\led.c</PathWithFileName> @@ -520,7 +499,6 @@ <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\ExternalDevices\beep.c</PathWithFileName> @@ -541,7 +519,6 @@ <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\Usart.c</PathWithFileName> @@ -554,7 +531,6 @@ <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\Spi.c</PathWithFileName> @@ -566,8 +542,7 @@ <GroupNumber>6</GroupNumber> <FileNumber>16</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> - <Focus>1</Focus> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\Rcc_Nvic_Systick.c</PathWithFileName> @@ -580,7 +555,6 @@ <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\RTC.c</PathWithFileName> @@ -593,7 +567,6 @@ <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\Flash.c</PathWithFileName> @@ -606,7 +579,6 @@ <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>0</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\OnChipDevices\ADC.c</PathWithFileName> @@ -627,7 +599,6 @@ <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\misc.c</PathWithFileName> @@ -640,7 +611,6 @@ <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_adc.c</PathWithFileName> @@ -653,7 +623,6 @@ <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_bkp.c</PathWithFileName> @@ -666,7 +635,6 @@ <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_can.c</PathWithFileName> @@ -679,7 +647,6 @@ <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_cec.c</PathWithFileName> @@ -692,7 +659,6 @@ <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_crc.c</PathWithFileName> @@ -705,7 +671,6 @@ <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dac.c</PathWithFileName> @@ -718,7 +683,6 @@ <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dbgmcu.c</PathWithFileName> @@ -731,7 +695,6 @@ <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_dma.c</PathWithFileName> @@ -744,7 +707,6 @@ <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_exti.c</PathWithFileName> @@ -757,7 +719,6 @@ <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_flash.c</PathWithFileName> @@ -770,7 +731,6 @@ <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_fsmc.c</PathWithFileName> @@ -783,7 +743,6 @@ <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_gpio.c</PathWithFileName> @@ -796,7 +755,6 @@ <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_i2c.c</PathWithFileName> @@ -809,7 +767,6 @@ <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_iwdg.c</PathWithFileName> @@ -822,7 +779,6 @@ <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_pwr.c</PathWithFileName> @@ -835,7 +791,6 @@ <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rcc.c</PathWithFileName> @@ -848,7 +803,6 @@ <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_rtc.c</PathWithFileName> @@ -861,7 +815,6 @@ <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_sdio.c</PathWithFileName> @@ -874,7 +827,6 @@ <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_spi.c</PathWithFileName> @@ -887,7 +839,6 @@ <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_tim.c</PathWithFileName> @@ -900,7 +851,6 @@ <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_usart.c</PathWithFileName> @@ -913,7 +863,6 @@ <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\STM32F10x_StdPeriph_Driver\src\stm32f10x_wwdg.c</PathWithFileName> @@ -934,7 +883,6 @@ <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\CMSIS\CM3\CoreSupport\core_cm3.c</PathWithFileName> @@ -947,7 +895,6 @@ <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\system_stm32f10x.c</PathWithFileName> @@ -960,7 +907,6 @@ <FileNumber>45</FileNumber> <FileType>2</FileType> <tvExp>0</tvExp> - <Focus>1</Focus> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\Libraries\CMSIS\CM3\DeviceSupport\ST\STM32F10x\startup\arm\startup_stm32f10x_md.s</PathWithFileName> diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" index 82cdf7d..0410b48 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvprojx" @@ -10,11 +10,12 @@ <TargetName>STM32</TargetName> <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> + <pCCUsed>5060422::V5.06 update 4 (build 422)::ARMCC</pCCUsed> <TargetOption> <TargetCommonOption> <Device>STM32F103C8</Device> <Vendor>STMicroelectronics</Vendor> - <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID> + <PackID>Keil.STM32F1xx_DFP.2.2.0</PackID> <PackURL>http://www.keil.com/pack/</PackURL> <Cpu>IRAM(0x20000000,0x5000) IROM(0x08000000,0x10000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu> <FlashUtilSpec></FlashUtilSpec> @@ -84,6 +85,8 @@ <UserProg2Name></UserProg2Name> <UserProg1Dos16Mode>0</UserProg1Dos16Mode> <UserProg2Dos16Mode>0</UserProg2Dos16Mode> + <nStopA1X>0</nStopA1X> + <nStopA2X>0</nStopA2X> </AfterMake> <SelectedForBatchBuild>0</SelectedForBatchBuild> <SVCSIdString></SVCSIdString> @@ -122,47 +125,6 @@ <HexOffset>0</HexOffset> <Oh166RecLen>16</Oh166RecLen> </OPTHX> - <Simulator> - <UseSimulator>0</UseSimulator> - <LoadApplicationAtStartup>1</LoadApplicationAtStartup> - <RunToMain>1</RunToMain> - <RestoreBreakpoints>1</RestoreBreakpoints> - <RestoreWatchpoints>1</RestoreWatchpoints> - <RestoreMemoryDisplay>1</RestoreMemoryDisplay> - <RestoreFunctions>1</RestoreFunctions> - <RestoreToolbox>1</RestoreToolbox> - <LimitSpeedToRealTime>0</LimitSpeedToRealTime> - <RestoreSysVw>1</RestoreSysVw> - </Simulator> - <Target> - <UseTarget>1</UseTarget> - <LoadApplicationAtStartup>1</LoadApplicationAtStartup> - <RunToMain>1</RunToMain> - <RestoreBreakpoints>1</RestoreBreakpoints> - <RestoreWatchpoints>1</RestoreWatchpoints> - <RestoreMemoryDisplay>1</RestoreMemoryDisplay> - <RestoreFunctions>0</RestoreFunctions> - <RestoreToolbox>1</RestoreToolbox> - <RestoreTracepoints>0</RestoreTracepoints> - <RestoreSysVw>1</RestoreSysVw> - </Target> - <RunDebugAfterBuild>0</RunDebugAfterBuild> - <TargetSelection>6</TargetSelection> - <SimDlls> - <CpuDll></CpuDll> - <CpuDllArguments></CpuDllArguments> - <PeripheralDll></PeripheralDll> - <PeripheralDllArguments></PeripheralDllArguments> - <InitializationFile></InitializationFile> - </SimDlls> - <TargetDlls> - <CpuDll></CpuDll> - <CpuDllArguments></CpuDllArguments> - <PeripheralDll></PeripheralDll> - <PeripheralDllArguments></PeripheralDllArguments> - <InitializationFile></InitializationFile> - <Driver>Segger\JL2CM3.dll</Driver> - </TargetDlls> </DebugOption> <Utilities> <Flash1> @@ -227,6 +189,7 @@ <useUlib>1</useUlib> <EndSel>0</EndSel> <uLtcg>0</uLtcg> + <nSecure>0</nSecure> <RoSelD>3</RoSelD> <RwSelD>3</RwSelD> <CodeSel>0</CodeSel> @@ -361,6 +324,13 @@ <uSurpInc>0</uSurpInc> <uC99>1</uC99> <useXO>0</useXO> + <v6Lang>1</v6Lang> + <v6LangP>1</v6LangP> + <vShortEn>1</vShortEn> + <vShortWch>1</vShortWch> + <v6Lto>0</v6Lto> + <v6WtE>0</v6WtE> + <v6Rtti>0</v6Rtti> <VariousControls> <MiscControls></MiscControls> <Define>USE_STDPERIPH_DRIVER,__CC_ARM</Define> @@ -378,6 +348,7 @@ <NoWarn>0</NoWarn> <uSurpInc>0</uSurpInc> <useXO>0</useXO> + <uClangAs>0</uClangAs> <VariousControls> <MiscControls></MiscControls> <Define></Define> @@ -674,4 +645,10 @@ </Target> </Targets> + <RTE> + <apis/> + <components/> + <files/> + </RTE> + </Project> diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c" index e526fb3..15cffba 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.c" @@ -145,7 +145,38 @@ NVIC_Init(&NVIC_InitStructure); } - +//?????3????? +//???????APB1?2?,?APB1?36M +//arr:?????? +//psc:?????? +//?????????3! +void TIM3_Int_Init(void) +{ + TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure; + NVIC_InitTypeDef NVIC_InitStructure; + + RCC_APB1PeriphClockCmd(RCC_APB1Periph_TIM3, ENABLE); //???? + + //???TIM3??? + TIM_TimeBaseStructure.TIM_Period = 1000-1; //??????????????????????????? + TIM_TimeBaseStructure.TIM_Prescaler =72-1; //??????TIMx??????????? + TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1; //??????:TDTS = Tck_tim + TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; //TIM?????? + TIM_TimeBaseInit(TIM3, &TIM_TimeBaseStructure); //??????????TIMx??????? + + TIM_ITConfig(TIM3,TIM_IT_Update,ENABLE ); //?????TIM3??,?????? + + //?????NVIC?? + NVIC_InitStructure.NVIC_IRQChannel = TIM3_IRQn; //TIM3?? + NVIC_InitStructure.NVIC_IRQChannelPreemptionPriority = 0; //?????0? + NVIC_InitStructure.NVIC_IRQChannelSubPriority = 0; //????3? + NVIC_InitStructure.NVIC_IRQChannelCmd = ENABLE; //IRQ????? + NVIC_Init(&NVIC_InitStructure); //???NVIC??? + + + TIM_Cmd(TIM3, ENABLE); //??TIMx +} +//???3?????? int Systick_Init(void) { int time_retry = 500; diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h" index ace41dc..f709c5f 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Rcc_Nvic_Systick.h" @@ -12,4 +12,6 @@ void delay_us(uint32_t nTimer); void delay_ms(uint32_t nTimer); void RTC_Configuration(uint16_t interval); +void TIM3_Int_Init(void); +int RCC_Configuration(void); #endif diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" index e177d8c..0718116 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.c" @@ -88,8 +88,12 @@ GPIO_Init(EU_RX_GPIO, &GPIO_InitStructure); GPIO_InitStructure.GPIO_Pin = EU_TX_PIN; - GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP;//GPIO_Mode_AF_PP; //Tx推挽复用输出 + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP GPIO_Init(EU_TX_GPIO, &GPIO_InitStructure); + + GPIO_InitStructure.GPIO_Pin = EU_485_PIN; + GPIO_InitStructure.GPIO_Mode = GPIO_Mode_Out_PP; //Tx推挽复用输出 GPIO_Mode_AF_PP + GPIO_Init(EU_485_GPIO, &GPIO_InitStructure); #ifdef UART_GPIO_REMAP_ENABLE GPIO_PinRemapConfig(UART_GPIO_REMAP, ENABLE); @@ -175,6 +179,7 @@ { if(m_bEUARTTxEn) { + OUT485_DISABLE; m_bEUARTTxEn = 0; // temp32 = GPIOC->CRH; //C10悬空输入 // temp32 &= ~(0x00000000F<<8); @@ -185,6 +190,7 @@ m_bEUARTCheckingSend = 0; return; } + OUT485_ENABLE; if(!m_bEUARTTxEn) { m_bEUARTTxEn = 1; @@ -193,6 +199,7 @@ // temp32 |= (0x000000009<<8); // GPIOC->CRH = temp32;// */ } + //发送一个字节数据 EXT_UART->DR = m_EUART_TxFrames[m_EUART_TxFrm_Tail].buf[s_count]; s_count++; diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" index 0cb0059..bdd2c30 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/OnChipDevices/Usart.h" @@ -4,6 +4,11 @@ #include "stm32f10x.h" +#define EU_485_PIN GPIO_Pin_7 +#define EU_485_GPIO GPIOB +#define OUT485_ENABLE GPIO_WriteBit(EU_485_GPIO, EU_485_PIN, Bit_SET); +#define OUT485_DISABLE GPIO_WriteBit(EU_485_GPIO, EU_485_PIN, Bit_RESET); + //#define UART_GPIO_REMAP_ENABLE #ifdef UART_GPIO_REMAP_ENABLE #define UART_GPIO_REMAP GPIO_Remap_USART1 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 2491416..83dcf89 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" @@ -77,7 +77,8 @@ #define BUTTON_IDX 16 #define SEQUENCE_IDX 17 //respose -#define TIMECORRE 14 +#define ANCTIMEMS 14 +#define ANCTIMEUS 16 #define POLL 0x01 #define RESPONSE 0x02 @@ -106,7 +107,7 @@ static uint8_t tx_final_msg[] = {0x41, 0x88, 0, 0xCA, 0xDE, 'W', 'A', 'V', 'E', 0x23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; //static uint8_t rx_poll_msg[] = {0x00, 0x88, 0, 0xCA, 0xDE, 'W', 'A', 'V', 'E', 0x21, 0, 0}; -static uint8_t tx_resp_msg[18] = {0}; +static uint8_t tx_resp_msg[20] = {0}; //static uint8_t rx_final_msg[] = {0x41, 0x88, 0, 0xCA, 0xDE, 'W', 'A', 'V', 'E', 0x23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; /* Frame sequence number, incremented after each transmission. */ @@ -315,12 +316,14 @@ int32_t hex_dist; u16 checksum; int8_t tag_delaytime; +extern uint16_t sync_timer; +u16 tmp_time; void Tag_App(void)//发送模式(TAG标签) { uint32_t frame_len; uint32_t final_tx_time; u32 start_poll; - u8 i; + u8 i,getsync_flag=0; //LED0_ON; dwt_forcetrxoff(); g_Resttimer=0; @@ -330,11 +333,11 @@ tx_poll_msg[BATTARY_IDX] = Get_Battary(); tx_poll_msg[BUTTON_IDX] = !READ_KEY0; tx_poll_msg[SEQUENCE_IDX] = frame_seq_nb++; - + GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_RESET); for(i=0;i<g_com_map[MAX_REPORT_ANC_NUM];i++) { /* Write frame data to DW1000 and prepare transmission. See NOTE 7 below. */ - tx_poll_msg[ANC_TYPE_IDX] = i; + tx_poll_msg[ANC_TYPE_IDX] = i-1; dwt_writetxdata(sizeof(tx_poll_msg), tx_poll_msg, 0);//将Poll包数据传给DW1000,将在开启发送时传出去 dwt_writetxfctrl(sizeof(tx_poll_msg), 0);//设置超宽带发送数据长度 @@ -377,15 +380,21 @@ poll_tx_ts = get_tx_timestamp_u64(); //获得POLL发送时间T1 resp_rx_ts = get_rx_timestamp_u64(); //获得RESPONSE接收时间T4 - if(i==0) - { - tag_delaytime=rx_buffer[TIMECORRE]; - if(tag_delaytime>g_com_map[COM_INTERVAL]/2) - { - tag_delaytime=tag_delaytime-g_com_map[COM_INTERVAL]; - } - } - + if(getsync_flag==0) + { + getsync_flag=1; + memcpy(&sync_timer,&rx_buffer[ANCTIMEMS],2); + memcpy(&tmp_time,&rx_buffer[ANCTIMEUS],2); + tmp_time=tmp_time+450; + if(tmp_time>999) + { + tmp_time-=999; + sync_timer++; + if(sync_timer>=1010) + {sync_timer=0;} + } + TIM3->CNT=tmp_time; + } memcpy(&anchor_dist_last_frm[0], &rx_buffer[DIST_IDX], 4); memcpy(&tx_final_msg[ANCHOR_ID_IDX], &rx_buffer[ANCHOR_ID_IDX], 4); /* Compute final message transmission time. See NOTE 9 below. */ @@ -460,7 +469,7 @@ } int8_t correction_time; extern uint8_t sync_seq; -extern uint16_t sync_timer; + void Anchor_App(void) { uint32_t frame_len; @@ -507,10 +516,10 @@ if (rx_buffer[MESSAGE_TYPE_IDX] == POLL&&(anchor_type == rx_buffer[ANC_TYPE_IDX])) //判断是否是poll包数据 { - correction_time=tag_timer-tag_id_recv*3; - if(correction_time == g_com_map[COM_INTERVAL]) - correction_time = 0; - tx_resp_msg[TIMECORRE] = correction_time; + tmp_time=TIM3->CNT; + memcpy(&tx_resp_msg[ANCTIMEMS],&sync_timer,2); + memcpy(&tx_resp_msg[ANCTIMEUS],&tmp_time,2); + // if(correction_time>10) // {correction_time++;} @@ -629,10 +638,11 @@ }else if(rx_buffer[MESSAGE_TYPE_IDX] == SYNC) { if(rx_buffer[SYNC_SEQ_IDX]<sync_seq) + // if(rx_buffer[SYNC_SEQ_IDX]==2) { sync_seq=rx_buffer[SYNC_SEQ_IDX]+1; - SysTick->VAL =00; - sync_timer=0; + TIM3->CNT = sync_seq*325%1000+15; + sync_timer = sync_seq*325/1000; SyncPoll(sync_seq); } } 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 3ed18c7..78ab7a3 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" @@ -18,7 +18,8 @@ //SystemInit(); NVIC_SetVectorTable(NVIC_VectTab_FLASH, 0x5000); Nvic_Init(); - Systick_Init(); +// Systick_Init(); + TIM3_Int_Init(); Led_Init(); Beep_Init(); DW_GPIO_Init(); @@ -42,6 +43,7 @@ checksum = Checksum_u16(&hbsend[2],12); memcpy(&hbsend[14],&checksum,2); } +u16 tyncpoll_time; void Program_Init(void) {uint16_t i; Usart1ParseDataCallback = UsartParseDataHandler; @@ -49,12 +51,17 @@ //deca_sleep(1000); HeartBeatInit(); dev_id = g_com_map[DEV_ID]; +// g_com_map[DEV_ROLE]=1; +// g_com_map[DEV_ID]=1; +// g_com_map[COM_INTERVAL]=10; if(g_com_map[DEV_ROLE]) { + tyncpoll_time=g_com_map[DEV_ID]*g_com_map[MAX_REPORT_ANC_NUM]*4/3; printf("标签ID: %d .\r\n",dev_id); printf("通讯间隔: %d ms.\r\n",g_com_map[COM_INTERVAL]); printf("单次通讯基站数量: %d个.\r\n",g_com_map[MAX_REPORT_ANC_NUM]); }else{ + anchor_type = dev_id%g_com_map[MAX_REPORT_ANC_NUM]; printf("基站ID: %x .\r\n",dev_id); printf("基站类型: %c .\r\n",anchor_type+0x41); @@ -96,24 +103,7 @@ if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0) HeatBeat(); } - if(poll_timer>=g_com_map[COM_INTERVAL]-tag_delaytime) - { - poll_timer=0; - if(g_com_map[ANC_POLL]||g_com_map[DEV_ROLE]) - { - if(g_com_map[DEV_ROLE]==0) - {int8_t correction_time; - correction_time=tag_timer-g_com_map[DEV_ID]*3; - tag_delaytime=correction_time; - if(tag_delaytime>g_com_map[COM_INTERVAL]/2) - { - tag_delaytime=tag_delaytime-g_com_map[COM_INTERVAL]; - } - } - g_start_send_flag=1; - } - - } + if(g_com_map[CNT_UPDATE]==1) { uint32_t result = 0; @@ -135,13 +125,14 @@ Device_Init(); Program_Init(); - Dw1000_Init(); + //Dw1000_Init(); delay_ms(10); Dw1000_App_Init(); /* Loop forever initiating ranging exchanges. */ RCC_APB1PeriphClockCmd(RCC_APB1Periph_PWR, ENABLE); usart_send[0]=0x55; usart_send[1]=0xAA; + UART_PushFrame(hbsend,16); while(1) { IdleTask(); 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 fd3f3d7..c1e9ce1 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" @@ -37,11 +37,14 @@ u16 tag_recv_timer, tag_timer; extern uint16_t g_Resttimer,heartbeat_timer,sync_timer; extern uint8_t g_pairstart; - -void SysTick_Handler(void) +u16 timer3; +extern u16 tyncpoll_time; +void TIM3_IRQHandler(void) //TIM3?? { - - time32_incr++; + if (TIM_GetITStatus(TIM3, TIM_IT_Update) != RESET) //??TIM3???????? + { + TIM_ClearITPendingBit(TIM3, TIM_IT_Update ); //??TIMx?????? + time32_incr++; g_UWB_com_interval++; heartbeat_timer++; poll_timer++; @@ -53,17 +56,14 @@ NVIC_SystemReset(); } -// if(g_UWB_com_interval > 1000) -// { -// dis_after_filter = DEFAULT_DISTANCE; -// } -//#ifdef WORK_MODE_ANCHOR + + sync_timer++; + if(!g_com_map[DEV_ROLE]) //基站 { tag_recv_timer++; TagDistClear(); - sync_timer++; - if(sync_timer==30) + if(sync_timer==10) { GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET); }else{ @@ -73,7 +73,7 @@ { sync_seq=0xff; } - if(sync_timer>=1000) + if(sync_timer>=1010) { sync_timer=0; if(dev_id==0) @@ -81,10 +81,26 @@ SyncPoll(0); } } - //if(g_pairstart!=1) - //main_logic(); + }else{ //标签同步处理 + if(sync_timer>=1010) + {sync_timer=0;} + if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time) + { + GPIO_WriteBit(GPIOA, GPIO_Pin_9, Bit_SET); + } + if((sync_timer-10)%g_com_map[COM_INTERVAL]==tyncpoll_time) + { + g_start_send_flag=1; + } + } -//#endif + + } +} + +void SysTick_Handler(void) +{ + } -- Gitblit v1.9.3