电池标签L051工程
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
WXK
2024-06-24 a7480e8f96eb7efe2689fdac2c1d7d0e44e5b5ef 
 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>


@@ -113,7 +113,7 @@


        <tDllPa></tDllPa>


        <tDlgDll></tDlgDll>


        <tDlgPa></tDlgPa>


        <tIfile></tIfile>


        <tIfile>.\Loader.ini</tIfile>


        <pMon>Segger\JL2CM3.dll</pMon>


      </DebugOpt>


      <TargetDriverDllRegistry>


@@ -125,7 +125,7 @@


        <SetRegEntry>


          <Number>0</Number>


          <Key>DLGUARM</Key>


          <Name></Name>


          <Name>d</Name>


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


@@ -145,7 +145,7 @@


        <SetRegEntry>


          <Number>0</Number>


          <Key>JL2CM3</Key>


          <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


          <Name>-U20090928 -O70 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


@@ -158,124 +158,122 @@


          <Name>-U066CFF564948897767122910 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


        </SetRegEntry>


      </TargetDriverDllRegistry>


      <Breakpoint>


        <Bp>


          <Number>0</Number>


          <Type>0</Type>


          <LineNumber>998</LineNumber>


          <EnabledFlag>1</EnabledFlag>


          <Address>134255062</Address>


          <ByteObject>0</ByteObject>


          <HtxType>0</HtxType>


          <ManyObjects>0</ManyObjects>


          <SizeOfObject>0</SizeOfObject>


          <BreakByAccess>0</BreakByAccess>


          <BreakIfRCount>1</BreakIfRCount>


          <Filename>..\Src\application\dw_app.c</Filename>


          <ExecCommand></ExecCommand>


          <Expression>\\L051\../Src/application/dw_app.c\998</Expression>


        </Bp>


      </Breakpoint>


      <Breakpoint/>


      <WatchWindow1>


        <Ww>


          <count>0</count>


          <WinNumber>1</WinNumber>


          <ItemText>recbase_num</ItemText>


          <ItemText>mainbase_id</ItemText>


        </Ww>


        <Ww>


          <count>1</count>


          <WinNumber>1</WinNumber>


          <ItemText>true_nearbase_idlist</ItemText>


          <ItemText>nearbase_distlist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>2</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_id</ItemText>


          <ItemText>tag_state</ItemText>


        </Ww>


        <Ww>


          <count>3</count>


          <WinNumber>1</WinNumber>


          <ItemText>motor_ontime</ItemText>


          <ItemText>mainbase_lost_count</ItemText>


        </Ww>


        <Ww>


          <count>4</count>


          <WinNumber>1</WinNumber>


          <ItemText>nomove_count</ItemText>


          <ItemText>notenoughdist_count</ItemText>


        </Ww>


        <Ww>


          <count>5</count>


          <WinNumber>1</WinNumber>


          <ItemText>tag_state</ItemText>


          <ItemText>test2,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>6</count>


          <WinNumber>1</WinNumber>


          <ItemText>module_power,0x0A</ItemText>


          <ItemText>exsistbase_list</ItemText>


        </Ww>


        <Ww>


          <count>7</count>


          <WinNumber>1</WinNumber>


          <ItemText>target_time,0x0A</ItemText>


          <ItemText>intheight,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>8</count>


          <WinNumber>1</WinNumber>


          <ItemText>slotpos_intoatl,0x0A</ItemText>


          <ItemText>nearbase_distlist[i],0x0A</ItemText>


        </Ww>


        <Ww>


          <count>9</count>


          <WinNumber>1</WinNumber>


          <ItemText>key_keeptime</ItemText>


          <ItemText>tag_resprx[0]</ItemText>


        </Ww>


        <Ww>


          <count>10</count>


          <WinNumber>1</WinNumber>


          <ItemText>g_com_map</ItemText>


          <ItemText>poll_tx_ts</ItemText>


        </Ww>


        <Ww>


          <count>11</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbaseid_list</ItemText>


          <ItemText>anc_resptx[0]</ItemText>


        </Ww>


        <Ww>


          <count>12</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_id</ItemText>


          <ItemText>anc_pollrx[0]</ItemText>


        </Ww>


        <Ww>


          <count>13</count>


          <WinNumber>1</WinNumber>


          <ItemText>minid</ItemText>


          <ItemText>tag_resprx[0]-poll_tx_ts</ItemText>


        </Ww>


        <Ww>


          <count>14</count>


          <WinNumber>1</WinNumber>


          <ItemText>temp_dist,0x0A</ItemText>


          <ItemText>anc_resptx[0]-anc_pollrx[0]</ItemText>


        </Ww>


        <Ww>


          <count>15</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbase_switchdistlist,0x0A</ItemText>


          <ItemText>tag_resprx[0]-poll_tx_ts-(anc_resptx[0]-anc_pollrx[0]),0x10</ItemText>


        </Ww>


        <Ww>


          <count>16</count>


          <WinNumber>1</WinNumber>


          <ItemText>tag_state</ItemText>


          <ItemText>nearbase_distlist</ItemText>


        </Ww>


        <Ww>


          <count>17</count>


          <WinNumber>1</WinNumber>


          <ItemText>nearbase_distlist,0x0A</ItemText>


          <ItemText>g_com_map</ItemText>


        </Ww>


        <Ww>


          <count>18</count>


          <WinNumber>1</WinNumber>


          <ItemText>rec_nearbaseid</ItemText>


          <ItemText>nearbase_distlist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>19</count>


          <WinNumber>1</WinNumber>


          <ItemText>mainbase_lost_count</ItemText>


          <ItemText>intheight,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>20</count>


          <WinNumber>1</WinNumber>


          <ItemText>trygetnearmsg_times</ItemText>


        </Ww>


        <Ww>


          <count>21</count>


          <WinNumber>1</WinNumber>


          <ItemText>outrange_times</ItemText>


        </Ww>


        <Ww>


          <count>22</count>


          <WinNumber>1</WinNumber>


          <ItemText>tag_state</ItemText>


        </Ww>


      </WatchWindow1>


      <WatchWindow2>


@@ -293,8 +291,8 @@


      <MemoryWindow1>


        <Mm>


          <WinNumber>1</WinNumber>


          <SubType>0</SubType>


          <ItemText>headerBuffer</ItemText>


          <SubType>2</SubType>


          <ItemText>0x20001A38</ItemText>


          <AccSizeX>0</AccSizeX>


        </Mm>


      </MemoryWindow1>


@@ -388,6 +386,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>


@@ -398,7 +432,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>3</FileNumber>


      <FileNumber>6</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -410,7 +444,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>4</FileNumber>


      <FileNumber>7</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -422,7 +456,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>5</FileNumber>


      <FileNumber>8</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -435,34 +469,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>


@@ -473,8 +487,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>


@@ -485,8 +499,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>


@@ -497,8 +511,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>


@@ -525,8 +539,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>


@@ -537,8 +551,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>


@@ -549,14 +563,26 @@


      <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>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\application\serial_at_cmd_app.c</PathWithFileName>


      <FilenameWithoutPath>serial_at_cmd_app.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\Src\application\ss_dw_tag_core.c</PathWithFileName>


      <FilenameWithoutPath>ss_dw_tag_core.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


@@ -569,8 +595,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>14</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -581,8 +607,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>15</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -593,8 +619,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>16</FileNumber>


      <GroupNumber>7</GroupNumber>


      <FileNumber>19</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -613,8 +639,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>17</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>20</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -625,8 +651,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>18</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>21</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -637,8 +663,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>19</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>22</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -649,8 +675,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>20</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>23</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -661,8 +687,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>21</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>24</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -673,8 +699,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>22</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>25</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -685,8 +711,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>23</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>26</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -697,8 +723,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>24</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>27</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -709,8 +735,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>25</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>28</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -721,8 +747,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>26</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>29</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -733,8 +759,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>27</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>30</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -745,8 +771,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>28</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>31</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -757,8 +783,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>29</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>32</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -769,8 +795,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>30</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -781,8 +807,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>31</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -793,8 +819,20 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>32</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>35</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>36</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -805,8 +843,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>33</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>37</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -817,8 +855,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>34</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>38</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -829,8 +867,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>35</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>39</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -841,8 +879,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>36</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>40</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -853,8 +891,8 @@


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>37</FileNumber>


      <GroupNumber>8</GroupNumber>


      <FileNumber>41</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -873,8 +911,8 @@


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>38</FileNumber>


      <GroupNumber>9</GroupNumber>


      <FileNumber>42</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>