电池标签L051工程
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
WXK
2024-10-21 f152f0dd5cb4aaf867b8976e357291001bb2eebe 
 MDK-ARM/L051.uvoptx


@@ -88,7 +88,7 @@


        <sRmem>1</sRmem>


        <sRfunc>1</sRfunc>


        <sRbox>1</sRbox>


        <tLdApp>0</tLdApp>


        <tLdApp>1</tLdApp>


        <tGomain>1</tGomain>


        <tRbreak>1</tRbreak>


        <tRwatch>1</tRwatch>


@@ -120,7 +120,7 @@


        <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 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>


          <Name>-X"Horco CMSIS-DAP v2" -U482752542668 -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>


@@ -163,157 +163,167 @@


        <Ww>


          <count>0</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_id</ItemText>


          <ItemText>taglist_total_num</ItemText>


        </Ww>


        <Ww>


          <count>1</count>


          <WinNumber>1</WinNumber>


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


          <ItemText>taglist_id[0]</ItemText>


        </Ww>


        <Ww>


          <count>2</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_keeptime,0x0A</ItemText>


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


        </Ww>


        <Ww>


          <count>3</count>


          <WinNumber>1</WinNumber>


          <ItemText>count1,0x0A</ItemText>


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


        </Ww>


        <Ww>


          <count>4</count>


          <WinNumber>1</WinNumber>


          <ItemText>count2,0x0A</ItemText>


          <ItemText>sync_lost_count</ItemText>


        </Ww>


        <Ww>


          <count>5</count>


          <WinNumber>1</WinNumber>


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


          <ItemText>sync_state</ItemText>


        </Ww>


        <Ww>


          <count>6</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_dist[1],0x0A</ItemText>


          <ItemText>g_com_map</ItemText>


        </Ww>


        <Ww>


          <count>7</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_dist[2],0x0A</ItemText>


          <ItemText>config_state_count,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>8</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_total_num,0x0A</ItemText>


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


        </Ww>


        <Ww>


          <count>9</count>


          <WinNumber>1</WinNumber>


          <ItemText>rx_buffer</ItemText>


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


        </Ww>


        <Ww>


          <count>10</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_current_index,0x0A</ItemText>


          <ItemText>taglist_dist[1]</ItemText>


        </Ww>


        <Ww>


          <count>11</count>


          <WinNumber>1</WinNumber>


          <ItemText>tag_num_tosend,0x0A</ItemText>


          <ItemText>taglist_dist[0]</ItemText>


        </Ww>


        <Ww>


          <count>12</count>


          <WinNumber>1</WinNumber>


          <ItemText>rec_tag_index,0x0A</ItemText>


          <ItemText>taglist_id</ItemText>


        </Ww>


        <Ww>


          <count>13</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_current_index</ItemText>


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


        </Ww>


        <Ww>


          <count>14</count>


          <WinNumber>1</WinNumber>


          <ItemText>temp_index</ItemText>


          <ItemText>taglist_keeptime[1],0x0A</ItemText>


        </Ww>


        <Ww>


          <count>15</count>


          <WinNumber>1</WinNumber>


          <ItemText>current_slotnum,0x0A</ItemText>


          <ItemText>taglist_keeptime[2],0x0A</ItemText>


        </Ww>


        <Ww>


          <count>16</count>


          <WinNumber>1</WinNumber>


          <ItemText>g_start_send_flag</ItemText>


          <ItemText>taglist_keeptime[3],0x0A</ItemText>


        </Ww>


        <Ww>


          <count>17</count>


          <WinNumber>1</WinNumber>


          <ItemText>lora_up_rec_flag11</ItemText>


          <ItemText>g_com_map[10]</ItemText>


        </Ww>


        <Ww>


          <count>18</count>


          <WinNumber>1</WinNumber>


          <ItemText>huifushengjibaoerror_num</ItemText>


          <ItemText>muqiandeshengjibao,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>19</count>


          <WinNumber>1</WinNumber>


          <ItemText>tttt,0x0A</ItemText>


          <ItemText>huifushengjibaoerror_num</ItemText>


        </Ww>


        <Ww>


          <count>20</count>


          <WinNumber>1</WinNumber>


          <ItemText>current_count1</ItemText>


          <ItemText>bat_percent</ItemText>


        </Ww>


        <Ww>


          <count>21</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_interval_count,0x0A</ItemText>


          <ItemText>AD_value</ItemText>


        </Ww>


        <Ww>


          <count>22</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_state</ItemText>


          <ItemText>aaa</ItemText>


        </Ww>


        <Ww>


          <count>23</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_lost_count</ItemText>


          <ItemText>Anchor_Vcc_time</ItemText>


        </Ww>


        <Ww>


          <count>24</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_listen_ms</ItemText>


          <ItemText>bat_volt</ItemText>


        </Ww>


        <Ww>


          <count>25</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_listen_ms,0x0A</ItemText>


          <ItemText>ceshi,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>26</count>


          <WinNumber>1</WinNumber>


          <ItemText>tt2,0x0A</ItemText>


          <ItemText>AD_value,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>27</count>


          <WinNumber>1</WinNumber>


          <ItemText>next_poll_state</ItemText>


          <ItemText>verfint_cal</ItemText>


        </Ww>


        <Ww>


          <count>28</count>


          <WinNumber>1</WinNumber>


          <ItemText>sync_lost_count</ItemText>


          <ItemText>bat_percent,0x0A</ItemText>


        </Ww>


        <Ww>


          <count>29</count>


          <WinNumber>1</WinNumber>


          <ItemText>flag_entersleep</ItemText>


          <ItemText>Height</ItemText>


        </Ww>


        <Ww>


          <count>30</count>


          <WinNumber>1</WinNumber>


          <ItemText>wg_sendtime_100us,0x0A</ItemText>


          <ItemText>taglist_dist[0]</ItemText>


        </Ww>


        <Ww>


          <count>31</count>


          <WinNumber>1</WinNumber>


          <ItemText>uwbdistance</ItemText>


        </Ww>


        <Ww>


          <count>32</count>


          <WinNumber>1</WinNumber>


          <ItemText>taglist_dist</ItemText>


        </Ww>


      </WatchWindow1>


      <MemoryWindow1>


@@ -402,6 +412,42 @@


    <tvExpOptDlg>0</tvExpOptDlg>


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>2</GroupNumber>


      <FileNumber>2</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>3</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>4</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


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


      <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


@@ -412,7 +458,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>2</FileNumber>


      <FileNumber>5</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -424,7 +470,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>3</FileNumber>


      <FileNumber>6</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -436,7 +482,7 @@


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>4</FileNumber>


      <FileNumber>7</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -456,7 +502,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>5</FileNumber>


      <FileNumber>8</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -476,7 +522,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>6</FileNumber>


      <FileNumber>9</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -488,7 +534,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>7</FileNumber>


      <FileNumber>10</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -500,7 +546,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>8</FileNumber>


      <FileNumber>11</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -512,7 +558,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>9</FileNumber>


      <FileNumber>12</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -540,7 +586,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>10</FileNumber>


      <FileNumber>13</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -552,7 +598,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>11</FileNumber>


      <FileNumber>14</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -564,7 +610,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>12</FileNumber>


      <FileNumber>15</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -576,7 +622,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>13</FileNumber>


      <FileNumber>16</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -588,7 +634,7 @@


    </File>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>14</FileNumber>


      <FileNumber>17</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -608,7 +654,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>15</FileNumber>


      <FileNumber>18</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -620,7 +666,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileNumber>19</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -632,7 +678,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileNumber>20</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -652,7 +698,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileNumber>21</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -672,7 +718,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>19</FileNumber>


      <FileNumber>22</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -684,7 +730,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>20</FileNumber>


      <FileNumber>23</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -696,7 +742,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>21</FileNumber>


      <FileNumber>24</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -708,7 +754,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>22</FileNumber>


      <FileNumber>25</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -720,7 +766,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>23</FileNumber>


      <FileNumber>26</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -732,7 +778,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>24</FileNumber>


      <FileNumber>27</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -752,7 +798,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>25</FileNumber>


      <FileNumber>28</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -764,7 +810,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>26</FileNumber>


      <FileNumber>29</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -776,7 +822,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>27</FileNumber>


      <FileNumber>30</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -788,7 +834,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>28</FileNumber>


      <FileNumber>31</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -800,7 +846,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>29</FileNumber>


      <FileNumber>32</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -812,7 +858,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>30</FileNumber>


      <FileNumber>33</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -824,7 +870,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>31</FileNumber>


      <FileNumber>34</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -836,7 +882,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>32</FileNumber>


      <FileNumber>35</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -848,7 +894,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileNumber>36</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -860,7 +906,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileNumber>37</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -872,7 +918,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>35</FileNumber>


      <FileNumber>38</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -884,7 +930,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>36</FileNumber>


      <FileNumber>39</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -896,7 +942,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>37</FileNumber>


      <FileNumber>40</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -908,7 +954,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>38</FileNumber>


      <FileNumber>41</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -920,7 +966,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>39</FileNumber>


      <FileNumber>42</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -932,7 +978,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>40</FileNumber>


      <FileNumber>43</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -944,7 +990,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>41</FileNumber>


      <FileNumber>44</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -956,7 +1002,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>42</FileNumber>


      <FileNumber>45</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -968,7 +1014,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>43</FileNumber>


      <FileNumber>46</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -980,7 +1026,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>44</FileNumber>


      <FileNumber>47</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -992,7 +1038,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>45</FileNumber>


      <FileNumber>48</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1004,7 +1050,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>46</FileNumber>


      <FileNumber>49</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1016,7 +1062,7 @@


    </File>


    <File>


      <GroupNumber>11</GroupNumber>


      <FileNumber>47</FileNumber>


      <FileNumber>50</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>