From 9d2282974b45aecf66adbd707fcde1ea83456703 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 01 六月 2020 15:02:52 +0800
Subject: [PATCH] 11
---
源码/核心板/Src/application/dw_app.h | 1
源码/核心板/Src/main.c | 18 ++
源码/核心板/Src/stm32f10x_it.c | 7
源码/核心板/MDK-ARM/Project.uvguix.Administrator | 218 +++++++++++++-------------
源码/核心板/Src/application/dw_app.c | 218 +++++++++++++++-----------
5 files changed, 256 insertions(+), 206 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
index a4c18d1..22d707f 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvguix.Administrator"
@@ -15,7 +15,7 @@
<View>
<WinId>38003</WinId>
<ViewName>Registers</ViewName>
- <TableColWidths>140 30</TableColWidths>
+ <TableColWidths>150 151</TableColWidths>
</View>
<View>
<WinId>346</WinId>
@@ -93,25 +93,25 @@
<flags>2</flags>
<showCmd>3</showCmd>
<MinPosition>
- <xPos>-32000</xPos>
- <yPos>-32000</yPos>
+ <xPos>-1</xPos>
+ <yPos>-1</yPos>
</MinPosition>
<MaxPosition>
<xPos>-1</xPos>
<yPos>-1</yPos>
</MaxPosition>
<NormalPosition>
- <Top>-1062</Top>
- <Left>681</Left>
- <Right>1970</Right>
- <Bottom>-377</Bottom>
+ <Top>0</Top>
+ <Left>0</Left>
+ <Right>1289</Right>
+ <Bottom>685</Bottom>
</NormalPosition>
</WindowPosition>
<MDIClientArea>
<RegID>0</RegID>
<MDITabState>
<Len>1419</Len>
- <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E00000001000000010000003B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000C5D4F200FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000FFDC7800FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000F0A0A100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000BCA8E100FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E63000000009CC1B600FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000F7B88600FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E6300000000D9ADC200FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000A5C2D700FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000B3A6BE00FFFFFFFF2C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C4D444B2D41524D5C3100000000013100000000EAD6A300FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000F6FA7D00FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F6770696F2E68000000001073746D3332663130785F6770696F2E6800000000B5E99D00FFFFFFFF3D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F726567732E68000000000B646563615F726567732E68000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000BC0300002EFCFFFF010A000033FFFFFF</Data>
+ <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000E00000000000000010000003B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E63000000000864775F6170702E6300000000C5D4F200FFFFFFFF35453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C73746D3332663130785F69742E63000000000E73746D3332663130785F69742E6300000000FFDC7800FFFFFFFF2D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF3F453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F6465766963652E63000000000D646563615F6465766963652E6300000000F0A0A100FFFFFFFF3B453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C64775F6170702E68000000000864775F6170702E6800000000BCA8E100FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E63000000000E676C6F62616C5F706172616D2E63000000009CC1B600FFFFFFFF41453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C676C6F62616C5F706172616D2E68000000000E676C6F62616C5F706172616D2E6800000000F7B88600FFFFFFFF43453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C6170706C69636174696F6E5C626565705F6C6F6769635F6170702E630000000010626565705F6C6F6769635F6170702E6300000000D9ADC200FFFFFFFF3A453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C5370692E6300000000055370692E6300000000A5C2D700FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E63000000000755736172742E6300000000B3A6BE00FFFFFFFF2C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C4D444B2D41524D5C3100000000013100000000EAD6A300FFFFFFFF3C453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4F6E43686970446576696365735C55736172742E68000000000755736172742E6800000000F6FA7D00FFFFFFFF60453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C4C69627261726965735C53544D3332463130785F5374645065726970685F4472697665725C696E635C73746D3332663130785F6770696F2E68000000001073746D3332663130785F6770696F2E6800000000B5E99D00FFFFFFFF3D453A5C4749545C5557425F536D616C6C4D6F64756C655CD4B4C2EB5CBACBD0C4B0E55C5372635C646563616472697665725C646563615F726567732E68000000000B646563615F726567732E68000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000003B010000660000000005000098010000</Data>
</MDITabState>
</MDIClientArea>
<ViewEx>
@@ -134,7 +134,7 @@
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
- <Data>A302000001FCFFFF6B0500008FFCFFFF</Data>
+ <Data>A40000006600000090050000F4000000</Data>
</RectRecentFloat>
</Window>
<Window>
@@ -150,7 +150,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000340100003B030000</Data>
+ <Data>03000000660000003401000068010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -170,7 +170,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000340100003B030000</Data>
+ <Data>03000000660000003401000068010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -190,7 +190,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>000000002702000090050000B5020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -210,7 +210,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -230,7 +230,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -250,7 +250,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -270,7 +270,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D050000B9000000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -330,7 +330,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -350,7 +350,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -370,7 +370,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -390,7 +390,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -410,7 +410,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -430,7 +430,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -450,7 +450,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000340100003B030000</Data>
+ <Data>03000000660000003401000068010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -470,7 +470,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>0300000066000000340100003B030000</Data>
+ <Data>03000000660000003401000068010000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -490,7 +490,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>000000006C03000080070000E6030000</Data>
+ <Data>030000009C010000FD04000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -520,7 +520,7 @@
<Window>
<RegID>199</RegID>
<PaneID>199</PaneID>
- <IsVisible>0</IsVisible>
+ <IsVisible>1</IsVisible>
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
@@ -530,7 +530,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000006F0300008D050000CD030000</Data>
+ <Data>030000009C010000FD04000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -550,7 +550,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>A40000006300000090050000DD000000</Data>
+ <Data>A7000000660000008D050000C4000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -610,7 +610,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F0040000630000009005000023020000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -630,7 +630,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>000000002702000090050000A1020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -690,7 +690,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>A40000006300000090050000DD000000</Data>
+ <Data>A7000000660000008D050000C4000000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -730,7 +730,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -750,7 +750,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -770,7 +770,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -790,7 +790,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -810,7 +810,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -830,7 +830,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -850,7 +850,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -870,7 +870,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -890,7 +890,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -910,7 +910,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -930,7 +930,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -950,7 +950,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -970,7 +970,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -990,7 +990,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1010,7 +1010,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1030,7 +1030,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1050,7 +1050,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1070,7 +1070,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1090,7 +1090,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1110,7 +1110,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1130,7 +1130,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1150,7 +1150,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>03000000660000009D0000009C020000</Data>
+ <Data>030000006600000034010000D0020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1170,7 +1170,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>000000006C03000090050000E6030000</Data>
+ <Data>030000009C0100007D07000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1190,7 +1190,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000006F0300008D050000CD030000</Data>
+ <Data>030000009C0100007D07000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1210,7 +1210,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1230,7 +1230,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1250,7 +1250,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000006F0300008D050000CD030000</Data>
+ <Data>030000009C0100007D07000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1270,7 +1270,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000006F0300008D050000CD030000</Data>
+ <Data>030000009C0100007D07000065020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1310,7 +1310,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1330,7 +1330,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1350,7 +1350,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1370,7 +1370,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1390,7 +1390,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1410,7 +1410,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1430,7 +1430,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1450,7 +1450,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1470,7 +1470,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1490,7 +1490,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1510,7 +1510,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1530,7 +1530,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1550,7 +1550,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1570,7 +1570,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1590,7 +1590,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1610,7 +1610,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1630,7 +1630,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1650,7 +1650,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1670,7 +1670,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1690,7 +1690,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>F3040000660000008D05000078010000</Data>
+ <Data>F3040000660000008D0500000A020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1704,7 +1704,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>32767</MRUWidth>
+ <MRUWidth>966</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>0</RecentRowIndex>
@@ -1730,7 +1730,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>00000000E603000080070000F9030000</Data>
+ <Data>000000007E0200000005000091020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1744,7 +1744,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>32767</MRUWidth>
+ <MRUWidth>476</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>1</RecentRowIndex>
@@ -1764,7 +1764,7 @@
<IsFloating>0</IsFloating>
<IsTabbed>0</IsTabbed>
<IsActivated>0</IsActivated>
- <MRUWidth>32767</MRUWidth>
+ <MRUWidth>612</MRUWidth>
<PinState>0</PinState>
<RecentFrameAlignment>8192</RecentFrameAlignment>
<RecentRowIndex>2</RecentRowIndex>
@@ -1790,7 +1790,7 @@
<RecentRowIndex>0</RecentRowIndex>
<RectRecentDocked>
<Len>16</Len>
- <Data>030000002A0200008D05000088020000</Data>
+ <Data>030000002A0200008D0500009C020000</Data>
</RectRecentDocked>
<RectRecentFloat>
<Len>16</Len>
@@ -1799,14 +1799,14 @@
</Window>
<DockMan>
<Len>3312</Len>
- <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000DD00000090050000E1000000000000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A302000001FCFFFF6B0500008FFCFFFFA40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFEC0400004F000000F004000023020000000000000200001004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A302000001FCFFFF4303000084FCFFFFF00400004F000000900500002302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF370100004F0000003B01000054030000010000000200001004000000010000001FFFFFFF94060000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000A302000001FCFFFF4303000084FCFFFF000000004F00000037010000540300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000A302000001FCFFFF4303000084FCFFFF000000001302000090050000B502000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000540300008007000058030000010000000100001004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000A302000001FCFFFF6B0500008FFCFFFF000000005803000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+ <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFA4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000A40000006600000090050000F4000000A40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFEC0400004F000000F004000023020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000F004000066000000900500003A020000F00400004F000000900500002302000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF370100004F0000003B01000081010000010000000200001004000000010000001FFFFFFF94060000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000660000003701000000030000000000004F00000037010000810100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF000000000F020000900500001302000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000002A02000090050000CC020000000000001302000090050000B502000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000013020000CC020000B502000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000008101000000050000850100000100000001000010040000000100000000FDFFFF8C000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000000403000080070000FD0300000000000085010000000500007E0200000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657301000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
</DockMan>
<ToolBar>
<RegID>59392</RegID>
<Name>File</Name>
<Buttons>
- <Len>2894</Len>
- <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000000000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000E63757272656E745F73796E636964960000000000000014000E63757272656E745F73796E6369640C7365697A655F616E63686F72096E65775F74616769640D74796E63706F6C6C5F74696D650A73796E635F74696D65720E73796E636C6F73745F74696D65720D5461674C6973745570646174650B7461676C6973745F6E756D0E7461676F66666C696E6574696D6511675F666C61675F5461676765746469737407307831666666660F6E6561726261736569645F6C6973740E4D6F646275735F486F6C64526567054C5054494D0E6477745F656E746572736C6565700F657873697374626173655F6C6973740D4457545F4C4F414455434F44450A76656C5F666163746F72067072696E746611675F73746172745F73796E635F666C61670000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000000000000010000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65FF7F0000</Data>
+ <Len>2893</Len>
+ <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000D4E656172416E6353656C656374960000000000000014000D4E656172416E6353656C656374097461675F73746174650B74785F6E6561725F6D73670D74796E63706F6C6C5F74696D650E63757272656E745F73796E6369640C7365697A655F616E63686F72096E65775F74616769640A73796E635F74696D65720E73796E636C6F73745F74696D65720D5461674C6973745570646174650B7461676C6973745F6E756D0E7461676F66666C696E6574696D6511675F666C61675F5461676765746469737407307831666666660F6E6561726261736569645F6C6973740E4D6F646275735F486F6C64526567054C5054494D0E6477745F656E746572736C6565700F657873697374626173655F6C6973740D4457545F4C4F414455434F44450000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
</Buttons>
<OriginalItems>
<Len>1423</Len>
@@ -1822,7 +1822,7 @@
<Name>Build</Name>
<Buttons>
<Len>970</Len>
- <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64FF7F0000</Data>
+ <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000553544D3332960000000000000001000553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
</Buttons>
<OriginalItems>
<Len>583</Len>
@@ -1838,7 +1838,7 @@
<Name>Debug</Name>
<Buttons>
<Len>2373</Len>
- <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000000000000100000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000000000001000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000000000000100000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000000000000100000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000000000000100000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F720100000000000000000000000100000001000000000000000000000001000000000000000000054465627567FF7F0000</Data>
+ <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
</Buttons>
<OriginalItems>
<Len>898</Len>
@@ -3603,30 +3603,30 @@
<ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup>
<Size>100</Size>
- <ActiveTab>1</ActiveTab>
+ <ActiveTab>0</ActiveTab>
<Doc>
<Name>..\Src\application\dw_app.c</Name>
- <ColumnNumber>6</ColumnNumber>
- <TopLine>781</TopLine>
- <CurrentLine>729</CurrentLine>
+ <ColumnNumber>13</ColumnNumber>
+ <TopLine>875</TopLine>
+ <CurrentLine>904</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Src\stm32f10x_it.c</Name>
- <ColumnNumber>20</ColumnNumber>
- <TopLine>30</TopLine>
- <CurrentLine>51</CurrentLine>
+ <ColumnNumber>22</ColumnNumber>
+ <TopLine>86</TopLine>
+ <CurrentLine>100</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Src\main.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>134</TopLine>
- <CurrentLine>158</CurrentLine>
+ <ColumnNumber>19</ColumnNumber>
+ <TopLine>119</TopLine>
+ <CurrentLine>133</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3642,9 +3642,9 @@
</Doc>
<Doc>
<Name>..\Src\application\dw_app.h</Name>
- <ColumnNumber>59</ColumnNumber>
- <TopLine>93</TopLine>
- <CurrentLine>122</CurrentLine>
+ <ColumnNumber>1</ColumnNumber>
+ <TopLine>90</TopLine>
+ <CurrentLine>104</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3661,7 +3661,7 @@
<Doc>
<Name>..\Src\application\global_param.h</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>3</TopLine>
+ <TopLine>15</TopLine>
<CurrentLine>29</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -3679,7 +3679,7 @@
<Doc>
<Name>..\Src\OnChipDevices\Spi.c</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>120</TopLine>
+ <TopLine>138</TopLine>
<CurrentLine>152</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -3687,9 +3687,9 @@
</Doc>
<Doc>
<Name>..\Src\OnChipDevices\Usart.c</Name>
- <ColumnNumber>0</ColumnNumber>
- <TopLine>130</TopLine>
- <CurrentLine>141</CurrentLine>
+ <ColumnNumber>46</ColumnNumber>
+ <TopLine>81</TopLine>
+ <CurrentLine>95</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
@@ -3697,7 +3697,7 @@
<Doc>
<Name>E:\GIT\UWB_SmallModule\婧愮爜\鏍稿績鏉縗MDK-ARM\1</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>862</TopLine>
+ <TopLine>891</TopLine>
<CurrentLine>906</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
@@ -3706,7 +3706,7 @@
<Doc>
<Name>..\Src\OnChipDevices\Usart.h</Name>
<ColumnNumber>0</ColumnNumber>
- <TopLine>3</TopLine>
+ <TopLine>9</TopLine>
<CurrentLine>23</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
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 e5cbeb5..1b499a2 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"
@@ -5,7 +5,7 @@
DISCPOLL,
GETNEARMSG,
NEARPOLL,
-}tag_state;
+}tag_state=GETNEARMSG;
static dwt_config_t config = {
2, /* Channel number. */
DWT_PRF_64M, /* Pulse repetition frequency. */
@@ -25,6 +25,8 @@
static uint8_t tx_nearpoll_msg[80] = {0};
static uint8_t tx_nearresp_msg[80] = {0};
static uint8_t tx_nearfinal_msg[80] = {0};
+
+static uint8_t tx_near_msg[80] = {0};
static uint32_t frame_seq_nb = 0;
static uint32_t status_reg = 0;
@@ -219,36 +221,36 @@
}
u8 recbase_num=0;
#define CHANGE_BASE_THRESHOLD 5
-void NearAncSelect(void)
-{static u16 last_mainbase_id,change_base_count;
- int32_t nearbase_mindist=99999, nearbase_minpos;
- u8 i;
- for(i=0;i<recbase_num-1;i++)
- {
- if(nearbase_mindist>nearbase_distlist[i])
- {
- nearbase_mindist=nearbase_distlist[i];
- nearbase_minpos=i;
- }
- }
- if(nearbase_mindist<mainbase_dist-THRESHOLD_CHANGE_MAINBASE_DIST)
- {
- if(last_mainbase_id==nearbaseid_list[nearbase_minpos])
- {
- change_base_count++;
- if(change_base_count>CHANGE_BASE_THRESHOLD)
- {
- mainbase_id=last_mainbase_id;
- tag_state=GETNEARMSG;
- }
- }else{
- change_base_count=0;
- }
- last_mainbase_id=nearbaseid_list[nearbase_minpos];
- }else{
- change_base_count=0;
- }
-}
+//void NearAncSelect(void)
+//{static u16 last_mainbase_id,change_base_count;
+// int32_t nearbase_mindist=99999, nearbase_minpos;
+// u8 i;
+// for(i=0;i<recbase_num-1;i++)
+// {
+// if(nearbase_mindist>nearbase_distlist[i])
+// {
+// nearbase_mindist=nearbase_distlist[i];
+// nearbase_minpos=i;
+// }
+// }
+// if(nearbase_mindist<mainbase_dist-THRESHOLD_CHANGE_MAINBASE_DIST)
+// {
+// if(last_mainbase_id==nearbaseid_list[nearbase_minpos])
+// {
+// change_base_count++;
+// if(change_base_count>CHANGE_BASE_THRESHOLD)
+// {
+// mainbase_id=last_mainbase_id;
+// tag_state=GETNEARMSG;
+// }
+// }else{
+// change_base_count=0;
+// }
+// last_mainbase_id=nearbaseid_list[nearbase_minpos];
+// }else{
+// change_base_count=0;
+// }
+//}
u8 test=0;
u8 anclost_times=0;
u8 exsistbase_list[MAX_NEARBASE_NUM],report_num,get_newbase=0;;
@@ -551,51 +553,72 @@
}
-
-//void GetNearMsg(void)
-//{
-// u32 start_poll,frame_len;
-// memcpy(&tx_near_msg[ANCHOR_ID_IDX],&mainbase_id,2);
-// memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
-// tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
-//
-// dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
-// dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
-// dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
-// dwt_writetxfctrl(12, 0);//设置超宽带发送数据长度
-// dwt_starttx(DWT_START_TX_IMMEDIATE| DWT_RESPONSE_EXPECTED);
-// start_poll = time32_incr;
-// /* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */
-// while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
-// { if(time32_incr - start_poll>20)
-// NVIC_SystemReset();
-// };
-// if(status_reg==0xffffffff)
-// {
-// NVIC_SystemReset();
-// }
-// if (status_reg & SYS_STATUS_RXFCG)//如果成功接收
-// {
-// dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位
-// frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度
-// dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据
-// if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
-// {
-// nearbase_num=rx_buffer[NEARBASENUM_INDEX];
-// tagslotpos=rx_buffer[TAGSLOTPOS];
-// memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],nearbase_num*2);
-// slottime=ceil((nearbase_num+2)*0.3)+1;
-// tyncpoll_time=tagslotpos*slottime;
-// tag_state=NEARPOLL;
-// }
-// }
-//}
+u8 nearmsg_mainbase=0;
+u32 rec_tagpos_binary;
+void GetNearMsg(void)
+{
+ u32 start_poll,frame_len;
+ if(nearmsg_mainbase)
+ {nearmsg_mainbase=0;
+ }else{
+ nearmsg_mainbase=1;
+ }
+ memcpy(&tx_near_msg[ANCHOR_ID_IDX],&nearmsg_mainbase,2);
+ memcpy(&tx_near_msg[TAG_ID_IDX],&dev_id,2);
+ tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
+
+ dwt_setrxaftertxdelay(POLL_TX_TO_RESP_RX_DLY_UUS); //设置发送后开启接收，并设定延迟时间
+ dwt_setrxtimeout(RESP_RX_TIMEOUT_UUS);
+ dwt_writetxdata(12, tx_near_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
+ dwt_writetxfctrl(12, 0);//设置超宽带发送数据长度
+ dwt_starttx(DWT_START_TX_IMMEDIATE| DWT_RESPONSE_EXPECTED);
+ start_poll = time32_incr;
+ /* We assume that the transmission is achieved correctly, poll for reception of a frame or error/timeout. See NOTE 8 below. */
+ while (!((status_reg = dwt_read32bitreg(SYS_STATUS_ID)) & (SYS_STATUS_RXFCG | SYS_STATUS_ALL_RX_ERR)))//不断查询芯片状态直到成功接收或者发生错误
+ { if(time32_incr - start_poll>20)
+ NVIC_SystemReset();
+ };
+ if(status_reg==0xffffffff)
+ {
+ NVIC_SystemReset();
+ }
+ if (status_reg & SYS_STATUS_RXFCG)//如果成功接收
+ {
+ dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG | SYS_STATUS_TXFRS);//清楚寄存器标志位
+ frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFLEN_MASK; //获得接收到的数据长度
+ dwt_readrxdata(rx_buffer, frame_len, 0); //读取接收数据
+ if (rx_buffer[MESSAGE_TYPE_IDX] == NEAR_MSG&&!memcmp(&rx_buffer[TAG_ID_IDX],&dev_id,2)) //判断接收到的数据是否是response数据
+ {
+ next_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
+ memcpy(&rec_tagpos_binary,&rx_buffer[NEARMSG_EMPTYSLOTPOS_INDEX],4);
+ tagslotpos=rx_buffer[TAGSLOTPOS];
+ memcpy(nearbaseid_list,&rx_buffer[NEARBASEID_INDEX],next_nearbase_num*2);
+ slottime=ceil((nearbase_num+2)*0.3)+1;
+ tyncpoll_time=tagslotpos*slottime;
+ tag_state=NEARPOLL;
+ }
+ }
+}
void Tag_App(void)//发送模式(TAG标签)
{
//LED0_ON;
g_Resttimer=0;
- NearPoll();
+ switch(tag_state)
+ {
+ case DISCPOLL:
+
+ break;
+ case GETNEARMSG:
+ GetNearMsg();
+ break;
+ case NEARPOLL:
+ NearPoll();
+ break;
+
+
+ }
+
}
int8_t correction_time,new_tagid=0;
@@ -702,7 +725,7 @@
dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_ALL_RX_ERR);
}
}
-u8 misdist_num,seize_anchor;
+u8 misdist_num[TAG_NUM_IN_SYS],seize_anchor;
u8 Anchor_RecNearPoll(u8 ancrec_nearbasepos) //0 mainbase 1 first near_base
{
tmp_time=TIM3->CNT;
@@ -785,9 +808,9 @@
g_flag_Taggetdist[taglist_pos]=0;
if(hex_dist>-1000&&hex_dist<100000)
{
- if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num>3)
+ if(abs(hex_dist-his_dist[taglist_pos])<1500||misdist_num[taglist_pos]>3)
{
- misdist_num=0;
+ misdist_num[taglist_pos]=0;
tagdist_list[taglist_pos] = hex_dist;
his_dist[taglist_pos]=hex_dist;
#ifndef USART_INTEGRATE_OUTPUT
@@ -809,7 +832,7 @@
#endif
}else{
// printf("%d",hex_dist);
- misdist_num++;
+ misdist_num[taglist_pos]++;
}
}
}
@@ -822,6 +845,9 @@
}
uint32_t current_syncid=0xffffffff,synclost_timer;
extern u8 flag_syncbase;
+extern uint32_t tagpos_binary;
+u8 tagpos_rec[50],tagpos_send[50],ancidlist_num;
+u16 ancidlist_rec[20],ancidlist_send[20];
void Anchor_App(void)
{
@@ -841,7 +867,7 @@
if (status_reg & SYS_STATUS_RXFCG)//成功接收
{ u16 tag_recv_interval;
-
+ float temp_tagpos;
dwt_write32bitreg(SYS_STATUS_ID, SYS_STATUS_RXFCG);//清除标志位
frame_len = dwt_read32bitreg(RX_FINFO_ID) & RX_FINFO_RXFL_MASK_1023;//获得接收数据长度
dwt_readrxdata(rx_buffer, frame_len, 0);//读取接收数据
@@ -879,21 +905,22 @@
}
break;
-// case NEAR_MSG:
-// if(anc_id_recv==dev_id)
-// {
-// rx_buffer[TAGSLOTPOS]=taglist_pos;
-// tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
-// memcpy(&tx_near_msg[TAG_ID_IDX],&tag_id_recv,2);
-// tx_near_msg[NEARBASENUM_INDEX]=g_com_map[NEARBASE_NUM];
-// memcpy(&tx_near_msg[NEARBASEID_INDEX],&g_com_map[NEARBASE_ID1],g_com_map[NEARBASE_NUM]*2);
-// send_len=11+g_com_map[NEARBASE_NUM]*2+2;
-// dwt_writetxdata(send_len, tx_near_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
-// dwt_writetxfctrl(send_len, 0);//设置超宽带发送数据长度
-// dwt_starttx(DWT_START_TX_IMMEDIATE);
-// }
-// break;
-//
+ case NEAR_MSG:
+ if(anc_id_recv==flag_syncbase)
+ {
+ rx_buffer[TAGSLOTPOS]=taglist_pos;
+ tx_near_msg[MESSAGE_TYPE_IDX] = NEAR_MSG;
+ memcpy(&tx_near_msg[TAG_ID_IDX],&tag_id_recv,2);
+ memcpy(&tx_near_msg[NEARMSG_EMPTYSLOTPOS_INDEX],&tagpos_binary,4);
+ tx_near_msg[NEARBASENUM_INDEX]=ancidlist_num;
+ memcpy(&tx_near_msg[NEARBASEID_INDEX],&ancidlist_send,ancidlist_num*2);
+ send_len=11+ancidlist_num*2+2;
+ dwt_writetxdata(send_len, tx_near_msg, 0);//将Poll包数据传给DW1000，将在开启发送时传出去
+ dwt_writetxfctrl(send_len, 0);//设置超宽带发送数据长度
+ dwt_starttx(DWT_START_TX_IMMEDIATE);
+ }
+ break;
+
case NEAR_POLL:
memcpy(&tag_id_recv,&rx_buffer[TAG_ID_IDX],2);
@@ -909,8 +936,8 @@
new_tagid=0;
}
tagofflinetime[taglist_pos]=0;
-
-
+ temp_tagpos=round((float)(sync_timer%g_com_map[COM_INTERVAL])/slottime);
+ tagpos_rec[(u8)temp_tagpos]=1;
rec_nearbase_num=rx_buffer[NEARBASENUM_INDEX];
for(i=0;i<rec_nearbase_num;i++)
@@ -928,6 +955,11 @@
seize_anchor=1; //抢占anchor
Anchor_RecNearPoll(i);
}
+ if(rec_nearbase_num>ancidlist_num)
+ {
+ ancidlist_num=rec_nearbase_num;
+ memcpy(ancidlist_rec,&rx_buffer[NEARBASEID_INDEX],rec_nearbase_num*2);
+ }
break;
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
index 78ae8b9..0faaf07 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/application/dw_app.h"
@@ -99,6 +99,7 @@
#define ANCHOR_ID_IDX 1
#define SYNC_SEQ_IDX 5
//NEAR MSG
+#define NEARMSG_EMPTYSLOTPOS_INDEX 1 //RESPONSE
#define NEARBASENUM_INDEX 10
#define NEARBASEID_INDEX 11
//NEAR POLL
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 ff8c7c5..7978b01 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"
@@ -111,6 +111,9 @@
extern u8 g_start_sync_flag,usart_send_flag,anc_report_num;
u16 heartbeat_timer,poll_timer;
int16_t sync_timer;
+extern u8 flag_newsecond, tagpos_rec[50], tagpos_send[50],ancidlist_num;
+uint32_t tagpos_binary;
+extern u16 ancidlist_rec[20],ancidlist_send[20];
void IdleTask(void)
{
main_logic();
@@ -121,6 +124,19 @@
heartbeat_timer=0;
if(g_com_map[HEARTBEAT]&&g_com_map[DEV_ROLE]==0)
HeatBeat();
+ }
+ if(flag_newsecond)
+ {
+ flag_newsecond=0;
+ tagpos_binary=0;
+ memcpy(ancidlist_send,ancidlist_rec,ancidlist_num*2);
+ ancidlist_num=0;
+ for(u8 i=0;i<max_slotpos;i++)
+ {
+ if(tagpos_rec[i])
+ tagpos_binary|=1<<i;
+ tagpos_rec[i] = 0;
+ }
}
if(g_com_map[DEV_ROLE]==0&&usart_send_flag)
@@ -166,7 +182,7 @@
usart_send[1]=0xAA;
usart_send_anc[0]=0x55;
usart_send_anc[1]=0xAA;
-
+
while(1)
{
g_start_sync_flag=0;
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/Src/stm32f10x_it.c"
index a22f0be..03b9687 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"
@@ -38,7 +38,7 @@
u16 tag_recv_timer, tag_timer,last_polltime;
extern uint16_t g_Resttimer,heartbeat_timer,sync_timer;
extern uint8_t g_pairstart;
-u8 neartimout_timer=0,flag_syncbase=0;
+u8 neartimout_timer=0,flag_syncbase=0,flag_newsecond=0;
extern u16 tyncpoll_time;
extern uint32_t synclost_timer,current_syncid;
void TIM3_IRQHandler(void) //TIM3??
@@ -52,10 +52,11 @@
sync_timer++;
neartimout_timer++;
synclost_timer++;
- GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_RESET);
if(sync_timer>=1000)
{
- GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
+ flag_newsecond=1;
+ //GPIO_WriteBit(GPIOA, GPIO_Pin_10, Bit_SET);
sync_timer=0;
TagListUpdate();
}
--
Gitblit v1.9.3