电池标签L051工程
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yincheng.zhong
2023-02-07 2cf1ce56d99b68d336951a52d9399021571ed2d7 
 MDK-ARM/L051.uvoptx


@@ -8,7 +8,7 @@


  <Extensions>


    <cExt>*.c</cExt>


    <aExt>*.s*; *.src; *.a*</aExt>


    <oExt>*.obj</oExt>


    <oExt>*.obj; *.o</oExt>


    <lExt>*.lib</lExt>


    <tExt>*.txt; *.h; *.inc</tExt>


    <pExt>*.plm</pExt>


@@ -103,7 +103,7 @@


        <bEvRecOn>1</bEvRecOn>


        <bSchkAxf>0</bSchkAxf>


        <bTchkAxf>0</bTchkAxf>


        <nTsel>6</nTsel>


        <nTsel>4</nTsel>


        <sDll></sDll>


        <sDllPa></sDllPa>


        <sDlgDll></sDlgDll>


@@ -120,12 +120,12 @@


        <SetRegEntry>


          <Number>0</Number>


          <Key>CMSIS_AGDI</Key>


          <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


          <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


          <Key>DLGUARM</Key>


          <Name>d</Name>


          <Name></Name>


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


@@ -163,142 +163,142 @@


        <Ww>


          <count>0</count>


          <WinNumber>1</WinNumber>


          <ItemText>tag_state</ItemText>


          <ItemText>pressure</ItemText>


        </Ww>


        <Ww>


          <count>1</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbase_num</ItemText>


          <ItemText>Height</ItemText>


        </Ww>


        <Ww>


          <count>2</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbaseid_list</ItemText>


          <ItemText>fheight</ItemText>


        </Ww>


        <Ww>


          <count>3</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_id</ItemText>


          <ItemText>tx_near_msg</ItemText>


        </Ww>


        <Ww>


          <count>4</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_lost_count</ItemText>


          <ItemText>nearbase_distlist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>5</count>


          <WinNumber>1</WinNumber>


          <ItemText>trygetnearmsg_times</ItemText>


          <ItemText>nearbaseid_list</ItemText>


        </Ww>


        <Ww>


          <count>6</count>


          <WinNumber>1</WinNumber>


          <ItemText>changemainbase_count</ItemText>


          <ItemText>tag_state</ItemText>


        </Ww>


        <Ww>


          <count>7</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_dist,0x0A</ItemText>


          <ItemText>mainbase_id</ItemText>


        </Ww>


        <Ww>


          <count>8</count>


          <WinNumber>1</WinNumber>


          <ItemText>true_nearbase_distlist</ItemText>


          <ItemText>tx_near_msg</ItemText>


        </Ww>


        <Ww>


          <count>9</count>


          <WinNumber>1</WinNumber>


          <ItemText>recbase_num</ItemText>


          <ItemText>intheight,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>10</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_lost_count</ItemText>


          <ItemText>i</ItemText>


        </Ww>


        <Ww>


          <count>11</count>


          <WinNumber>1</WinNumber>


          <ItemText>tx_near_msg</ItemText>


          <ItemText>current_slotnum</ItemText>


        </Ww>


        <Ww>


          <count>12</count>


          <WinNumber>1</WinNumber>


          <ItemText>recbase_num</ItemText>


          <ItemText>singlepoll_basedist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>13</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_id</ItemText>


          <ItemText>singlepoll_i</ItemText>


        </Ww>


        <Ww>


          <count>14</count>


          <WinNumber>1</WinNumber>


          <ItemText>status_reg</ItemText>


          <ItemText>intheight,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>15</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbaseid_list</ItemText>


          <ItemText>tx_near_msg</ItemText>


        </Ww>


        <Ww>


          <count>16</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbase_distlist,0x0A</ItemText>


          <ItemText>frame_seq_nb,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>17</count>


          <WinNumber>1</WinNumber>


          <ItemText>true_nearbase_distlist[0],0x0A</ItemText>


          <ItemText>pressure</ItemText>


        </Ww>


        <Ww>


          <count>18</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_dist,0x0A</ItemText>


          <ItemText>intheight</ItemText>


        </Ww>


        <Ww>


          <count>19</count>


          <WinNumber>1</WinNumber>


          <ItemText>nomove_count</ItemText>


          <ItemText>key_keeptime</ItemText>


        </Ww>


        <Ww>


          <count>20</count>


          <WinNumber>1</WinNumber>


          <ItemText>target_time,0x0A</ItemText>


          <ItemText>nomove_count,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>21</count>


          <WinNumber>1</WinNumber>


          <ItemText>lptime,0x0A</ItemText>


          <ItemText>g_com_map,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>22</count>


          <WinNumber>1</WinNumber>


          <ItemText>lpcount,0x0A</ItemText>


          <ItemText>nearbase_distlist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>23</count>


          <WinNumber>1</WinNumber>


          <ItemText>current_slotnum*bigslot_num,0x0A</ItemText>


          <ItemText>rec_nearbaseid</ItemText>


        </Ww>


        <Ww>


          <count>24</count>


          <WinNumber>1</WinNumber>


          <ItemText>bigslot_num,0x0A</ItemText>


          <ItemText>tx_near_msg</ItemText>


        </Ww>


        <Ww>


          <count>25</count>


          <WinNumber>1</WinNumber>


          <ItemText>(current_slotnum*bigslot_num+slotpos)*SLOTTIME_MS</ItemText>


          <ItemText>singlepoll_basedist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>26</count>


          <WinNumber>1</WinNumber>


          <ItemText>current_slotnum</ItemText>


          <ItemText>userkey_state</ItemText>


        </Ww>


        <Ww>


          <count>27</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_timer,0x0A</ItemText>


          <ItemText>tag_state</ItemText>


        </Ww>


      </WatchWindow1>


      <WatchWindow2>


@@ -307,12 +307,17 @@


          <WinNumber>2</WinNumber>


          <ItemText>current_slotnum</ItemText>


        </Ww>


        <Ww>


          <count>1</count>


          <WinNumber>2</WinNumber>


          <ItemText>current_slotnum</ItemText>


        </Ww>


      </WatchWindow2>


      <MemoryWindow1>


        <Mm>


          <WinNumber>1</WinNumber>


          <SubType>0</SubType>


          <ItemText>headerBuffer</ItemText>


          <SubType>2</SubType>


          <ItemText>0x20001A38</ItemText>


          <AccSizeX>0</AccSizeX>


        </Mm>


      </MemoryWindow1>


@@ -322,7 +327,7 @@


      <DebugFlag>


        <trace>0</trace>


        <periodic>1</periodic>


        <aLwin>0</aLwin>


        <aLwin>1</aLwin>


        <aCover>0</aCover>


        <aSer1>0</aSer1>


        <aSer2>0</aSer2>


@@ -406,6 +411,42 @@


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>3</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\ExternalDevices\dps310.c</PathWithFileName>


      <FilenameWithoutPath>dps310.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>4</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\ExternalDevices\dps368_test.c</PathWithFileName>


      <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>5</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\decadriver\dw_driver.c</PathWithFileName>


      <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


@@ -416,7 +457,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>3</FileNumber>


      <FileNumber>6</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -428,7 +469,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>4</FileNumber>


      <FileNumber>7</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -440,7 +481,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>5</FileNumber>


      <FileNumber>8</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -453,34 +494,14 @@


  </Group>




  <Group>


    <GroupName>ExternalDevices</GroupName>


    <tvExp>1</tvExp>


    <tvExpOptDlg>0</tvExpOptDlg>


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>6</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\ExternalDevices\dw_driver.c</PathWithFileName>


      <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


    <GroupName>OnChipDevices</GroupName>


    <tvExp>1</tvExp>


    <tvExpOptDlg>0</tvExpOptDlg>


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>7</FileNumber>


      <GroupNumber>4</GroupNumber>


      <FileNumber>9</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -491,8 +512,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>8</FileNumber>


      <GroupNumber>4</GroupNumber>


      <FileNumber>10</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -503,8 +524,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>9</FileNumber>


      <GroupNumber>4</GroupNumber>


      <FileNumber>11</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -515,8 +536,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>10</FileNumber>


      <GroupNumber>4</GroupNumber>


      <FileNumber>12</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -543,8 +564,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>11</FileNumber>


      <GroupNumber>6</GroupNumber>


      <FileNumber>13</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -555,8 +576,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>12</FileNumber>


      <GroupNumber>6</GroupNumber>


      <FileNumber>14</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -567,8 +588,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>13</FileNumber>


      <GroupNumber>6</GroupNumber>


      <FileNumber>15</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -587,8 +608,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>14</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -599,8 +620,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>15</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -611,8 +632,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>16</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -631,8 +652,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>17</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>19</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -643,8 +664,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>18</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>20</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -655,8 +676,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>19</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>21</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -667,8 +688,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>20</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>22</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -679,8 +700,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>21</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>23</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -691,8 +712,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>22</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>24</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -703,8 +724,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>23</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>25</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -715,8 +736,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>24</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>26</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -727,8 +748,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>25</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>27</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -739,8 +760,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>26</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>28</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -751,8 +772,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>27</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>29</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -763,8 +784,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>28</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>30</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -775,8 +796,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>29</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>31</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -787,8 +808,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>30</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>32</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -799,8 +820,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>31</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -811,8 +832,20 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>32</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</PathWithFileName>


      <FilenameWithoutPath>stm32l0xx_hal_exti.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>35</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -823,8 +856,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>33</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>36</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -835,8 +868,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>34</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>37</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -847,8 +880,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>35</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>38</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -859,8 +892,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>36</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>39</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -871,8 +904,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>37</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>40</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -891,8 +924,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>38</FileNumber>


      <GroupNumber>9</GroupNumber>


      <FileNumber>41</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>