割草机单片机工程
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
yincheng.zhong
3 天以前 d487f58c6be4ed22f735d12861b59b85c3a924b9 
 STM32H743/MDK-ARM/STM32H743.uvoptx


@@ -158,7 +158,24 @@


          <Name>-U31002400110000344351534E -O2254 -SF4000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(6BA02477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8004 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32H7x_2048.FLM -FS08000000 -FL0200000 -FP0($$Device:STM32H743VITx$CMSIS\Flash\STM32H7x_2048.FLM)</Name>


        </SetRegEntry>


      </TargetDriverDllRegistry>


      <Breakpoint/>


      <Breakpoint>


        <Bp>


          <Number>0</Number>


          <Type>0</Type>


          <LineNumber>94</LineNumber>


          <EnabledFlag>1</EnabledFlag>


          <Address>134567142</Address>


          <ByteObject>0</ByteObject>


          <HtxType>0</HtxType>


          <ManyObjects>0</ManyObjects>


          <SizeOfObject>0</SizeOfObject>


          <BreakByAccess>0</BreakByAccess>


          <BreakIfRCount>1</BreakIfRCount>


          <Filename>..\APL\PathTest.c</Filename>


          <ExecCommand></ExecCommand>


          <Expression>\\STM32H743\../APL/PathTest.c\94</Expression>


        </Bp>


      </Breakpoint>


      <WatchWindow1>


        <Ww>


          <count>0</count>


@@ -285,12 +302,44 @@


          <WinNumber>1</WinNumber>


          <ItemText>g_motion_state</ItemText>


        </Ww>


        <Ww>


          <count>25</count>


          <WinNumber>1</WinNumber>


          <ItemText>state</ItemText>


        </Ww>


        <Ww>


          <count>26</count>


          <WinNumber>1</WinNumber>


          <ItemText>stTopic</ItemText>


        </Ww>


        <Ww>


          <count>27</count>


          <WinNumber>1</WinNumber>


          <ItemText>stPayload</ItemText>


        </Ww>


        <Ww>


          <count>28</count>


          <WinNumber>1</WinNumber>


          <ItemText>pcValue</ItemText>


        </Ww>


        <Ww>


          <count>29</count>


          <WinNumber>1</WinNumber>


          <ItemText>pstJsonRoot</ItemText>


        </Ww>


      </WatchWindow1>


      <WatchWindow2>


        <Ww>


          <count>0</count>


          <WinNumber>2</WinNumber>


          <ItemText>stInit</ItemText>


        </Ww>


      </WatchWindow2>


      <MemoryWindow1>


        <Mm>


          <WinNumber>1</WinNumber>


          <SubType>8</SubType>


          <ItemText>l_acUploadBuff</ItemText>


          <ItemText>_pu8JsonBuf</ItemText>


          <AccSizeX>0</AccSizeX>


        </Mm>


      </MemoryWindow1>


@@ -341,6 +390,10 @@


          <Name>System Viewer\TIM3</Name>


          <WinId>35905</WinId>


        </Entry>


        <Entry>


          <Name>System Viewer\USART6</Name>


          <WinId>35904</WinId>


        </Entry>


      </SystemViewers>


      <DebugDescription>


        <Enable>1</Enable>


@@ -354,7 +407,7 @@




  <Group>


    <GroupName>Application/MDK-ARM</GroupName>


    <tvExp>1</tvExp>


    <tvExp>0</tvExp>


    <tvExpOptDlg>0</tvExpOptDlg>


    <cbSel>0</cbSel>


    <RteFlg>0</RteFlg>


@@ -530,6 +583,66 @@


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>14</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\MQTTClient.c</PathWithFileName>


      <FilenameWithoutPath>MQTTClient.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>15</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\MsgPack.c</PathWithFileName>


      <FilenameWithoutPath>MsgPack.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\MQTTApp.c</PathWithFileName>


      <FilenameWithoutPath>MQTTApp.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\PathStorage.c</PathWithFileName>


      <FilenameWithoutPath>PathStorage.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>3</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\PathTest.c</PathWithFileName>


      <FilenameWithoutPath>PathTest.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


@@ -540,7 +653,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>14</FileNumber>


      <FileNumber>19</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -552,7 +665,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>15</FileNumber>


      <FileNumber>20</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -564,7 +677,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>16</FileNumber>


      <FileNumber>21</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -576,7 +689,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>17</FileNumber>


      <FileNumber>22</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -588,7 +701,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>18</FileNumber>


      <FileNumber>23</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -600,7 +713,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>19</FileNumber>


      <FileNumber>24</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -612,7 +725,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>20</FileNumber>


      <FileNumber>25</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -624,7 +737,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>21</FileNumber>


      <FileNumber>26</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -636,7 +749,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>22</FileNumber>


      <FileNumber>27</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -648,7 +761,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>23</FileNumber>


      <FileNumber>28</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -660,7 +773,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>24</FileNumber>


      <FileNumber>29</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -672,7 +785,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>25</FileNumber>


      <FileNumber>30</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -684,7 +797,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>26</FileNumber>


      <FileNumber>31</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -696,7 +809,7 @@


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>27</FileNumber>


      <FileNumber>32</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -706,6 +819,54 @@


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\FML\Internet\MQTT.c</PathWithFileName>


      <FilenameWithoutPath>MQTT.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\FML\Internet\Module\EG800\EG800MQTT.c</PathWithFileName>


      <FilenameWithoutPath>EG800MQTT.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>35</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\FML\Internet\HTTPClient.c</PathWithFileName>


      <FilenameWithoutPath>HTTPClient.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>4</GroupNumber>


      <FileNumber>36</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>..\APL\FileDownload.c</PathWithFileName>


      <FilenameWithoutPath>FileDownload.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


  </Group>




  <Group>


@@ -716,7 +877,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>28</FileNumber>


      <FileNumber>37</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -728,7 +889,7 @@


    </File>


    <File>


      <GroupNumber>5</GroupNumber>


      <FileNumber>29</FileNumber>


      <FileNumber>38</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -748,7 +909,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>30</FileNumber>


      <FileNumber>39</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -760,7 +921,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>31</FileNumber>


      <FileNumber>40</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -772,7 +933,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>32</FileNumber>


      <FileNumber>41</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -784,7 +945,31 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>33</FileNumber>


      <FileNumber>42</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc.c</PathWithFileName>


      <FilenameWithoutPath>stm32h7xx_hal_crc.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>43</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


      <bDave2>0</bDave2>


      <PathWithFileName>../Drivers/STM32H7xx_HAL_Driver/Src/stm32h7xx_hal_crc_ex.c</PathWithFileName>


      <FilenameWithoutPath>stm32h7xx_hal_crc_ex.c</FilenameWithoutPath>


      <RteFlg>0</RteFlg>


      <bShared>0</bShared>


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>44</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -796,7 +981,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>34</FileNumber>


      <FileNumber>45</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -808,7 +993,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>35</FileNumber>


      <FileNumber>46</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -820,7 +1005,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>36</FileNumber>


      <FileNumber>47</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -832,7 +1017,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>37</FileNumber>


      <FileNumber>48</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -844,7 +1029,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>38</FileNumber>


      <FileNumber>49</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -856,7 +1041,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>39</FileNumber>


      <FileNumber>50</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -868,7 +1053,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>40</FileNumber>


      <FileNumber>51</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -880,7 +1065,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>41</FileNumber>


      <FileNumber>52</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -892,7 +1077,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>42</FileNumber>


      <FileNumber>53</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -904,7 +1089,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>43</FileNumber>


      <FileNumber>54</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -916,7 +1101,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>44</FileNumber>


      <FileNumber>55</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -928,7 +1113,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>45</FileNumber>


      <FileNumber>56</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -940,7 +1125,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>46</FileNumber>


      <FileNumber>57</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -952,7 +1137,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>47</FileNumber>


      <FileNumber>58</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -964,7 +1149,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>48</FileNumber>


      <FileNumber>59</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -976,7 +1161,7 @@


    </File>


    <File>


      <GroupNumber>6</GroupNumber>


      <FileNumber>49</FileNumber>


      <FileNumber>60</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -996,7 +1181,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>7</GroupNumber>


      <FileNumber>50</FileNumber>


      <FileNumber>61</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1016,7 +1201,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>51</FileNumber>


      <FileNumber>62</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1028,7 +1213,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>52</FileNumber>


      <FileNumber>63</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1040,7 +1225,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>53</FileNumber>


      <FileNumber>64</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1052,7 +1237,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>54</FileNumber>


      <FileNumber>65</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1064,7 +1249,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>55</FileNumber>


      <FileNumber>66</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1076,7 +1261,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>56</FileNumber>


      <FileNumber>67</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1088,7 +1273,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>57</FileNumber>


      <FileNumber>68</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1100,7 +1285,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>58</FileNumber>


      <FileNumber>69</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1112,7 +1297,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>59</FileNumber>


      <FileNumber>70</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1124,7 +1309,7 @@


    </File>


    <File>


      <GroupNumber>8</GroupNumber>


      <FileNumber>60</FileNumber>


      <FileNumber>71</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1144,7 +1329,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>9</GroupNumber>


      <FileNumber>61</FileNumber>


      <FileNumber>72</FileNumber>


      <FileType>4</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1164,7 +1349,7 @@


    <RteFlg>0</RteFlg>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>62</FileNumber>


      <FileNumber>73</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1176,7 +1361,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>63</FileNumber>


      <FileNumber>74</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1188,7 +1373,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>64</FileNumber>


      <FileNumber>75</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1200,7 +1385,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>65</FileNumber>


      <FileNumber>76</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1212,7 +1397,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>66</FileNumber>


      <FileNumber>77</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>


@@ -1224,7 +1409,7 @@


    </File>


    <File>


      <GroupNumber>10</GroupNumber>


      <FileNumber>67</FileNumber>


      <FileNumber>78</FileNumber>


      <FileType>1</FileType>


      <tvExp>0</tvExp>


      <tvExpOptDlg>0</tvExpOptDlg>