电池标签L051工程
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
WXK
7 天以前 2a7bd8d1fd712d96a573c7377b16f2b0a09aa726 
 MDK-ARM/L051.uvoptx


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


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


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


        </SetRegEntry>


        <SetRegEntry>


          <Number>0</Number>


@@ -158,136 +158,181 @@


          <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>573</LineNumber>


          <EnabledFlag>1</EnabledFlag>


          <Address>134251050</Address>


          <ByteObject>0</ByteObject>


          <HtxType>0</HtxType>


          <ManyObjects>0</ManyObjects>


          <SizeOfObject>0</SizeOfObject>


          <BreakByAccess>0</BreakByAccess>


          <BreakIfRCount>1</BreakIfRCount>


          <Filename>C:\git\XRange_Tag -Lora-R - 鍓湰\Src\main.c</Filename>


          <ExecCommand></ExecCommand>


          <Expression>\\L051\../Src/main.c\573</Expression>


        </Bp>


      </Breakpoint>


      <Breakpoint/>


      <WatchWindow1>


        <Ww>


          <count>0</count>


          <WinNumber>1</WinNumber>


          <ItemText>g_com_map</ItemText>


          <ItemText>wg_lost_count,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>1</count>


          <WinNumber>1</WinNumber>


          <ItemText>Loratx_frequency,0x0A</ItemText>


          <ItemText>intheight,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>2</count>


          <WinNumber>1</WinNumber>


          <ItemText>poll_rx_ts</ItemText>


          <ItemText>bat_percent,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>3</count>


          <WinNumber>1</WinNumber>


          <ItemText>resp_tx_time</ItemText>


          <ItemText>bat_volt</ItemText>


        </Ww>


        <Ww>


          <count>4</count>


          <WinNumber>1</WinNumber>


          <ItemText>Loratx_frequency,0x0A</ItemText>


          <ItemText>nomove_count</ItemText>


        </Ww>


        <Ww>


          <count>5</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_tx_ancnum</ItemText>


          <ItemText>nomove_count</ItemText>


        </Ww>


        <Ww>


          <count>6</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_status</ItemText>


          <ItemText>rec_ancdistlist,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>7</count>


          <WinNumber>1</WinNumber>


          <ItemText>Loratx_frequency,0x0A</ItemText>


          <ItemText>seq_num,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>8</count>


          <WinNumber>1</WinNumber>


          <ItemText>irq_num</ItemText>


          <ItemText>motor_keeptime,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>9</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_rece_error</ItemText>


          <ItemText>g_com_map</ItemText>


        </Ww>


        <Ww>


          <count>10</count>


          <WinNumber>1</WinNumber>


          <ItemText>last_lpcount,0x0A</ItemText>


          <ItemText>wg_report_id</ItemText>


        </Ww>


        <Ww>


          <count>11</count>


          <WinNumber>1</WinNumber>


          <ItemText>lpcount,0x0A</ItemText>


          <ItemText>nomove_count</ItemText>


        </Ww>


        <Ww>


          <count>12</count>


          <WinNumber>1</WinNumber>


          <ItemText>lp_time</ItemText>


          <ItemText>wg_report_freq,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>13</count>


          <WinNumber>1</WinNumber>


          <ItemText>lora_zhuangtai</ItemText>


          <ItemText>delaytime,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>14</count>


          <WinNumber>1</WinNumber>


          <ItemText>Loratx_frequency,0x0A</ItemText>


          <ItemText>report_ancnum</ItemText>


        </Ww>


        <Ww>


          <count>15</count>


          <WinNumber>1</WinNumber>


          <ItemText>usart_send</ItemText>


          <ItemText>huifushengjibaoerror_num</ItemText>


        </Ww>


        <Ww>


          <count>16</count>


          <WinNumber>1</WinNumber>


          <ItemText>send_frame1</ItemText>


          <ItemText>muqiandeshengjibao</ItemText>


        </Ww>


        <Ww>


          <count>17</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_tx_ancdist</ItemText>


          <ItemText>LoraUp_flag</ItemText>


        </Ww>


        <Ww>


          <count>18</count>


          <WinNumber>1</WinNumber>


          <ItemText>rec_ancdistlist,0x0A</ItemText>


          <ItemText>shengji_flag</ItemText>


        </Ww>


        <Ww>


          <count>19</count>


          <WinNumber>1</WinNumber>


          <ItemText>rec_ancidlist</ItemText>


          <ItemText>RX_Buffer</ItemText>


        </Ww>


        <Ww>


          <count>20</count>


          <WinNumber>1</WinNumber>


          <ItemText>value,0x0A</ItemText>


          <ItemText>motor_keeptime</ItemText>


        </Ww>


        <Ww>


          <count>21</count>


          <WinNumber>1</WinNumber>


          <ItemText>ble_rxzhongzhuandate</ItemText>


          <ItemText>g_com_map</ItemText>


        </Ww>


        <Ww>


          <count>22</count>


          <WinNumber>1</WinNumber>


          <ItemText>g_com_map2</ItemText>


        </Ww>


        <Ww>


          <count>23</count>


          <WinNumber>1</WinNumber>


          <ItemText>lora_jianting_flag</ItemText>


        </Ww>


        <Ww>


          <count>24</count>


          <WinNumber>1</WinNumber>


          <ItemText>tagid_list</ItemText>


        </Ww>


        <Ww>


          <count>25</count>


          <WinNumber>1</WinNumber>


          <ItemText>tagdist_list</ItemText>


        </Ww>


        <Ww>


          <count>26</count>


          <WinNumber>1</WinNumber>


          <ItemText>anchordata_bat</ItemText>


        </Ww>


        <Ww>


          <count>27</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_send_time,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>28</count>


          <WinNumber>1</WinNumber>


          <ItemText>one_flag</ItemText>


        </Ww>


        <Ww>


          <count>29</count>


          <WinNumber>1</WinNumber>


          <ItemText>fasongwancheng_flag</ItemText>


        </Ww>


        <Ww>


          <count>30</count>


          <WinNumber>1</WinNumber>


          <ItemText>Lora_send_flag</ItemText>


        </Ww>


        <Ww>


          <count>31</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_num,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>32</count>


          <WinNumber>1</WinNumber>


          <ItemText>anchordata_bat</ItemText>


        </Ww>


      </WatchWindow1>


      <WatchWindow2>


        <Ww>


          <count>0</count>


          <WinNumber>2</WinNumber>


          <ItemText>irq_num1,0x0A</ItemText>


        </Ww>


      </WatchWindow2>


      <MemoryWindow1>


        <Mm>


          <WinNumber>1</WinNumber>


@@ -354,18 +399,6 @@


    <tvExpOptDlg>0</tvExpOptDlg>


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>1</GroupNumber>


      <FileNumber>1</FileNumber>


      <FileType>2</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>startup_stm32l051xx.s</PathWithFileName>


      <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


@@ -376,6 +409,18 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>1</FileNumber>


      <FileType>2</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>startup_stm32l051xx.s</PathWithFileName>


      <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>2</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


@@ -383,6 +428,30 @@


      <bDave2>0</bDave2>


      <PathWithFileName>..\Drivers\ExternlDrivers\lis3dh_driver.c</PathWithFileName>


      <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>


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


@@ -396,7 +465,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>3</FileNumber>


      <FileNumber>5</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -408,7 +477,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>4</FileNumber>


      <FileNumber>6</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -420,7 +489,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>5</FileNumber>


      <FileNumber>7</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -440,7 +509,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>6</FileNumber>


      <FileNumber>8</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -460,7 +529,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>7</FileNumber>


      <FileNumber>9</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -472,7 +541,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>8</FileNumber>


      <FileNumber>10</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -484,7 +553,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>9</FileNumber>


      <FileNumber>11</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -496,7 +565,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>10</FileNumber>


      <FileNumber>12</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -524,7 +593,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>11</FileNumber>


      <FileNumber>13</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -536,7 +605,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>12</FileNumber>


      <FileNumber>14</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -548,7 +617,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>13</FileNumber>


      <FileNumber>15</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -560,7 +629,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>14</FileNumber>


      <FileNumber>16</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -572,13 +641,13 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>15</FileNumber>


      <FileNumber>17</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


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


      <FilenameWithoutPath>dw_ancapp.c</FilenameWithoutPath>


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


      <FilenameWithoutPath>dw_mbx_tag.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


@@ -592,7 +661,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileNumber>18</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -604,7 +673,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileNumber>19</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -616,7 +685,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileNumber>20</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -636,7 +705,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>19</FileNumber>


      <FileNumber>21</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -656,7 +725,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>20</FileNumber>


      <FileNumber>22</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -668,7 +737,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>21</FileNumber>


      <FileNumber>23</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -680,7 +749,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>22</FileNumber>


      <FileNumber>24</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -692,7 +761,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>23</FileNumber>


      <FileNumber>25</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -704,7 +773,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>24</FileNumber>


      <FileNumber>26</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -716,7 +785,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>25</FileNumber>


      <FileNumber>27</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -736,7 +805,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>26</FileNumber>


      <FileNumber>28</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -748,7 +817,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>27</FileNumber>


      <FileNumber>29</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -760,7 +829,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>28</FileNumber>


      <FileNumber>30</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -772,7 +841,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>29</FileNumber>


      <FileNumber>31</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -784,7 +853,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>30</FileNumber>


      <FileNumber>32</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -796,7 +865,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>31</FileNumber>


      <FileNumber>33</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -808,7 +877,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>32</FileNumber>


      <FileNumber>34</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -820,7 +889,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileNumber>35</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -832,7 +901,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileNumber>36</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -844,7 +913,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>35</FileNumber>


      <FileNumber>37</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -856,7 +925,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>36</FileNumber>


      <FileNumber>38</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -868,7 +937,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>37</FileNumber>


      <FileNumber>39</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -880,7 +949,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>38</FileNumber>


      <FileNumber>40</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -892,7 +961,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>39</FileNumber>


      <FileNumber>41</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -904,7 +973,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>40</FileNumber>


      <FileNumber>42</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -916,7 +985,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>41</FileNumber>


      <FileNumber>43</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -928,7 +997,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>42</FileNumber>


      <FileNumber>44</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -940,7 +1009,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>43</FileNumber>


      <FileNumber>45</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -952,7 +1021,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>44</FileNumber>


      <FileNumber>46</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -964,7 +1033,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>45</FileNumber>


      <FileNumber>47</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -976,7 +1045,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>46</FileNumber>


      <FileNumber>48</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -988,7 +1057,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>47</FileNumber>


      <FileNumber>49</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>