✨ feat:删除里程全部内容

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator

@@ -15,7 +15,7 @@
     <View>
       <WinId>38003</WinId>
       <ViewName>Registers</ViewName>
-      <TableColWidths>125 100</TableColWidths>
+      <TableColWidths>140 100</TableColWidths>
     </View>
     <View>
       <WinId>346</WinId>
@@ -25,7 +25,7 @@
     <View>
       <WinId>204</WinId>
       <ViewName>Performance Analyzer</ViewName>
-      <TableColWidths>315 156 156 863</TableColWidths>
+      <TableColWidths>1045 156 156 133</TableColWidths>
     </View>
   </SECTreeCtrl>
 
@@ -34,7 +34,7 @@
       <WinId>35141</WinId>
       <ViewName>Event Statistics</ViewName>
       <UserString></UserString>
-      <TableColWidths>250 50 749</TableColWidths>
+      <TableColWidths>200 50 700</TableColWidths>
     </View>
     <View>
       <WinId>1506</WinId>
@@ -93,8 +93,8 @@
       <flags>2</flags>
       <showCmd>3</showCmd>
       <MinPosition>
-        <xPos>-32000</xPos>
-        <yPos>-32000</yPos>
+        <xPos>-1</xPos>
+        <yPos>-1</yPos>
       </MinPosition>
       <MaxPosition>
         <xPos>-1</xPos>
@@ -110,8 +110,8 @@
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
-        <Len>783</Len>
-        <Data>010000000400000001000000010000000100000001000000000000000200000000000000010000000100000000000000280000002800000001000000050000000200000001000000505A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C5544535C5544535F49534F31343232395F53657276696365732E6300000000175544535F49534F31343232395F53657276696365732E6300000000C5D4F200FFFFFFFF805A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C4241543332413233394B4B363446425C737461727475705F4241543332413233392E730000000013737461727475705F4241543332413233392E7300000000FFDC7800FFFFFFFF425A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000F0A0A100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4465766963655C436D73656D69636F6E5C4241543332413233395C5254455C5254452E6800000000055254452E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000076020000</Data>
+        <Len>2014</Len>
+        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000F0000000E00000001000000505A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C5544535C5544535F49534F31343232395F53657276696365732E6300000000175544535F49534F31343232395F53657276696365732E6300000000C5D4F200FFFFFFFF805A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C4241543332413233394B4B363446425C737461727475705F4241543332413233392E730000000013737461727475705F4241543332413233392E7300000000FFDC7800FFFFFFFF425A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000F0A0A100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4465766963655C436D73656D69636F6E5C4241543332413233395C5254455C5254452E6800000000055254452E6800000000BCA8E100FFFFFFFF5A5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C5345475F444953504C41595C5345475F444953504C41592E63000000000D5345475F444953504C41592E63000000009CC1B600FFFFFFFF625A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C436F6D6D6F6E496E746572666163655C436F6D6D6F6E496E746572666163652E630000000011436F6D6D6F6E496E746572666163652E6300000000F7B88600FFFFFFFF4B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5461736B5F4C6973742E63000000000F5379735F5461736B5F4C6973742E6300000000D9ADC200FFFFFFFF565A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4261636B4C696768745C4261636B4C696768742E68000000000B4261636B4C696768742E6800000000A5C2D700FFFFFFFF565A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4261636B4C696768745C4261636B4C696768742E63000000000B4261636B4C696768742E6300000000B3A6BE00FFFFFFFF635A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C53797374656D5F4D6F6E69746F725C53797374656D5F4D6F6E69746F725F557365722E63000000001553797374656D5F4D6F6E69746F725F557365722E6300000000EAD6A300FFFFFFFF5A5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4755495F446973706C61795C4755495F446973706C61792E63000000000D4755495F446973706C61792E6300000000F6FA7D00FFFFFFFF6B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F4150505C43414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E63000000002243414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E6300000000B5E99D00FFFFFFFF4F5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5363686564756C65725F4C69622E6300000000135379735F5363686564756C65725F4C69622E63000000005FC3CF00FFFFFFFF4B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C436F6D706F6E656E74732E68000000000C436F6D706F6E656E74732E6800000000C1838300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000076020000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>
@@ -1805,8 +1805,8 @@
         <RegID>59392</RegID>
         <Name>File</Name>
         <Buttons>
-          <Len>2653</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5345475F5345545F5472696E697479960000000000000005000F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F4174747269627574650000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2825</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000015436865636B73656C665F5345475F446973706C617996000000000000000C0015436865636B73656C665F5345475F446973706C617912506F7765725F537461795F50726F7465637411436F6D6D6F6E5F496E7075745F50617261125379735F5363686564756C65725F496E6974155379735F526561645F4B4C33305F566F6C74616765114261636B4C696768745F50726F636573731354696D65724D5F50574D5F7365745F647574790F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F417474726962757465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -1822,7 +1822,7 @@
         <Name>Build</Name>
         <Buttons>
           <Len>972</Len>
-          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
         </Buttons>
         <OriginalItems>
           <Len>583</Len>
@@ -1838,7 +1838,7 @@
         <Name>Debug</Name>
         <Buttons>
           <Len>2373</Len>
-          <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
+          <Data>00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
         </Buttons>
         <OriginalItems>
           <Len>898</Len>
@@ -1891,7 +1891,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000D3000000A3020000</Data>
+          <Data>0300000066000000D30000004B020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1911,7 +1911,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000D3000000A3020000</Data>
+          <Data>0300000066000000D30000004B020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1931,7 +1931,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1951,7 +1951,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1971,7 +1971,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1991,7 +1991,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2051,7 +2051,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2061,7 +2061,7 @@
       <Window>
         <RegID>1936</RegID>
         <PaneID>1936</PaneID>
-        <IsVisible>0</IsVisible>
+        <IsVisible>1</IsVisible>
         <IsFloating>0</IsFloating>
         <IsTabbed>0</IsTabbed>
         <IsActivated>0</IsActivated>
@@ -2071,7 +2071,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2091,7 +2091,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2111,7 +2111,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2131,7 +2131,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2151,7 +2151,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2171,7 +2171,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2191,7 +2191,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000D3000000A3020000</Data>
+          <Data>0300000066000000D30000004B020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2211,7 +2211,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000D3000000A3020000</Data>
+          <Data>0300000066000000D30000004B020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2241,7 +2241,7 @@
       <Window>
         <RegID>198</RegID>
         <PaneID>198</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
         <IsFloating>0</IsFloating>
         <IsTabbed>0</IsTabbed>
         <IsActivated>0</IsActivated>
@@ -2371,7 +2371,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2891,7 +2891,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000D3000000A3020000</Data>
+          <Data>0300000066000000D30000004B020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2951,7 +2951,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2971,7 +2971,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3531,7 +3531,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>62030000D7020000B306000034030000</Data>
+          <Data>030000007F020000B306000034030000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3540,14 +3540,14 @@
       </Window>
       <DockMan>
         <Len>3311</Len>
-        <Data>000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFDA000000C8000000B6060000CC000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000DA00000065000000B6060000DE000000DA0000004F000000B6060000C80000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD60000004F000000DA000000BC020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000D6000000D2020000000000004F000000D6000000BC0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000BC020000B6060000C002000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000005F030000D6020000B6060000630300005F030000C0020000B60600004D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFF5B030000C00200005F0300004D03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000CE010000F9040000D2010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000E8010000F90400006102000000000000D2010000F90400004B0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+        <Data>000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFDA000000C8000000B6060000CC000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000DA00000065000000B6060000DE000000DA0000004F000000B6060000C80000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD60000004F000000DA00000064020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000D60000007A020000000000004F000000D6000000640200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000064020000B606000068020000010000000100001004000000010000001EFEFFFF9400000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000000000007E020000B6060000630300000000000068020000B60600004D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000000000001000000FFFFFFFF5B030000C00200005F0300004D03000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000CE010000F9040000D2010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000E8010000F90400006102000000000000D2010000F90400004B0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
       </DockMan>
       <ToolBar>
         <RegID>59392</RegID>
         <Name>File</Name>
         <Buttons>
-          <Len>2653</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000F5345475F5345545F5472696E697479960000000000000005000F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F4174747269627574650000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2825</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000015436865636B73656C665F5345475F446973706C617996000000000000000C0015436865636B73656C665F5345475F446973706C617912506F7765725F537461795F50726F7465637411436F6D6D6F6E5F496E7075745F50617261125379735F5363686564756C65725F496E6974155379735F526561645F4B4C33305F566F6C74616765114261636B4C696768745F50726F636573731354696D65724D5F50574D5F7365745F647574790F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F417474726962757465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -3579,7 +3579,7 @@
         <Name>Debug</Name>
         <Buttons>
           <Len>2362</Len>
-          <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
+          <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
         </Buttons>
         <OriginalItems>
           <Len>898</Len>
@@ -3603,11 +3603,11 @@
     <ActiveMDIGroup>0</ActiveMDIGroup>
     <MDIGroup>
       <Size>100</Size>
-      <ActiveTab>2</ActiveTab>
+      <ActiveTab>14</ActiveTab>
       <Doc>
         <Name>..\..\..\..\Source\UDS\UDS_ISO14229_Services.c</Name>
         <ColumnNumber>0</ColumnNumber>
-        <TopLine>114</TopLine>
+        <TopLine>115</TopLine>
         <CurrentLine>143</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
@@ -3624,18 +3624,18 @@
       </Doc>
       <Doc>
         <Name>..\..\..\..\Source\System\main.c</Name>
-        <ColumnNumber>3</ColumnNumber>
-        <TopLine>39</TopLine>
-        <CurrentLine>73</CurrentLine>
+        <ColumnNumber>5</ColumnNumber>
+        <TopLine>55</TopLine>
+        <CurrentLine>67</CurrentLine>
         <Folding>1</Folding>
-        <ContractedFolders>54</ContractedFolders>
+        <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
       </Doc>
       <Doc>
         <Name>..\..\..\..\Source\Component\Telltales\Telltales_user.c</Name>
-        <ColumnNumber>41</ColumnNumber>
-        <TopLine>235</TopLine>
-        <CurrentLine>250</CurrentLine>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>103</TopLine>
+        <CurrentLine>110</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
@@ -3649,6 +3649,96 @@
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
       </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\SEG_DISPLAY\SEG_DISPLAY.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>2432</TopLine>
+        <CurrentLine>2453</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\CommonInterface\CommonInterface.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>126</TopLine>
+        <CurrentLine>133</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\System\Sys_Task_List.c</Name>
+        <ColumnNumber>21</ColumnNumber>
+        <TopLine>36</TopLine>
+        <CurrentLine>61</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\BackLight\BackLight.h</Name>
+        <ColumnNumber>22</ColumnNumber>
+        <TopLine>1</TopLine>
+        <CurrentLine>6</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\BackLight\BackLight.c</Name>
+        <ColumnNumber>5</ColumnNumber>
+        <TopLine>1</TopLine>
+        <CurrentLine>15</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>74</TopLine>
+        <CurrentLine>80</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\GUI_Display\GUI_Display.c</Name>
+        <ColumnNumber>1</ColumnNumber>
+        <TopLine>210</TopLine>
+        <CurrentLine>228</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Application\CAN_APP\CAN_CH0_CAN_Communication_Matrix.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>127</TopLine>
+        <CurrentLine>134</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\System\Sys_Scheduler_Lib.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>251</TopLine>
+        <CurrentLine>258</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
+      <Doc>
+        <Name>..\..\..\..\Source\Component\Components.h</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>6</TopLine>
+        <CurrentLine>14</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
     </MDIGroup>
   </MDIGroups>
 

Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx

@@ -513,21 +513,6 @@
               <FileType>5</FileType>
               <FilePath>..\..\..\..\Source\Component\BU98R10\BU98R10.h</FilePath>
             </File>
-            <File>
-              <FileName>Services_Mileage.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Component\Mileage\Services_Mileage.h</FilePath>
-            </File>
-            <File>
-              <FileName>Services_Mileage_User.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\..\Source\Component\Mileage\Services_Mileage_User.c</FilePath>
-            </File>
-            <File>
-              <FileName>Services_Mileage_User.h</FileName>
-              <FileType>5</FileType>
-              <FilePath>..\..\..\..\Source\Component\Mileage\Services_Mileage_User.h</FilePath>
-            </File>
             <File>
               <FileName>eeManager_Interface.c</FileName>
               <FileType>1</FileType>
@@ -658,11 +643,6 @@
               <FileType>1</FileType>
               <FilePath>..\..\..\..\Source\Component\Telltales\Telltales_user.c</FilePath>
             </File>
-            <File>
-              <FileName>libMileage_BAT32_V1.07.lib</FileName>
-              <FileType>4</FileType>
-              <FilePath>..\..\..\..\Source\Component\Mileage\libMileage_BAT32_V1.07.lib</FilePath>
-            </File>
             <File>
               <FileName>PowerManagement.lib</FileName>
               <FileType>4</FileType>

Firmware/Source/Application/CommonInterface/CommonInterface.c

@@ -161,25 +161,3 @@ uint32_t Common_GetSocTime(void)
     return PowerSocTimeLine;
 }
 
-/**
- * @brief 公里转换英里
- * @return 公里
- */
-uint32_t Data_Km_To_Mile(uint32_t Km)
-{
-    // Km *= 621;
-    // Km /= 1000;
-    Km *= 100;
-    Km /= 161;
-    return Km;
-}
-/**
- * @brief 英里转换公里
- * @return 英里
- */
-uint32_t Data_Mile_To_Km(uint32_t Mile)
-{
-    Mile *= 161;
-    Mile /= 100;
-    return Mile;
-}

Firmware/Source/Application/CommonInterface/CommonInterface.h

@@ -74,8 +74,5 @@ extern uint32_t Common_GetIgnOnTime(void);  /*ms*/
 extern uint32_t Common_GetIgnOffTime(void); /*ms*/
 
 
-extern uint32_t Data_Km_To_Mile(uint32_t Km);
-extern uint32_t Data_Mile_To_Km(uint32_t Mile);
-
 
 #endif

Firmware/Source/Component/Components.h

@@ -11,8 +11,6 @@
 #include "System_Monitor\System_Monitor.h"
 #include "Telltales\Telltales_Lib.h"
 #include "Telltales\Telltales_user.h"
-#include "Mileage\Services_Mileage.h"
-#include "Mileage\Services_Mileage_User.h"
 #include "Eeprom\eeManager_Interface.h"
 #include "Eeprom\eepromManage.h"
 #include "BU98R10\BU98R10.h"

Firmware/Source/Component/Mileage/Services_Mileage.h

-/**
- * @file        Services_Mileage.c
- * @brief       里程服务函数
- * @details     里程服务函数，包括大计、小计
- * @author      myliu
- * @date        2022.05.10
- * @version     V1.0
- * @copyright   myiu
- */
-#ifndef SERVICE_MILEAGE_H
-#define SERVICE_MILEAGE_H
-
-/*
-Platform_32Bit
-Platform_16Bit
-*/
-
-#ifdef Platform_16Bit
-#define Millib_uint8_t unsigned char
-#define Millib_uint16_t unsigned int
-#define Millib_uint32_t unsigned long
-
-#else
-#define Millib_uint8_t unsigned char
-#define Millib_uint16_t unsigned short
-#define Millib_uint32_t unsigned int
-#define Millib_uint64_t unsigned long long
-#endif
-
-#ifndef Millib_NULL
-#define Millib_NULL (void *)0u
-#endif /* NULL */
-
-/**@enum     小计里程枚举
- * @brief    用来区分每个小计里程数
- */
-typedef enum
-{
-    EM_TRIP_A,
-    EM_TRIP_B,
-    EM_TRIP_C,
-    EM_TRIP_D,
-    EM_TRIP_MAX,
-} DataTripEnum_t;
-
-/**@enum     EEPROM存储块枚举类型
- * @brief    用来区分EEPORM存储区域
- */
-typedef enum
-{
-    EM_MILEAGE_BLOCK = 0u, /**< 累计里程 */
-    EM_ODO_BLOCK,          /**< 总计里程 */
-    EM_TRIP_BLOCK,         /**< 小计里程 */
-    EM_Maintenance_BLOCK,  /**< 保养里程 */
-    EM_ODOSYNC_CNT_BLOCK,  /**< 里程备份次数 */
-    EM_ENGODO_BLOCK,  /**< 发动机总里程 */
-} Data_EEPROM_Enum_t;
-
-typedef void (*EEPromWrite)(Data_EEPROM_Enum_t BlockID, Millib_uint32_t u32Data[], Millib_uint16_t u16Len);
-typedef Millib_uint8_t (*GetRunValid)(void);
-
-typedef struct
-{
-    Millib_uint8_t (*Get_Sys_IG_Sts)(void);        /**< 获取系统电源状态，请务必填写函数名或NULL */
-    Millib_uint8_t (*Get_Act_V_Speed_Valid)(void); /**< 实际车速有效位，请务必填写函数名或NULL */
-    Millib_uint16_t (*Get_Act_V_Speed)(void);      /**< 实际车速，请务必填写函数名或NULL */
-    Millib_uint16_t (*Get_TireSize)(void);         /**< 轮胎系数，请务必填写函数名或NULL */
-    EEPromWrite EEPromWrite_Cbk;                   /**< 写EEPROM回调函数，请务必填写函数名或NULL */
-} Mileage_Func_t;
-
-typedef struct
-{
-    Millib_uint32_t Mileage; /**< KL30初始化时，从EEPROM读取的数据 */
-} Mileage_Init_t;
-
-typedef struct
-{
-    Millib_uint32_t Stamp;    /**< 在Mileage上记录的里程戳 */
-    Millib_uint32_t Offset;   /**< 里程偏移量，暂不使用，预留 */
-    Millib_uint32_t MaxValue; /**< 最大的总计里程，单位100m */
-} ODO_Init_t;
-
-typedef struct
-{
-    Millib_uint32_t EngODO;    /**< 在Mileage上记录的里程戳 */
-    Millib_uint32_t MaxValue; /**< 最大的总计里程，单位100m */
-} EngODO_Init_t;
-
-typedef struct
-{
-    Millib_uint32_t Stamp;    /**< 在Mileage上记录的里程戳, 需要存储在EEprom */
-    Millib_uint32_t Offset;   /**< 小计里程偏移量，, 需要存储在EEprom */
-    Millib_uint32_t MaxValue; /**< 最大的小计里程，单位100m */
-    Millib_uint8_t IsRestart; /**< 小计里程达到最大值后，是否自动从0开始，重新累计小计里程 */
-} Trip_Init_t;
-
-#define Data_MEM_Block_Mileage ((Millib_uint8_t)12u)
-#define Data_MEM_Block_ODO ((Millib_uint8_t)16u)
-#define Data_MEM_Block_EngODO ((Millib_uint8_t)8u)
-#define Data_MEM_Block_Trip ((Millib_uint8_t)20u)
-/*
-total size =Data_MEM_Block_Trip*EM_TRIP_MAX
-*/
-
-/**
- * @brief 里程服务初始化，KL30调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_Mileage，此内存需在休眠唤醒后不丢失
- * @param[in] pInitData 从EEPROM读取上次下电前累计的里程
- * @param[in] pFunc 底层发送回调函数, 详见Mileage_Func_t
- *
- * @warning 此函数必须后于EEPROM初始化，因为要读取EEPROM数据，否则每次都是从0开始
- *
- * @since 1.0.0
- */
-void Data_Mileage_KL30_Init(Millib_uint8_t *pMemSpace,
-                            Mileage_Init_t *pInitData, Mileage_Func_t *pFunc);
-/**
- * @brief 里程服务初始化，唤醒时调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_Mileage，此内存需在休眠唤醒后不丢失
- * @param[in] pFunc 底层发送回调函数, 详见Mileage_Func_t
- *
- * @since 1.0.0
- */
-void Data_Mileage_Wakeup_Init(Millib_uint8_t *pMemSpace, Mileage_Func_t *pFunc);
-/**
- * @brief 里程累计服务，在100ms中断调用
- *
- * @since 1.0.0
- */
-void Data_Mileage_ISR(void);
-/**
- * @brief   里程读取
- * @return  当前累计里程数，单位100m
- * @warning 此数据非总计里程，总计里程属于此里程数的一部分
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_Mileage_Read(void);
-
-/**
- * @brief   里程读取
- * @return  当前累计里程数，单位mm
- * @warning 此数据非总计里程，总计里程属于此里程数的一部分
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_Mileage_Readmm(void);
-
-/**
- * @brief   写里程
- * @param[in] NewMileage 新里程数，单位100m
- * @return  成功 - 1 失败 - 0
- * @warning 调用此函数前，需要调用Data_Mileage_Clear函数
- *
- * @since 1.0.0
- */
-Millib_uint8_t Data_Mileage_Write(Millib_uint32_t NewMileage);
-/**
- * @brief   清里程，出厂时使用
- * @warning 此函数包含功能：清Mileage，清ODO以及清trip，调用此函数后，需要复位后，里程才会继续走动
- *
- * @since 1.0.0
- */
-void Data_Mileage_Clear(void);
-/**
- * @brief   清里程，出厂时使用
- * @warning 此函数包含功能：清Mileage，清ODO以及清Trip，调用此函数，不影响里程的走动
- *
- * @since 1.0.0
- */
-void Data_Mileage_Clear_GoOn(void);
-/**
- * @brief   将累计的里程存入EEPROM, 10ms任务中调用
- *
- * @since 1.0.0
- */
-void Data_Mileage_Write_EEPROM(void);
-/**
- * @brief   获取里程库软件版本号
- * @return  版本号 1.01
- * @since 1.0.0
- */
-Millib_uint8_t *Get_Data_Mileage_Version(void);
-
-/**
- * @brief 总计里程初始化，KL30调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_ODO，此内存需在休眠唤醒后不丢失
- * @param[in] pInitData 详见ODO_Init_t
- * @param[in] Func 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_KL30_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_ODO_KL30_Init(Millib_uint8_t *pMemSpace, ODO_Init_t *pInitData, EEPromWrite Func);
-/**
- * @brief 总计里程初始化，唤醒调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_ODO，此内存需在休眠唤醒后不丢失
- * @param[in] Func 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_Wakeup_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_ODO_Wakeup_Init(Millib_uint8_t *pMemSpace, EEPromWrite Func);
-/**
- * @brief 总计里程计算服务，为了其他服务获取总计里程无0.1m的偏差，需要此服务函数
- *
- * @warning 在100ms任务重调用
- *
- * @since 1.0.0
- */
-void Data_ODO_Processing(void);
-/**
- * @brief   总计里程读取
- * @return  当前总计里程数，单位100m
- * @warning 此数据为上次Data_ODO_Clear后，到调用此函数为止，累计的Mileage，属于Mileage的一部分
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_ODO_Read(void);
-
-/**
- * @brief   清总计里程，车厂使用
- * @warning 此函数只是将总计里程的里程戳标记为当前的Mileage，不属于完全清除，如出厂请调用Data_Mileage_Clear
- *
- * @since 1.0.0
- */
-void Data_ODO_Clear(void);
-
-/**
- * @brief   总计里程偏移量读取
- * @return  当前偏移量，单位100m
- * @warning 里程备份时使用
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_Offset_Read(void);
-
-/**
- * @brief   总计里程偏移量修改
- * @return  当前偏移量，单位100m
- * @warning 里程备份时使用
- *
- * @since 1.0.0
- */
-void Data_ODO_Modify(Millib_uint32_t Offset);
-
-/**
- * @brief 发动机总计里程初始化，KL30调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_EngODO，此内存需在休眠唤醒后不丢失
- * @param[in] pInitData 详见EngODO_Init_t
- * @param[in] pFunc1 累计发动机总里程的条件
- * @param[in] pFunc2 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_KL30_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_EngODO_KL30_Init(Millib_uint8_t *pMemSpace, EngODO_Init_t *pInitData, GetRunValid pFunc1, EEPromWrite pFunc2);
-
-/**
- * @brief 发动机总计里程初始化，唤醒调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_EngODO，此内存需在休眠唤醒后不丢失
- * @param[in] pFunc1 累计发动机总里程的条件
- * @param[in] pFunc2 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_Wakeup_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_EngODO_Wakeup_Init(Millib_uint8_t *pMemSpace, GetRunValid pFunc1, EEPromWrite pFunc2);
-/**
- * @brief 发动机总计里程计算服务，为了其他服务获取总计里程无0.1m的偏差，需要此服务函数
- *
- * @warning 在100ms任务重调用
- *
- * @since 1.0.0
- */
-void Data_EngODO_Processing(void);
-
-/**
- * @brief   发动机总计里程读取
- * @return  当前总计里程数，单位100m
- * @warning 此数据为上次Data_ODO_Clear后，到调用此函数为止，累计的Mileage，属于Mileage的一部分
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_EngODO_Read(void);
-
-/**
- * @brief   发动机总计里程写
- * @return  当前发动机总计里程数，单位100m
- * @warning 此数据为上次Data_EngODO_Clear后，累计的Mileage
- *
- * @since 1.0.0
- */
-void Data_EngODO_Write(Millib_uint32_t newEngODO);
-
-/**
- * @brief   清发动机总计里程，车厂使用
- * @warning 此函数只是将发送机总计里程清除，如需工厂清除，需要调用Data_Mileage_Clear
- *
- * @since 1.0.0
- */
-void Data_EngODO_Clear(void);
-
-/**
- * @brief 小计里程初始化，KL30调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_Trip*EM_TRIP_MAX，此内存需在休眠唤醒后不丢失
- * @param[in] pInitData Trip_Init_t
- * @param[in] TotalTrip 小计总数，（例如：1个小计， 2个小计，3个小计）
- * @param[in] Func 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_KL30_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_Trip_KL30_Init(Millib_uint8_t *pMemSpace, Trip_Init_t *pInitData, Millib_uint8_t TotalTrip, EEPromWrite pFunc);
-/**
- * @brief 小计里程初始化，唤醒调用，必须调用，否则造成空指针
- * @param[in] pMemSpace 内存空间，需要的空间大小至少大于Data_MEM_Block_Trip*EM_TRIP_MAX，此内存需在休眠唤醒后不丢失
- * @param[in] TotalTrip 小计总数，（例如：1个小计， 2个小计，3个小计）
- * @param[in] Func 写EEPROM回调函数
- *
- * @warning 在Data_Mileage_Wakeup_Init之后调用
- *
- * @since 1.0.0
- */
-void Data_Trip_Wakeup_Init(Millib_uint8_t *pMemSpace, Millib_uint8_t TotalTrip, EEPromWrite pFunc);
-/**
- * @brief 小计里程计算服务，为了其他服务获取小计里程无0.1m的偏差，需要此服务函数
- *
- * @warning 在100ms任务重调用
- *
- * @since 1.0.0
- */
-void Data_Trip_Processing(void);
-/**
- * @brief   清小计里程
- * @param[in] TripN DataTripEnum_t
- * @warning 此函数只是将小计里程的里程戳标记为当前的Mileage，不属于完全清除，如出厂请调用Data_Mileage_Clear
- *
- * @since 1.0.0
- */
-void Data_Clear_Trip(DataTripEnum_t TripN);
-/**
- * @brief   清小计里程
- * @warning 此函数只是将小计里程的里程戳标记为当前的Mileage，不属于完全清除，如出厂请调用Data_Mileage_Clear
- *
- * @since 1.0.0
- */
-void Data_Clear_Trip_All(void);
-/**
- * @brief   小计里程读取
- * @param[in] TripN DataTripEnum_t
- * @return  当前小计里程数，单位100m
- * @warning 此数据为上次Data_ODO_Clear后，到调用此函数为止，累计的Mileage，属于Mileage的一部分
- *
- * @since 1.0.0
- */
-Millib_uint32_t Data_Read_Trip(DataTripEnum_t TripN);
-
-/**
- * @brief   设置小计里程
- * @param[in] TripN DataTripEnum_t
- * @param[in] NewMileage 设置的里程数
- * @return  1 - 成功/ 0 - 失败
- * @warning 设置后会存储EEPROM
- *
- * @since 1.0.0
- */
-Millib_uint8_t Data_Write_Trip(DataTripEnum_t TripN, Millib_uint32_t NewMileage);
-
-#endif

Firmware/Source/Component/Mileage/Services_Mileage_User.c

-
-#include "Components.h"
-__align(4)
-    uint8_t DataMilleageBuf[Data_MEM_Block_Mileage];
-uint8_t DataODOBuf[Data_MEM_Block_ODO];
-uint8_t DataTripBuf[Data_MEM_Block_Trip * EM_TRIP_MAX];
-Mileage_t g_WriteMileage;
-Mileage_t g_ReadMileage;
-uint8_t odo_writeState;
-uint8_t odo_readState;
-static uint32_t Data_User_EEPROM_Read(uint16_t u16BlockID, uint32_t u32Data[], uint16_t u16Len);
-static void Data_User_EEPROM_Write(Data_EEPROM_Enum_t BlockID, uint32_t u32Data[], uint16_t u16Len);
-
-#define EEPROM_BLOCK_00 0X00
-#define EEPROM_BLOCK_01 0X16
-#define EEPROM_BLOCK_02 0X32
-#define EEPROM_BLOCK_03 0X48
-#define EEPROM_BLOCK_04 0X64
-#define EEPROM_BLOCK_05 0X80
-#define EEPROM_BLOCK_06 0X90
-
-uint32_t Milleage_InitFlag = 0U;
-
-
-
-
-/******************************************************************************
-  Function：Data_ODO_KL30Init
-  Description：
-  Input:
-  Output:
- ******************************************************************************/
-void Data_User_Mileage_KL30Init(void)
-{
-    uint32_t TempBuf[20] = {0};
-    Mileage_Init_t MileInit = {0};
-    Mileage_Func_t Func = {0};
-    ODO_Init_t ODOInit = {0};
-    // EngODO_Init_t EngODOInit = {0};
-    Trip_Init_t TripInit[4] = {0};
-    Milleage_InitFlag = 0U;
-    // �������ݴ�EEPROM�ж�ȡ
-    (void)Data_User_EEPROM_Read(EM_MILEAGE_BLOCK, TempBuf, 1);
-    if (TempBuf[0] == 0xFFFFFFFF)
-    {
-        MileInit.Mileage = 0u;
-    }
-    else
-    {
-        MileInit.Mileage = TempBuf[0];
-    }
-    Func.Get_Sys_IG_Sts = Common_Get_IG_Sts;
-    Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid;
-    Func.Get_Act_V_Speed = Common_Get_Act_V_Speed_ODO;
-    Func.Get_TireSize = (void *)0;
-    Func.EEPromWrite_Cbk = Data_User_EEPROM_Write; // ��ʱδ����
-    Data_Mileage_KL30_Init(DataMilleageBuf, &MileInit, &Func);
-
-    (void)Data_User_EEPROM_Read(EM_ODO_BLOCK, TempBuf + 1, 2);
-    if (TempBuf[1] == 0xFFFFFFFF)
-    {
-        ODOInit.Stamp = 0;
-    }
-    else
-    {
-        ODOInit.Stamp = TempBuf[1];
-    }
-    if (TempBuf[1] == 0xFFFFFFFF)
-    {
-        ODOInit.Offset = 0;
-    }
-    else
-    {
-        ODOInit.Offset = TempBuf[2];
-    }
-    ODOInit.MaxValue = 16103058;
-    Data_ODO_KL30_Init(DataODOBuf, &ODOInit, Func.EEPromWrite_Cbk);
-
-    (void)Data_User_EEPROM_Read(EM_TRIP_BLOCK, TempBuf + 3, 8);
-    if (TempBuf[3] == 0XFFFFFFFF)
-    {
-        TripInit[EM_TRIP_A].Stamp = 0;
-    }
-    else
-    {
-        TripInit[EM_TRIP_A].Stamp = TempBuf[3];
-    }
-    TripInit[EM_TRIP_A].Offset = TempBuf[4];
-    TripInit[EM_TRIP_A].MaxValue = 16092; /* 最大999.9Mile 进行复位 */
-    TripInit[EM_TRIP_A].IsRestart = 1u;
-
-    TripInit[EM_TRIP_B].Stamp = 0xFFFFFFFFu;
-    TripInit[EM_TRIP_B].MaxValue = 99999;
-    TripInit[EM_TRIP_B].IsRestart = 1u;
-
-    TripInit[EM_TRIP_C].Stamp = 0xFFFFFFFFu;
-    TripInit[EM_TRIP_C].MaxValue = 99999;
-    TripInit[EM_TRIP_C].IsRestart = 1u;
-
-    TripInit[EM_TRIP_D].Stamp = 0xFFFFFFFFu;
-    TripInit[EM_TRIP_D].MaxValue = 99999;
-    TripInit[EM_TRIP_D].IsRestart = 1u;
-    Data_Trip_KL30_Init(DataTripBuf, TripInit, EM_TRIP_MAX, Func.EEPromWrite_Cbk);
-
-    Milleage_InitFlag = 0X5AA53AA3UL;
-
-}
-
-void Data_User_Mileage_WakeupInit(void)
-{
-    Mileage_Func_t Func = {0};
-    Milleage_InitFlag = 0U;
-
-    Func.Get_Sys_IG_Sts = Common_Get_IG_Sts;
-    Func.Get_Act_V_Speed_Valid = Common_Get_Act_V_Speed_Valid;
-    Func.Get_Act_V_Speed = Common_Get_Act_V_Speed_ODO;
-    Func.Get_TireSize = (void *)0;
-    Func.EEPromWrite_Cbk = Data_User_EEPROM_Write; // ��ʱδ����
-    Data_Mileage_Wakeup_Init(DataMilleageBuf, &Func);
-
-    Data_ODO_Wakeup_Init(DataODOBuf, Func.EEPromWrite_Cbk);
-
-    Data_Trip_Wakeup_Init(DataTripBuf, EM_TRIP_MAX, Func.EEPromWrite_Cbk);
-    Milleage_InitFlag = 0X5AA53AA3UL;
-}
-
-uint32_t Get_MileageInit_Status(void)
-{
-    return Milleage_InitFlag;
-}
-
-static uint32_t Data_User_EEPROM_Read(uint16_t u16BlockID, uint32_t u32Data[], uint16_t u16Len)
-{
-    switch (u16BlockID)
-    {
-    case EM_MILEAGE_BLOCK:
-        odo_readState = eeprom_ReadODO(&g_ReadMileage);
-        u32Data[0] = g_ReadMileage.Odo / 100;
-        break;
-
-    case EM_ODO_BLOCK:
-
-        eeprom_ReadRecord(EEPROM_BLOCK_01, (uint8_t *)u32Data, u16Len * 4);
-        break;
-
-    case EM_TRIP_BLOCK:
-        eeprom_ReadRecord(EEPROM_BLOCK_03, (uint8_t *)u32Data, u16Len * 4);
-        break;
-
-    default:
-        break;
-    }
-
-    return 0;
-}
-
-static void Data_User_EEPROM_Write(Data_EEPROM_Enum_t BlockID, uint32_t u32Data[], uint16_t u16Len)
-{
-    // uint8_t i = 0u;
-
-    switch (BlockID)
-    {
-    case EM_MILEAGE_BLOCK:
-        if (u32Data[0] == 0)
-        {
-            eeprom_ClearOdoSection();
-        }
-        else
-        {
-            g_WriteMileage.Odo = u32Data[0] * 100;
-            odo_writeState = WRITE_FAIL;
-            odo_writeState = eeprom_WriteODO(&g_WriteMileage, distance_100m, 1);
-        }
-        break;
-
-    case EM_ODO_BLOCK:
-        eeprom_WriteRecord(EEPROM_BLOCK_01, (uint8_t *)u32Data, u16Len * 4);
-        break;
-
-    case EM_TRIP_BLOCK:
-        eeprom_WriteRecord(EEPROM_BLOCK_03, (uint8_t *)u32Data, u16Len * 4);
-        break;
-
-    default:
-        break;
-    }
-}
-
-void Services_Mileage_Callback(void)
-{
-    Data_Mileage_ISR();
-    Data_ODO_Processing();
-    Data_Trip_Processing();
-    Trip_Clear_Km_Service();
-}
-
-/**
- * @brief 获取大计里程值
- * @return 根据当前单位输出对应大计里程值
- */
-uint32_t Get_ODO_Value(void)
-{
-    uint32_t ODO = 0;
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     ODO = Data_ODO_Read();
-    // }
-    // else if (Get_Dis_Unit() == 1) /* 英制 */
-    // {
-    //     ODO = Data_Km_To_Mile(Data_ODO_Read());
-    // }
-    // else /* 无效值，按照公里处理，理论上不会执行到这 */
-    // {
-    //     ODO = Data_ODO_Read();
-    // }
-    return ODO;
-}
-
-/**
- * @brief 获取小计里程值
- * @return 根据当前单位输出对应小计里程值
- */
-uint32_t Get_Trip_Value(void)
-{
-    uint32_t Trip = 0;
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     Trip = Data_Read_Trip(EM_TRIP_A);
-    // }
-    // else if (Get_Dis_Unit() == 1) /* 英制 */
-    // {
-    //     Trip = Data_Km_To_Mile(Data_Read_Trip(EM_TRIP_A));
-    // }
-    // else /* 无效值，按照公里处理，理论上不会执行到这 */
-    // {
-    //     Trip = Data_Read_Trip(EM_TRIP_A);
-    // }
-    return Trip;
-}
-uint32_t testtrip = 0;
-/**
- * @brief 当前单位在KM时，小计里程大于999.9KM，主动触发小计清零
- *
- */
-void Trip_Clear_Km_Service(void)
-{
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
-    //     {
-    //         Data_Clear_Trip_All();
-    //     }
-    // }
-}
-
-
-/**
- * @brief 触发单位转换时调用，如当前单位英里且里程大于621Mile时，单位转换为公里后需主动写入小计里程为999.9KM；
- * 需要单位转换标志位赋值后进行调用！！！
- * 
- */
-void Unit_Convert_Service(void)
-{
-    // if (Get_Dis_Unit() == 0) /* 公制 */
-    // {
-    //     if (Data_Read_Trip(EM_TRIP_A) > 9999) /* 当前单位在KM时，里程大于999.9KM进行清零 */
-    //     {
-    //         Data_Write_Trip(EM_TRIP_A, 9999);
-    //     }
-    // }   
-}
-
-
-

Firmware/Source/Component/Mileage/Services_Mileage_User.h

-#ifndef __SERVICE_ODO_USER_H__
-#define __SERVICE_ODO_USER_H__
-
-//#define  ONLY_CLEAR_ODO_MIL    0x01u        /*仅根据距离信息进行ODO清除*/
-//#define  ONLY_CLEAR_ODO_NUM    0x01u        /*仅根据次数信息进行ODO清除*/
-#define CLEAR_ODO_NUM_MIL 0x01u /*以距离信息以及次数信息进行ODO清除*/
-
-#define ODO_CLEAR_NUM 5u     /*清除次数上限值 */
-#define ODO_CLEAR_MIL 50000u /*清除距离上限值 单位0.1KM*/
-
-extern uint8_t ODO_Clear_Num_Value;
-
-void Data_User_Mileage_KL30Init(void);
-void Data_User_Mileage_WakeupInit(void);
-void Services_Mileage_Callback(void);
-void Data_ODO_KM_TO_MILE(void);
-void Data_TRIP_KM_TO_MILE(void);
-uint32_t Get_MileageInit_Status(void);
-extern uint32_t Get_ODO_Value(void);
-extern uint32_t Get_Trip_Value(void);
-extern void Trip_Clear_Km_Service(void);
-extern void Unit_Convert_Service(void);
-#endif

Firmware/Source/Component/PowerManagement/PowerManag_user.c

@@ -54,7 +54,6 @@ static void Power_KL30_Init(void)
     LINE_IN_Init();
     LED_Driver_Init_Example();//注意顺序2
     LED_Driver_Service_Immediate();
-    Data_User_Mileage_KL30Init();
     TimerM_PWM_counter_Output_Init(TIMERM_COUNTER0, 400, 64000000);
     TimerM_PWM_counter_Output_Init(TIMERM_COUNTER1, 400, 64000000);
     TimerM_PWM_CH_Output_init(TIMERM_COUNTER0, TIMERM_CHB, ActiveLevel_High);
@@ -81,7 +80,6 @@ static void Power_Wakeup_Init(void)
     Can_Init();
     eeprom_StoreInfo_Init();
     Analog_Signal_Conv_Init();
-    Data_User_Mileage_WakeupInit();
     BU98R10_Init();
     Sys_WakeUp_Init();
     LINE_IN_Init();

Firmware/Source/System/Sys_Task_List.c

@@ -32,7 +32,6 @@ void Sys_5ms_Tasks(void)
 void Sys_10ms_Tasks(void)
 {
     Line_In_Debounce_Service(10u);
-    Data_Mileage_Write_EEPROM();
     Can_BusOff_Recover(10u);
     TYW_Check_Count();
 }