🦄 refactor:添加零件号宏定义，将SOC数据处理相关逻辑从显示函数中独立出来

80cc03c1 · 李冠华 · e5472f5d · 80cc03c1 · 80cc03c1 · 80cc03c1
Commit 80cc03c1 authored Feb 10, 2025 by 李冠华
12 changed files
--- a/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
+++ b/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvguix.Administrator
@@ -6,7 +6,7 @@
  <Header>### uVision Project, (C) Keil Software</Header>

  <PrjGuiSettings>
-    <LastAddFilePath>Z:\D工作\工作\润通草地\new\rt_rmr42e\Firmware\Source\Component\Eeprom</LastAddFilePath>
+    <LastAddFilePath>Z:\D工作\code\rt_rmr42e\Firmware\Source\Application\Data_Soc</LastAddFilePath>
  </PrjGuiSettings>

  <ViewPool/>
@@ -15,17 +15,17 @@
    <View>
      <WinId>38003</WinId>
      <ViewName>Registers</ViewName>
-      <TableColWidths>140 141</TableColWidths>
+      <TableColWidths>140 100</TableColWidths>
    </View>
    <View>
      <WinId>346</WinId>
      <ViewName>Code Coverage</ViewName>
-      <TableColWidths>885 160</TableColWidths>
+      <TableColWidths>885 605</TableColWidths>
    </View>
    <View>
      <WinId>204</WinId>
      <ViewName>Performance Analyzer</ViewName>
-      <TableColWidths>1045</TableColWidths>
+      <TableColWidths>1045 156 156 133</TableColWidths>
    </View>
  </SECTreeCtrl>

@@ -93,25 +93,25 @@
      <flags>2</flags>
      <showCmd>3</showCmd>
      <MinPosition>
-        <xPos>-32000</xPos>
-        <yPos>-32000</yPos>
+        <xPos>-1</xPos>
+        <yPos>-1</yPos>
      </MinPosition>
      <MaxPosition>
        <xPos>-1</xPos>
        <yPos>-1</yPos>
      </MaxPosition>
      <NormalPosition>
-        <Top>181</Top>
-        <Left>289</Left>
-        <Right>1487</Right>
-        <Bottom>825</Bottom>
+        <Top>187</Top>
+        <Left>858</Left>
+        <Right>1182</Right>
+        <Bottom>405</Bottom>
      </NormalPosition>
    </WindowPosition>
    <MDIClientArea>
      <RegID>0</RegID>
      <MDITabState>
-        <Len>2014</Len>
-        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000F0000000E00000001000000505A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C5544535C5544535F49534F31343232395F53657276696365732E6300000000175544535F49534F31343232395F53657276696365732E6300000000C5D4F200FFFFFFFF805A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C4241543332413233394B4B363446425C737461727475705F4241543332413233392E730000000013737461727475705F4241543332413233392E7300000000FFDC7800FFFFFFFF425A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000F0A0A100FFFFFFFF595A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4465766963655C436D73656D69636F6E5C4241543332413233395C5254455C5254452E6800000000055254452E6800000000BCA8E100FFFFFFFF5A5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C5345475F444953504C41595C5345475F444953504C41592E63000000000D5345475F444953504C41592E63000000009CC1B600FFFFFFFF625A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C436F6D6D6F6E496E746572666163655C436F6D6D6F6E496E746572666163652E630000000011436F6D6D6F6E496E746572666163652E6300000000F7B88600FFFFFFFF4B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5461736B5F4C6973742E63000000000F5379735F5461736B5F4C6973742E6300000000D9ADC200FFFFFFFF565A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4261636B4C696768745C4261636B4C696768742E68000000000B4261636B4C696768742E6800000000A5C2D700FFFFFFFF565A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4261636B4C696768745C4261636B4C696768742E63000000000B4261636B4C696768742E6300000000B3A6BE00FFFFFFFF635A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C53797374656D5F4D6F6E69746F725C53797374656D5F4D6F6E69746F725F557365722E63000000001553797374656D5F4D6F6E69746F725F557365722E6300000000EAD6A300FFFFFFFF5A5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4755495F446973706C61795C4755495F446973706C61792E63000000000D4755495F446973706C61792E6300000000F6FA7D00FFFFFFFF6B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F4150505C43414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E63000000002243414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E6300000000B5E99D00FFFFFFFF4F5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5363686564756C65725F4C69622E6300000000135379735F5363686564756C65725F4C69622E63000000005FC3CF00FFFFFFFF4B5A3A5C44B9A4D7F75CB9A4D7F75CC8F3CDA8B2DDB5D85C6E65775C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C436F6D706F6E656E74732E68000000000C436F6D706F6E656E74732E6800000000C1838300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000076020000</Data>
+        <Len>1407</Len>
+        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000B0000000000000001000000355A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C6D61696E2E6300000000066D61696E2E6300000000BECEA100FFFFFFFF4C5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C436F6D706F6E656E745C54656C6C74616C65735C54656C6C74616C65735F757365722E63000000001054656C6C74616C65735F757365722E6300000000F0A0A100FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C5345475F444953504C41595C5345475F444953504C41592E63000000000D5345475F444953504C41592E63000000009CC1B600FFFFFFFF555A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C436F6D6D6F6E496E746572666163655C436F6D6D6F6E496E746572666163652E630000000011436F6D6D6F6E496E746572666163652E6300000000F7B88600FFFFFFFF3E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C53797374656D5C5379735F5461736B5F4C6973742E63000000000F5379735F5461736B5F4C6973742E6300000000D9ADC200FFFFFFFF4D5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C4755495F446973706C61795C4755495F446973706C61792E63000000000D4755495F446973706C61792E6300000000F6FA7D00FFFFFFFF5E5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F4150505C43414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E63000000002243414E5F4348305F43414E5F436F6D6D756E69636174696F6E5F4D61747269782E6300000000B5E99D00FFFFFFFF575A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C4F626A656374735C524D523432452E736374000000000A524D523432452E73637400000000CACAD500FFFFFFFF475A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C446174615F536F635C446174615F536F632E63000000000A446174615F536F632E6300000000FFDC7800FFFFFFFF4A5A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C536F757263655C4170706C69636174696F6E5C43414E5F557365725C43616E5F52585F557365722E63000000000D43616E5F52585F557365722E6300000000B3A6BE00FFFFFFFF735A3A5C44B9A4D7F75C636F64655C72745F726D723432655C4669726D776172655C50726F6A6563745C436D73656D69636F6E5C4241543332413233395C4D444B5F41524D5C5254455C4465766963655C424154333247313339474B363446425C737461727475705F4241543332473133392E730000000013737461727475705F4241543332473133392E7300000000EAD6A300FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002701000065000000B606000043010000</Data>
      </MDITabState>
    </MDIClientArea>
    <ViewEx>
@@ -150,7 +150,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>03000000660000002001000047020000</Data>
+          <Data>03000000660000002001000014010000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -170,7 +170,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>03000000660000002001000047020000</Data>
+          <Data>03000000660000002001000014010000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -450,7 +450,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>03000000660000002001000047020000</Data>
+          <Data>03000000660000002001000014010000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -470,7 +470,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>03000000660000002001000047020000</Data>
+          <Data>03000000660000002001000014010000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -490,7 +490,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>0000000078020000B60600004D030000</Data>
+          <Data>0000000045010000B60600004D030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -530,7 +530,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007B020000B306000034030000</Data>
+          <Data>0300000048010000B306000034030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1150,7 +1150,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>03000000660000002001000047020000</Data>
+          <Data>03000000660000002001000014010000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1170,7 +1170,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007B020000B306000034030000</Data>
+          <Data>0300000048010000B306000034030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1190,7 +1190,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007B020000B306000034030000</Data>
+          <Data>0300000048010000B306000034030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1250,7 +1250,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007B020000B306000034030000</Data>
+          <Data>0300000048010000B306000034030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1270,7 +1270,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007B020000B306000034030000</Data>
+          <Data>0300000048010000B306000034030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1799,14 +1799,14 @@
      </Window>
      <DockMan>
        <Len>3312</Len>
-        <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFDA000000C8000000F9040000CC000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000DA00000065000000F9040000DE000000DA0000004F000000F9040000C80000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF230100004F0000002701000060020000010000000200001004000000010000002CFFFFFFD7050000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000650000002301000076020000000000004F00000023010000600200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000BA010000F9040000BE01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000D4010000F90400006102000000000000BE010000F90400004B02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF7D020000BE010000810200004B02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000060020000B6060000640200000100000001000010040000000100000072FEFFFF65010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000007A020000B6060000630300000000000064020000B60600004D0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+        <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFDA000000C8000000F9040000CC000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000DA00000065000000F9040000DE000000DA0000004F000000F9040000C80000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFF230100004F000000270100002D010000010000000200001004000000010000002CFFFFFFD7050000FFFFFFFF05000000ED0300006D000000C3000000C4000000739400000180001000000100000000000000650000002301000043010000000000004F000000230100002D0100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000BA010000F9040000BE01000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000000000000000000D4010000F90400006102000000000000BE010000F90400004B02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFF7D020000BE010000810200004B02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000002D010000B60600003101000001000000010000100400000001000000F4FDFFFFE7000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000010000000000000047010000B6060000630300000000000031010000B60600004D0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
      </DockMan>
      <ToolBar>
        <RegID>59392</RegID>
        <Name>File</Name>
        <Buttons>
-          <Len>2602</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000004000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E4C45445F426174746572795F4368617267696E675F4A756467656D656E74960000000000000001001E4C45445F426174746572795F4368617267696E675F4A756467656D656E7400000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2889</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F69642996000000000000000F001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F6964290C4765745F4E74635F54656D7025446174615F56656869636C655F53706565645F50726F63657373696E675F5365727669636512446174615F436C6F636B5F5365727669636518446174615F4F444F5F4D696C656167655F5365727669636511506F7765725F57616B6575705F496E69740A43616E5F52785F43616B0F434F4D5F4150505F50726F636573730943616E5F57726974651B43616E5F4170705F5365745F427566665F30783041353046464535074132314646453707705458427566660A307830413130464645350B30783041313046464535300D5254455F554152545F496E6974000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
        </Buttons>
        <OriginalItems>
          <Len>1423</Len>
@@ -1822,7 +1822,7 @@
        <Name>Build</Name>
        <Buttons>
          <Len>972</Len>
-          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500000000006524D523432459600000000000000010006524D52343245000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
        </Buttons>
        <OriginalItems>
          <Len>583</Len>
@@ -1861,7 +1861,7 @@
      <Window>
        <RegID>-1</RegID>
        <PaneID>-1</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
        <IsFloating>0</IsFloating>
        <IsTabbed>0</IsTabbed>
        <IsActivated>0</IsActivated>
@@ -1891,7 +1891,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>0300000066000000D30000004B020000</Data>
+          <Data>0000000063000000D600000064020000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -1921,13 +1921,13 @@
      <Window>
        <RegID>1465</RegID>
        <PaneID>1465</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
        <IsFloating>0</IsFloating>
        <IsTabbed>0</IsTabbed>
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -1947,7 +1947,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -1967,7 +1967,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -1987,7 +1987,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2027,7 +2027,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2041,7 +2041,7 @@
      <Window>
        <RegID>1935</RegID>
        <PaneID>1935</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
        <IsFloating>0</IsFloating>
        <IsTabbed>0</IsTabbed>
        <IsActivated>0</IsActivated>
@@ -2067,11 +2067,11 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>030000007F020000B306000034030000</Data>
+          <Data>000000007C020000B60600004D030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -2087,7 +2087,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2107,7 +2107,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2127,7 +2127,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2147,7 +2147,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2167,7 +2167,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2251,7 +2251,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>00000000C00200005B0300004D030000</Data>
+          <Data>0000000068020000B60600004D030000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -2281,7 +2281,7 @@
      <Window>
        <RegID>203</RegID>
        <PaneID>203</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
        <IsFloating>0</IsFloating>
        <IsTabbed>0</IsTabbed>
        <IsActivated>0</IsActivated>
@@ -2291,7 +2291,7 @@
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
-          <Data>DA00000063000000B6060000C8000000</Data>
+          <Data>DD00000066000000B3060000AF000000</Data>
        </RectRecentDocked>
        <RectRecentFloat>
          <Len>16</Len>
@@ -2307,7 +2307,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2367,7 +2367,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2387,7 +2387,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2407,7 +2407,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2427,7 +2427,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2447,7 +2447,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2881,7 +2881,7 @@
      <Window>
        <RegID>38003</RegID>
        <PaneID>38003</PaneID>
-        <IsVisible>1</IsVisible>
+        <IsVisible>0</IsVisible>
        <IsFloating>0</IsFloating>
        <IsTabbed>0</IsTabbed>
        <IsActivated>0</IsActivated>
@@ -2947,7 +2947,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -2967,7 +2967,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -3027,7 +3027,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>8192</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -3527,7 +3527,7 @@
        <IsActivated>0</IsActivated>
        <MRUWidth>32767</MRUWidth>
        <PinState>0</PinState>
-        <RecentFrameAlignment>4096</RecentFrameAlignment>
+        <RecentFrameAlignment>32768</RecentFrameAlignment>
        <RecentRowIndex>0</RecentRowIndex>
        <RectRecentDocked>
          <Len>16</Len>
@@ -3540,14 +3540,14 @@
      </Window>
      <DockMan>
        <Len>3311</Len>
-        <Data>000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFDA000000C8000000B6060000CC000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000DA00000065000000B6060000DE000000DA0000004F000000B6060000C80000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD60000004F000000DA00000064020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000D60000007A020000000000004F000000D6000000640200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000064020000B606000068020000010000000100001004000000010000001EFEFFFF9400000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000000000007E020000B6060000630300000000000068020000B60600004D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000000000001000000FFFFFFFF5B030000C00200005F0300004D03000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000CE010000F9040000D2010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000E8010000F90400006102000000000000D2010000F90400004B0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+        <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFDA000000C8000000B6060000CC000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000DA00000065000000B6060000DE000000DA0000004F000000B6060000C80000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF1F0400004F00000023040000CE010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000002304000065000000F9040000E4010000230400004F000000F9040000CE01000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFD60000004F000000DA00000064020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000065000000D60000007A020000000000004F000000D6000000640200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000064020000B606000068020000010000000100001004000000010000001EFEFFFF9400000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000000000007E020000B6060000630300000000000068020000B60600004D03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000000000001000000FFFFFFFF5B030000C00200005F0300004D03000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000CE010000F9040000D2010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000E8010000F90400006102000000000000D2010000F90400004B0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
      </DockMan>
      <ToolBar>
        <RegID>59392</RegID>
        <Name>File</Name>
        <Buttons>
-          <Len>2825</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000015436865636B73656C665F5345475F446973706C617996000000000000000C0015436865636B73656C665F5345475F446973706C617912506F7765725F537461795F50726F7465637411436F6D6D6F6E5F496E7075745F50617261125379735F5363686564756C65725F496E6974155379735F526561645F4B4C33305F566F6C74616765114261636B4C696768745F50726F636573731354696D65724D5F50574D5F7365745F647574790F5345475F5345545F5472696E6974790D47617567655F5365727669636510506F7765725F537461795F536C656570134C45445F52454144595F4A756467656D656E740D4C45445F417474726962757465000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2889</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F69642996000000000000000F001E766F696420426C7565546F6F74685F4B4C33305F496E697428766F6964290C4765745F4E74635F54656D7025446174615F56656869636C655F53706565645F50726F63657373696E675F5365727669636512446174615F436C6F636B5F5365727669636518446174615F4F444F5F4D696C656167655F5365727669636511506F7765725F57616B6575705F496E69740A43616E5F52785F43616B0F434F4D5F4150505F50726F636573730943616E5F57726974651B43616E5F4170705F5365745F427566665F30783041353046464535074132314646453707705458427566660A307830413130464645350B30783041313046464535300D5254455F554152545F496E6974000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
        </Buttons>
        <OriginalItems>
          <Len>1423</Len>
@@ -3579,7 +3579,7 @@
        <Name>Debug</Name>
        <Buttons>
          <Len>2362</Len>
-          <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
+          <Data>00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020000002D0000000000000000000000000000000001000000010000000180F07F0000020000002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020000002F0000000000000000000000000000000001000000010000000180BB8A00000200000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000</Data>
        </Buttons>
        <OriginalItems>
          <Len>898</Len>
@@ -3603,30 +3603,12 @@
    <ActiveMDIGroup>0</ActiveMDIGroup>
    <MDIGroup>
      <Size>100</Size>
-      <ActiveTab>14</ActiveTab>
-      <Doc>
-        <Name>..\..\..\..\Source\UDS\UDS_ISO14229_Services.c</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>115</TopLine>
-        <CurrentLine>143</CurrentLine>
-        <Folding>1</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
-      <Doc>
-        <Name>RTE\Device\BAT32A239KK64FB\startup_BAT32A239.s</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>120</TopLine>
-        <CurrentLine>129</CurrentLine>
-        <Folding>1</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
+      <ActiveTab>0</ActiveTab>
      <Doc>
        <Name>..\..\..\..\Source\System\main.c</Name>
-        <ColumnNumber>5</ColumnNumber>
-        <TopLine>55</TopLine>
-        <CurrentLine>67</CurrentLine>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>45</TopLine>
+        <CurrentLine>62</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
@@ -3640,15 +3622,6 @@
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
      </Doc>
-      <Doc>
-        <Name>..\..\..\..\Source\Device\Cmsemicon\BAT32A239\RTE\RTE.h</Name>
-        <ColumnNumber>0</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>20</CurrentLine>
-        <Folding>1</Folding>
-        <ContractedFolders></ContractedFolders>
-        <PaneID>0</PaneID>
-      </Doc>
      <Doc>
        <Name>..\..\..\..\Source\Application\SEG_DISPLAY\SEG_DISPLAY.c</Name>
        <ColumnNumber>0</ColumnNumber>
@@ -3669,72 +3642,63 @@
      </Doc>
      <Doc>
        <Name>..\..\..\..\Source\System\Sys_Task_List.c</Name>
-        <ColumnNumber>7</ColumnNumber>
-        <TopLine>36</TopLine>
-        <CurrentLine>62</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>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>37</TopLine>
+        <CurrentLine>65</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>
+        <Name>..\..\..\..\Source\Application\GUI_Display\GUI_Display.c</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>255</TopLine>
+        <CurrentLine>263</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
      </Doc>
      <Doc>
-        <Name>..\..\..\..\Source\Component\System_Monitor\System_Monitor_User.c</Name>
+        <Name>..\..\..\..\Source\Application\CAN_APP\CAN_CH0_CAN_Communication_Matrix.c</Name>
        <ColumnNumber>0</ColumnNumber>
-        <TopLine>74</TopLine>
-        <CurrentLine>80</CurrentLine>
+        <TopLine>127</TopLine>
+        <CurrentLine>134</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>
+        <Name>Z:\D工作\code\rt_rmr42e\Firmware\Project\Cmsemicon\BAT32A239\MDK_ARM\Objects\RMR42E.sct</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>1</TopLine>
+        <CurrentLine>16</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
      </Doc>
      <Doc>
-        <Name>..\..\..\..\Source\Application\CAN_APP\CAN_CH0_CAN_Communication_Matrix.c</Name>
+        <Name>..\..\..\..\Source\Application\Data_Soc\Data_Soc.c</Name>
        <ColumnNumber>0</ColumnNumber>
-        <TopLine>127</TopLine>
-        <CurrentLine>134</CurrentLine>
+        <TopLine>52</TopLine>
+        <CurrentLine>60</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>
+        <Name>..\..\..\..\Source\Application\CAN_User\Can_RX_User.c</Name>
+        <ColumnNumber>17</ColumnNumber>
+        <TopLine>213</TopLine>
+        <CurrentLine>229</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>
      </Doc>
      <Doc>
-        <Name>..\..\..\..\Source\Component\Components.h</Name>
-        <ColumnNumber>46</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>17</CurrentLine>
+        <Name>RTE\Device\BAT32G139GK64FB\startup_BAT32G139.s</Name>
+        <ColumnNumber>0</ColumnNumber>
+        <TopLine>127</TopLine>
+        <CurrentLine>129</CurrentLine>
        <Folding>1</Folding>
        <ContractedFolders></ContractedFolders>
        <PaneID>0</PaneID>

--- a/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
+++ b/Firmware/Project/Cmsemicon/BAT32A239/MDK_ARM/RMR42E.uvprojx
@@ -275,7 +275,7 @@
              </OCR_RVCT3>
              <OCR_RVCT4>
                <Type>1</Type>
-                <StartAddress>0x8000</StartAddress>
+                <StartAddress>0x0</StartAddress>
                <Size>0x40000</Size>
              </OCR_RVCT4>
              <OCR_RVCT5>
@@ -361,7 +361,7 @@
            </VariousControls>
          </Aads>
          <LDads>
-            <umfTarg>1</umfTarg>
+            <umfTarg>0</umfTarg>
            <Ropi>0</Ropi>
            <Rwpi>0</Rwpi>
            <noStLib>0</noStLib>
@@ -370,7 +370,7 @@
            <TextAddressRange>0x00000000</TextAddressRange>
            <DataAddressRange>0x20000000</DataAddressRange>
            <pXoBase></pXoBase>
-            <ScatterFile></ScatterFile>
+            <ScatterFile>.\Objects\RMR42E.sct</ScatterFile>
            <IncludeLibs></IncludeLibs>
            <IncludeLibsPath></IncludeLibsPath>
            <Misc></Misc>
@@ -478,6 +478,16 @@
              <FileType>1</FileType>
              <FilePath>..\..\..\..\Source\Application\CAN_User\Can_RX_User.c</FilePath>
            </File>
+            <File>
+              <FileName>Data_Soc.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\..\..\Source\Application\Data_Soc\Data_Soc.c</FilePath>
+            </File>
+            <File>
+              <FileName>Data_Soc.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>..\..\..\..\Source\Application\Data_Soc\Data_Soc.h</FilePath>
+            </File>
          </Files>
        </Group>
        <Group>

--- a/Firmware/Source/Application/Application.h
+++ b/Firmware/Source/Application/Application.h
@@ -11,6 +11,7 @@
 #include "Can_User/Can_User.h"
 #include "Can_User/Can_App.h"
 #include "Can_User/Can_RX_User.h"
+#include "Data_Soc\Data_Soc.h"




--- a/Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
+++ b/Firmware/Source/Application/CAN_APP/CAN_CH0_CAN_Communication_Matrix.c
@@ -145,7 +145,6 @@ void System_Indicator_OFF_callback(canlib_uint8_t CopyData[])
    System_Indicator_CANFlag = 1;
    uint8_t i = 0;
    BUZZER_Init();
-    poweroff_time = 0;
    Clear_Bu98();
    for (i = 0; i < LampCh0_MAX; i++)
    {

--- a/Firmware/Source/Application/CAN_User/Can_RX_User.c
+++ b/Firmware/Source/Application/CAN_User/Can_RX_User.c
@@ -218,6 +218,9 @@ uint8_t Get_CAN_Power_State(void)
 {
    uint8_t state = 0;
    uint8_t Power_State = Get_CAN_Num_MMCU_PowerMode();
+
+    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
+    {
        switch (Power_State)
        {
        case 0x0:
@@ -245,5 +248,10 @@ uint8_t Get_CAN_Power_State(void)
            state = POWER_CHECK_NULL;
            break;
        }
+    }
+    else 
+    {
+        state = POWER_CHECK_NULL;
+    }
    return state;
 }
--- a/Firmware/Source/Application/CommonInterface/CommonInterface.h
+++ b/Firmware/Source/Application/CommonInterface/CommonInterface.h
@@ -4,6 +4,11 @@

 #include "Components.h"

+#define    RMR42E_60       (0U)           /*纯电动零件号*/
+#define    G54_A01         (1U)           /*混动零件号*/
+
+#define    PART_NUMBER     RMR42E_60     /*当前程序零件号*/
+

 /*COMMON INTERFACE*/
 typedef enum

--- a/Firmware/Source/Application/Data_Soc/Data_Soc.c
+++ b/Firmware/Source/Application/Data_Soc/Data_Soc.c
+#include "Components.h"
+#include "Data_Soc\Data_Soc.h"
+
+SocStruct_st_t Soc;
+
+uint8_t SOC_Count_Time = 0;
+uint16_t SocPoweroffTime = 0;
+
+static void Data_Soc_Battery_Level_Service(void);
+static void Data_Soc_DisplayEffect_Service(void);
+static void Data_Soc_Battery_Icon_Service(void);
+static void Data_Soc_All_Soc_Service(void);
+
+void Data_Soc_KL30_Init(void)
+{
+    Soc.Value1 = 0U;        //电量1实际值
+    Soc.Value2 = 0U;        //电量2实际值
+    Soc.Valid1 = 0U;        //电量1状态
+    Soc.Valid2 = 0U;        //电量2状态
+    Soc.Act_Seg1 = 0U;
+    Soc.Act_Seg2 = 0U;
+    Soc.Dis_Seg1 = 0U;
+    Soc.Dis_Seg2 = 0U;
+    Soc.Battery1Icon = 0U;
+    Soc.Battery2Icon = 0U;
+    Soc.AllSocValue = 0U;
+    Soc.AllSocValid = 0U;
+    SocPoweroffTime = 0U;
+}
+
+void Data_Soc_KL15_Init(void)
+{
+    Soc.Value1 = 0;        //电量1实际值
+    Soc.Value2 = 0;        //电量2实际值
+    Soc.Valid1 = 0;        //电量1状态
+    Soc.Valid2 = 0;        //电量2状态
+    Soc.Dis_Seg1 = 0;
+    Soc.Dis_Seg2 = 0;
+    Soc.Battery1Icon = 0U;
+    Soc.Battery2Icon = 0U;
+    Soc.AllSocValue = 0U;
+    Soc.AllSocValid = 0U;
+    SocPoweroffTime = 0U;
+}
+
+static void Data_Soc_Battery_Level_Service(void)
+{
+    if ((Get_CAN_Power_State() >= KEY_ACC) && (Get_CAN_Power_State() <= CHRGEND))
+    {
+        if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_SIG_NORMAL)
+        {
+            Soc.Value1 = Get_CAN_CH0_ID_18200A20_Sig_MBMS_Soc();
+            Soc.Valid1 = 1U;
+        }
+        else
+        {
+            Soc.Value1 = 0U;
+            Soc.Valid1 = 0U;
+        }
+
+        if (Soc.Valid1 != 0U)
+        {
+            Soc.Act_Seg1 = (Soc.Value1 / 10U);
+            if ((Soc.Value1 % 10) != 0)
+            {
+                Soc.Act_Seg1++;
+            }
+            if (Soc.Act_Seg1 > 10)
+            {
+                Soc.Act_Seg1 = 10;
+            }
+        }
+        else
+        {
+            Soc.Act_Seg1 = 0U;
+        }
+        
+        #if (PART_NUMBER == RMR42E_60)
+            if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_SIG_NORMAL)
+            {
+                Soc.Value2 = Get_CAN_CH0_ID_18200A21_Sig_SBMS_Soc();
+                Soc.Valid2 = 1U;
+            }
+            else
+            {
+                Soc.Value2 = 0U;
+                Soc.Valid2 = 0U;
+            }
+
+            if (Soc.Valid2 != 0U)
+            {
+                Soc.Act_Seg2 = (Soc.Value2 / 10);
+                if ((Soc.Value2 % 10) != 0)
+                {
+                    Soc.Act_Seg2++;
+                }
+                if (Soc.Act_Seg2 > 10)
+                {
+                    Soc.Act_Seg2 = 10;
+                }
+            }
+            else
+            {
+                Soc.Act_Seg2 = 0U;
+            }
+        #endif
+    }
+    else
+    {
+        Soc.Value1 = 0U;
+        Soc.Valid1 = 0U;
+        Soc.Value2 = 0U;
+        Soc.Valid2 = 0U;
+        Soc.Act_Seg1 = 0U;
+        Soc.Act_Seg2 = 0U;
+    }
+}
+
+static void Data_Soc_DisplayEffect_Service(void)
+{
+    uint8_t MBMS_TOTALSigAcc = Get_CAN_Num_MBMS_TOTALSigAcc();
+    uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
+    uint8_t MBMS_StatBattWorkState = Get_CAN_Num_MBMS_StatBattWorkState();
+
+    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
+    {
+        if (((Get_CAN_Power_State() >= KEY_ACC) && (Get_CAN_Power_State() < CHRGING)) || (Get_CAN_Power_State() == CHRGEND))
+        {
+            /*保证电量条1和2闪烁同步*/
+            if (FLASH_SYNC_1Hz)
+            {
+                if(Soc.Act_Seg1 == 1U)
+                {
+                    Soc.Dis_Seg1 = 1U;
+                }
+                if(Soc.Act_Seg2 == 1U)
+                {
+                    Soc.Dis_Seg2 = 1U;
+                }
+            }
+            else
+            {
+                if(Soc.Act_Seg1 == 1U)
+                {
+                    Soc.Dis_Seg1 = 0U;
+                }
+                if(Soc.Act_Seg2 == 1U)
+                {
+                    Soc.Dis_Seg2 = 0U;
+                }
+            }
+            if(Soc.Act_Seg1 != 1U)
+            {
+                Soc.Dis_Seg1 = Soc.Act_Seg1;
+            }
+
+            if(Soc.Act_Seg2 != 1U)
+            {
+                Soc.Dis_Seg2 = Soc.Act_Seg2;
+            }   
+
+            SocPoweroffTime = 0U;
+        }
+        else if (Get_CAN_Power_State() == CHRGING)
+        {
+            if ((MBMS_TOTALSigCharge == 1U) && (MBMS_TOTALSigAcc == 0U))
+            {
+                if (SocPoweroffTime >= 3600U)
+                {
+                    Soc.Valid1 = 0U;
+                    Soc.Valid2 = 0U;
+                }
+                else 
+                {
+                    SocPoweroffTime ++;
+                }
+            }
+
+            if ((MBMS_TOTALSigCharge == 1U) && ((MBMS_TOTALSigAcc == 0U) || (MBMS_TOTALSigAcc == 1U)))
+            {
+                if (MBMS_StatBattWorkState == 0x1) // 主电池
+                {
+                    #if (PART_NUMBER == RMR42E_60)
+                        if (Soc.Act_Seg2 == 1U)
+                        {
+                            if (FLASH_SYNC_1Hz)
+                            {
+                                Soc.Dis_Seg2 = 1U;
+                            }
+                            else
+                            {
+                                Soc.Dis_Seg2 = 0U;
+                            }
+                        }
+                        else
+                        {
+                            Soc.Dis_Seg2 = Soc.Act_Seg2;
+                        }
+                    #endif
+                    if (++SOC_Count_Time > 10U)
+                    {
+                        SOC_Count_Time = 0U;
+                        Soc.Dis_Seg1 ++;
+                        if (Soc.Dis_Seg1 > Soc.Act_Seg1)
+                        {
+                            Soc.Dis_Seg1 = 0U;
+                        }
+                    }
+                }
+                else if (MBMS_StatBattWorkState == 0x4) // 副电池
+                {
+                    if (Soc.Act_Seg1 == 1U)
+                    {
+                        if (FLASH_SYNC_1Hz)
+                        {
+                            Soc.Dis_Seg1 = 1U;
+                        }
+                        else
+                        {
+                            Soc.Dis_Seg1 = 0U;
+                        }
+                    }
+                    else
+                    {
+                        Soc.Dis_Seg1 = Soc.Act_Seg1;
+                    }
+                    
+                    #if (PART_NUMBER == RMR42E_60)
+                        if (++SOC_Count_Time > 10U)
+                        {
+                            SOC_Count_Time = 0U;
+                            Soc.Dis_Seg2 ++;
+                            if (Soc.Dis_Seg2 > Soc.Act_Seg2)
+                            {
+                                Soc.Dis_Seg2 = 0U;
+                            }
+                        }
+                    #endif
+                }
+                else if (MBMS_StatBattWorkState == 0x7) // 主副电池
+                {
+                    #if (PART_NUMBER == RMR42E_60)
+                        if (++SOC_Count_Time > 10U)
+                        {
+                            SOC_Count_Time = 0U;
+                            Soc.Dis_Seg1 ++;
+                            Soc.Dis_Seg2 ++;
+                            if (Soc.Act_Seg1 > Soc.Act_Seg2)
+                            {
+                                if (Soc.Dis_Seg2 > Soc.Act_Seg2)
+                                {
+                                    Soc.Dis_Seg2 = Soc.Act_Seg2;
+                                    if (Soc.Dis_Seg1 > Soc.Act_Seg1)
+                                    {
+                                        Soc.Dis_Seg1 = 0U;
+                                        Soc.Dis_Seg2 = 0U;
+                                    }
+                                }
+                            }
+                            else
+                            {
+                                if (Soc.Dis_Seg1 > Soc.Act_Seg1)
+                                {
+                                    Soc.Dis_Seg1 = Soc.Act_Seg1;
+                                    if (Soc.Dis_Seg2 > Soc.Act_Seg2)
+                                    {
+                                        Soc.Dis_Seg1 = 0U;
+                                        Soc.Dis_Seg2 = 0U;
+                                    }
+                                }
+                            }
+                        }
+                    #else
+                        if (++SOC_Count_Time > 10U)
+                        {
+                            SOC_Count_Time = 0U;
+                            Soc.Dis_Seg1 ++;
+                            if (Soc.Dis_Seg1 > Soc.Act_Seg1)
+                            {
+                                Soc.Dis_Seg1 = 0U;
+                            }
+                        }
+                    #endif
+                }
+                else
+                {
+                    SOC_Count_Time = 0U;
+                    /*保证电量条1和2闪烁同步*/
+                    if (FLASH_SYNC_1Hz)
+                    {
+                        if(Soc.Act_Seg1 == 1U)
+                        {
+                            Soc.Dis_Seg1 = 1U;
+                        }
+                        if(Soc.Act_Seg2 == 1U)
+                        {
+                            Soc.Dis_Seg2 = 1U;
+                        }
+                    }
+                    else
+                    {
+                        if(Soc.Act_Seg1 == 1U)
+                        {
+                            Soc.Dis_Seg1 = 0U;
+                        }
+                        if(Soc.Act_Seg2 == 1U)
+                        {
+                            Soc.Dis_Seg2 = 0U;
+                        }
+                    }
+                    if(Soc.Act_Seg1 != 1U)
+                    {
+                        Soc.Dis_Seg1 = Soc.Act_Seg1;
+                    }
+
+                    if(Soc.Act_Seg2 != 1U)
+                    {
+                        Soc.Dis_Seg2 = Soc.Act_Seg2;
+                    }   
+
+                    SocPoweroffTime = 0U;
+                }
+            }
+        }
+        else 
+        {
+            Soc.Valid1 = 0U;
+            Soc.Valid2 = 0U;
+            Soc.Dis_Seg1 = 0U;
+            Soc.Dis_Seg2 = 0U;
+            SocPoweroffTime = 0U;
+        }
+    }
+}
+
+static void Data_Soc_Battery_Icon_Service(void)
+{
+    uint8_t MBMSStatBattWorkState = 0U;
+
+    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
+    {
+        if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_SIG_NORMAL) && (Soc.Value1 != 0U))
+        {
+            Soc.Battery1Icon = 1U;
+        }
+        else
+        {
+            Soc.Battery1Icon = 0U;
+        }
+    }
+    else
+    {
+        if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A20_Msg)) == CAN_SIG_NORMAL) && 
+            (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203220_Msg)) == CAN_SIG_NORMAL))
+        {
+            MBMSStatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
+            if ((MBMSStatBattWorkState == 0x1U) || (MBMSStatBattWorkState == 0x7U))
+            {
+                Soc.Battery1Icon = 1U;
+            }
+            else
+            {
+                Soc.Battery1Icon = 0U;
+            }
+        }
+        else
+        {
+            Soc.Battery1Icon = 0U;
+        }
+    }
+
+    #if (PART_NUMBER == RMR42E_60)
+        if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
+        {
+            if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_SIG_NORMAL) && (Soc.Value2 != 0U))
+            {
+                Soc.Battery2Icon = 1U;
+            }
+            else
+            {
+                Soc.Battery2Icon = 0U;
+            }
+        }
+        else
+        {
+            if ((CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18200A21_Msg)) == CAN_SIG_NORMAL) && 
+                (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203220_Msg)) == CAN_SIG_NORMAL))
+            {
+                MBMSStatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
+                if ((MBMSStatBattWorkState == 0x4U) || (MBMSStatBattWorkState == 0x7U))
+                {
+                    Soc.Battery2Icon = 1U;
+                }
+                else
+                {
+                    Soc.Battery2Icon = 0U;
+                }
+            }
+            else
+            {
+                Soc.Battery2Icon = 0U;
+            }
+        }
+    #endif
+}
+
+static void Data_Soc_All_Soc_Service(void)
+{
+    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
+    {
+        if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x18203020_Msg)) == CAN_SIG_NORMAL)
+        {
+            Soc.AllSocValue = Get_CAN_CH0_ID_18203020_Sig_MBMS_StatSoc();
+        }
+        else 
+        {
+            ;
+        }
+        if (Soc.AllSocValue > 100U)
+        {
+            Soc.AllSocValue = 100U;
+        }
+        Soc.AllSocValid = 1U;
+    }
+    else
+    {
+        Soc.AllSocValue = 0U;
+        Soc.AllSocValid = 0U;
+    }
+}
+
+void Data_Soc_Service(void)
+{
+    Data_Soc_Battery_Level_Service();
+    Data_Soc_DisplayEffect_Service();
+    Data_Soc_Battery_Icon_Service();
+    Data_Soc_All_Soc_Service();
+}
+
+/******************************************************************************
+函数名：Get_Soc1Num_Display
+功  能：获取电量表1显示电量值函数
+参  数：无
+返回值：显示的电量值 x1
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc1Num_Display(void)
+{
+    return Soc.Value1;
+}
+
+/******************************************************************************
+函数名：Get_Soc2Num_Display
+功  能：获取电量表2显示电量值函数
+参  数：无
+返回值：显示的电量值 x1
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc2Num_Display(void)
+{
+    return Soc.Value2;
+}
+
+/******************************************************************************
+函数名：Get_Soc1_Valid
+功  能：判断电量1信号是否有效函数
+参  数：无
+返回值：Soc.Valid1        0--无效，1--有效
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc1_Valid(void)
+{
+    return Soc.Valid1;
+}
+
+/******************************************************************************
+函数名：Get_Soc2_Valid
+功  能：判断电量2信号是否有效函数
+参  数：无
+返回值：Soc.Valid2        0--无效，1--有效
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc2_Valid(void)
+{
+    return Soc.Valid2;
+}
+
+/******************************************************************************
+函数名：Get_CAN_Num_MBMS_Soc_1_Grid
+功  能：获取电量表1显示电量格数函数
+参  数：无
+返回值：Soc.Dis_Seg1 电量格数
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void)
+{
+    return Soc.Dis_Seg1;
+}
+
+/******************************************************************************
+函数名：Get_CAN_Num_SBMS_Soc_2_Grid
+功  能：获取电量表1显示电量格数函数
+参  数：无
+返回值：Soc.Dis_Seg2 电量格数
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void)
+{
+    return Soc.Dis_Seg2;
+}
+
+/******************************************************************************
+函数名：Get_Soc1_Battery_Icon
+功  能：获取电量表1是否显示电池小图标函数
+参  数：无
+返回值：Soc.Battery1Icon 0--熄灭，1--点亮
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc1_Battery_Icon(void)
+{
+    return Soc.Battery1Icon;
+}
+
+/******************************************************************************
+函数名：Get_Soc2_Battery_Icon
+功  能：获取电量表2是否显示电池小图标函数
+参  数：无
+返回值：Soc.Battery2Icon 0--熄灭，1--点亮
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_Soc2_Battery_Icon(void)
+{
+    return Soc.Battery2Icon;
+}
+
+/******************************************************************************
+函数名：Get_AllSocValue
+功  能：获取总SOC显示值函数
+参  数：无
+返回值：Soc.AllSocValue 放大倍数：x1
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_AllSocValue(void)
+{
+    return Soc.AllSocValue;
+}
+
+/******************************************************************************
+函数名：Get_AllSocValid
+功  能：获取总SOC显示状态函数
+参  数：无
+返回值：Soc.AllSocValid 0--无效，1--有效
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_AllSocValid(void)
+{
+    return Soc.AllSocValid;
+}
+/******************************************************************************
+函数名：Get_EleDial_AllSOC_lenth
+功  能：获取总SOC数值长度函数
+参  数：无
+返回值：num 0--1位数，1--2位数，2--3位数
+******************************************************************************
+注  意：该函数必须每 ms被调用一次
+******************************************************************************/
+uint8_t Get_EleDial_AllSOC_lenth(void)
+{
+    uint8_t num = 0;
+
+    if (Soc.AllSocValue > 99)
+    {
+        num = 2;
+    }
+    else if (Soc.AllSocValue > 9)
+    {
+        num = 1;
+    }
+    return num;
+}
--- a/Firmware/Source/Application/Data_Soc/Data_Soc.h
+++ b/Firmware/Source/Application/Data_Soc/Data_Soc.h
+#ifndef  DATA_SOC_H__
+#define  DATA_SOC_H__
+
+
+#include "Application.h"
+#include "Components.h"
+
+
+#define  SocUpdateTime     10
+
+typedef enum
+{
+    Soc_Blue,
+    Soc_Red,
+    Soc_Yellow,
+    Soc_Max,
+    
+}_Soc_Color;
+
+
+typedef struct //__attribute__((aligned(4))) 
+{
+    uint8_t  Value1;        //电量1实际值
+    uint8_t  Value2;        //电量2实际值
+    uint8_t  Valid1;        //电量1状态
+    uint8_t  Valid2;        //电量2状态
+    uint8_t  Act_Seg1;      /*电量1实际格数*/
+    uint8_t  Act_Seg2;      /*电量2实际格数*/
+    uint8_t  Dis_Seg1;      /*电量1显示格数*/
+    uint8_t  Dis_Seg2;      /*电量2显示格数*/
+    uint8_t  Battery1Icon;  /*电池1小图标状态*/
+    uint8_t  Battery2Icon;  /*电池2小图标状态*/
+    uint8_t  AllSocValue;   /*总SOC值*/
+    uint8_t  AllSocValid;   /*总SOC状态*/
+
+}SocStruct_st_t;
+
+
+extern void Data_Soc_KL30_Init(void);
+extern void Data_Soc_KL15_Init(void);
+extern void Data_Soc_Service(void);
+
+extern uint8_t Get_Soc1Num_Display(void);
+extern uint8_t Get_Soc2Num_Display(void);
+extern uint8_t Get_Soc1_Valid(void);
+extern uint8_t Get_Soc2_Valid(void);
+extern uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void);
+extern uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void);
+extern uint8_t Get_Soc1_Battery_Icon(void);
+extern uint8_t Get_Soc2_Battery_Icon(void);
+extern uint8_t Get_AllSocValue(void);
+extern uint8_t Get_AllSocValid(void);
+extern uint8_t Get_EleDial_AllSOC_lenth(void);
+
+#endif
+
--- a/Firmware/Source/Application/GUI_Display/GUI_Display.c
+++ b/Firmware/Source/Application/GUI_Display/GUI_Display.c
@@ -2,9 +2,7 @@
 #include "SEG_DISPLAY\SEG_DISPLAY.h"
 #include "Application.h"
 #define DISPLAY_OPEN ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Charge_OFF_Flag == 0) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
-uint16_t poweroff_time = 0;

-uint8_t SOC_Count_Time = 0;
 uint8_t BUZZER_ON = 0;
 uint8_t Charge_OFF_Flag = 0;

@@ -44,19 +42,13 @@ void TYW_Clear_Eeprom_Service(void)

 void Gauge_Power_SOC_pull_Display(void)
 {
-    // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
-    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
-    {
-        uint8_t Current_1_Grid = Get_CAN_Num_MBMS_Soc_1_Grid();
-        uint8_t Current_2_Grid = Get_CAN_Num_SBMS_Soc_2_Grid();
-        SEG_SET_EleDial_1SOC(1, Current_1_Grid);
-        SEG_SET_EleDial_2SOC(1, Current_2_Grid);
-    }
-    else
-    {
-        SEG_SET_EleDial_1SOC(0, 0);
-        SEG_SET_EleDial_2SOC(0, 0);
-    }
+    uint8_t u8Soc1Seg = Get_CAN_Num_MBMS_Soc_1_Grid();
+    uint8_t u8Soc2Seg = Get_CAN_Num_SBMS_Soc_2_Grid();
+    uint8_t u8Soc1Valid = Get_Soc1_Valid();
+    uint8_t u8Soc2Valid = Get_Soc2_Valid();
+
+    SEG_SET_EleDial_1SOC(u8Soc1Valid, u8Soc1Seg);
+    SEG_SET_EleDial_2SOC(u8Soc2Valid, u8Soc2Seg);
 }

 void Gauge_Cutterhead_Gear_Display(void)
@@ -121,174 +113,13 @@ void Gauge_Gears_Display(void)
    }
 }

-uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void)
-{
-    uint8_t num = 0;
-    uint8_t Current_SOC_1_Num = Get_CAN_Num_MBMS_Soc();
-    num = (Current_SOC_1_Num / 10);
-    if ((Current_SOC_1_Num % 10) != 0)
-    {
-        num++;
-    }
-    if (num > 10)
-    {
-        num = 10;
-    }
-    return num;
-}
-uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void)
-{
-    uint8_t num = 0;
-    uint8_t Current_SOC_2_Num = Get_CAN_Num_SBMS_Soc();
-    num = (Current_SOC_2_Num / 10);
-    if ((Current_SOC_2_Num % 10) != 0)
-    {
-        num++;
-    }
-    if (num > 10)
-    {
-        num = 10;
-    }
-    return num;
-}
-uint8_t SOC1_Count = 0;
-uint8_t SOC2_Count = 0;
-void Gauge_Power_SOC_CHAGING_Display(void)
-{
-    uint8_t MBMS_TOTALSigAcc = Get_CAN_Num_MBMS_TOTALSigAcc();
-    uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
-    uint8_t MBMS_StatBattWorkState = Get_CAN_Num_MBMS_StatBattWorkState();
-    // uint8_t MBMS_StatBattWorkState = Get_CAN_CH0_ID_18203220_Sig_MBMS_StatBattWorkState();
-    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
-    {
-        uint8_t Current_1_Grid = Get_CAN_Num_MBMS_Soc_1_Grid();
-        uint8_t Current_2_Grid = Get_CAN_Num_SBMS_Soc_2_Grid();
-
-        if (((MBMS_TOTALSigAcc == 0x1) && (MBMS_TOTALSigCharge == 0x1)) || ((MBMS_TOTALSigAcc == 0x0) && (MBMS_TOTALSigCharge == 0x1))) // 上电充电
-        {
-            if (MBMS_StatBattWorkState == 0x1) // 主电池
-            {
-                if (++SOC_Count_Time > 10)
-                {
-                    SOC_Count_Time = 0;
-
-                    SEG_SET_EleDial_1SOC(1, SOC1_Count);
-                    SOC1_Count++;
-                    if (SOC1_Count > Current_1_Grid)
-                    {
-                        SOC1_Count = 0;
-                    }
-                }
-
-                SEG_SET_EleDial_2SOC(1, Current_2_Grid);
-            }
-            else if (MBMS_StatBattWorkState == 0x4) // 副电池
-            {
-                if (++SOC_Count_Time > 10)
-                {
-                    SOC_Count_Time = 0;
-
-                    SEG_SET_EleDial_2SOC(1, SOC2_Count);
-                    SOC2_Count++;
-                    if (SOC2_Count > Current_2_Grid)
-                    {
-                        SOC2_Count = 0;
-                    }
-                }
-
-                SEG_SET_EleDial_1SOC(1, Current_1_Grid);
-            }
-            else if (MBMS_StatBattWorkState == 0x7) // 主副电池
-            {
-                if (++SOC_Count_Time > 10)
-                {
-                    SOC_Count_Time = 0;
-
-                    SEG_SET_EleDial_1SOC(1, SOC1_Count);
-                    SEG_SET_EleDial_2SOC(1, SOC2_Count);
-                    SOC1_Count++;
-                    SOC2_Count++;
-                    if (Current_1_Grid > Current_2_Grid)
-                    {
-                        if (SOC2_Count > Current_2_Grid)
-                        {
-                            SOC2_Count--;
-                            if (SOC1_Count > Current_1_Grid)
-                            {
-                                SOC1_Count = 0;
-                                SOC2_Count = 0;
-                            }
-                        }
-                    }
-                    else
-                    {
-                        if (SOC1_Count > Current_1_Grid)
-                        {
-                            SOC1_Count--;
-                            if (SOC2_Count > Current_2_Grid)
-                            {
-                                SOC1_Count = 0;
-                                SOC2_Count = 0;
-                            }
-                        }
-                    }
-                }
-            }
-            else
-            {
-                SOC1_Count = 0;
-                SOC2_Count = 0;
-                SEG_SET_EleDial_1SOC(1, Current_1_Grid);
-                SEG_SET_EleDial_2SOC(1, Current_2_Grid);
-            }
-        }
-        if ((MBMS_TOTALSigAcc == 0x0) && (MBMS_TOTALSigCharge == 0x1)) // 下电充电
-        {
-            poweroff_time++;
-        }
-        else
-        {
-            poweroff_time = 0;
-        }
-    }
-    else
-    {
-        SEG_SET_EleDial_1SOC(0, 0);
-        SEG_SET_EleDial_2SOC(0, 0);
-    }
-}
-uint8_t AllSOC_DIS = 0;
 void Gauge_EleDial_AllSOC_Display(void)
 {
-
-    if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() != KEY_OFF) && (Get_CAN_Power_State() != PKEY_ON) && (System_Indicator_CANFlag != 1))
-    {
-        AllSOC_DIS = Get_CAN_Num_MBMS_StatSoc();
-        if (AllSOC_DIS > 100)
-        {
-            AllSOC_DIS = 100;
-        }
-        SEG_SET_EleDial_AllSOC(1, AllSOC_DIS);
-    }
-    else
-    {
-        SEG_SET_EleDial_AllSOC(0, 0);
-    }
+    uint8_t u8AllSocValid = Get_AllSocValid();
+    uint8_t u8AllSocValue = Get_AllSocValue();
+    SEG_SET_EleDial_AllSOC(u8AllSocValid, u8AllSocValue);
 }

-uint8_t Get_EleDial_AllSOC_lenth(void)
-{
-    uint8_t num = 0;
-    if (AllSOC_DIS > 99)
-    {
-        num = 2;
-    }
-    else if (AllSOC_DIS > 9)
-    {
-        num = 1;
-    }
-    return num;
-}
 uint8_t Clockonetime_flag = 0;
 void Gauge_Clock_Display(void)
 {
@@ -454,7 +285,6 @@ void Gauge_Service(void)
        }
        else if (Get_CAN_Power_State() == PKEY_ON)
        {
-            poweroff_time = 0;
            if (Buzzer_time == 0)
            {
                Clear_Bu98();
@@ -494,7 +324,7 @@ void Gauge_Service(void)
            if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x125_Msg)) == CAN_SIG_NORMAL)
            {
                BUZZER_Init();
-                poweroff_time = 0;
+                // poweroff_time = 0;
                Clear_Bu98();
                interact_PWM_Low_Duty = 100;
                for (i = 0; i < LampCh0_MAX; i++)
@@ -507,7 +337,6 @@ void Gauge_Service(void)
    else
    {
        BUZZER_Init();
-        poweroff_time = 0;
        Clear_Bu98();
        interact_PWM_Low_Duty = 100;
        for (i = 0; i < LampCh0_MAX; i++)
@@ -530,50 +359,24 @@ void Gauge_CAN_setup_Service(void)
    Gauge_Gears_Display();
    uint8_t MBMS_TOTALSigAcc = Get_CAN_Num_MBMS_TOTALSigAcc();
    uint8_t MBMS_TOTALSigCharge = Get_CAN_Num_MBMS_TOTALSigCharge();
+    Gauge_Power_SOC_pull_Display();
    switch (state)
    {
    case KEY_ACC:
    {
-        poweroff_time = 0;
        Charge_OFF_Flag = 0;
        interact_PWM_Low_Duty = 0;
-        Gauge_Power_SOC_pull_Display();
    }
    break;
    case READY:
    {
-        poweroff_time = 0;
        Charge_OFF_Flag = 0;
        interact_PWM_Low_Duty = 30;
-        Gauge_Power_SOC_pull_Display();
    }
    break;
    case CHRGING:
    {
        SOC_charge_seg_Flag = 1;
-        if (poweroff_time < 3600)
-        {
-            Gauge_Power_SOC_CHAGING_Display();
-            if ((MBMS_TOTALSigAcc == 0x0) && (MBMS_TOTALSigCharge == 0x1)) // 下电充电)
-            {
-                Charge_OFF_Flag = 1;
-            }
-            else
-            {
-                Charge_OFF_Flag = 0;
-            }
-        }
-        else
-        {
-            Charge_OFF_Flag = 2;
-            SEG_SET_EleDial_1SOC(0, 0);
-            SEG_SET_EleDial_2SOC(0, 0);
-            if ((MBMS_TOTALSigAcc == 0x1) && (MBMS_TOTALSigCharge == 0x1)) // 上电充电)
-            {
-                Charge_OFF_Flag = 0;
-                poweroff_time = 0;
-            }
-        }
    }
    break;
    case CHRG_PLUGIN:
@@ -587,10 +390,6 @@ void Gauge_CAN_setup_Service(void)
        {
            Charge_OFF_Flag = 0;
        }
-        Gauge_Power_SOC_pull_Display();
-        SOC1_Count = 0;
-        SOC2_Count = 0;
-        poweroff_time = 0;
    }
    break;


--- a/Firmware/Source/Application/GUI_Display/GUI_Display.h
+++ b/Firmware/Source/Application/GUI_Display/GUI_Display.h
@@ -70,7 +70,6 @@ void Gauge_CAN_setup_Service(void);
 void Checkself_LED_Display(void);
 void BUZZER_Init(void);
 uint8_t Get_Clock_All_lenth(void);
-uint8_t Get_EleDial_AllSOC_lenth(void);
 uint8_t Get_Clockonetime_lenth(void);
 uint8_t Get_CAN_Num_SBMS_Soc_2_Grid(void);
 uint8_t Get_CAN_Num_MBMS_Soc_1_Grid(void);

--- a/Firmware/Source/Component/PowerManagement/PowerManag_user.c
+++ b/Firmware/Source/Component/PowerManagement/PowerManag_user.c
@@ -70,6 +70,7 @@ static void Power_KL30_Init(void)
 	g_stRTCInformation.u8RTCYear = 20; 
    RTE_RTC_Init(g_stRTCInformation);
    RTE_DEEPSLEEP_GPIO_Interrupt_Enable(KL15_AD_IN,Trigger_Rising);
+    Data_Soc_KL30_Init();

 }
 extern uint32_t PowerIgnOffTimeLine;

--- a/Firmware/Source/System/Sys_Task_List.c
+++ b/Firmware/Source/System/Sys_Task_List.c
@@ -46,6 +46,7 @@ void Sys_50ms_Tasks(void)
    Telltales_Management();
    Set_CAN_ALL_Signal();
    Gauge_Service();
+    Data_Soc_Service();
 }

 void Sys_15ms_Tasks(void)