From 0817c03a55b444ff4958723476f807486439e107 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期四, 24 七月 2025 17:43:29 +0800 Subject: [PATCH] 4G升级待详细测试,基本功能开发完成 --- keil/uwb_simple_example.uvoptx | 355 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 241 insertions(+), 114 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 18c232b..b7ddf6f 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -120,7 +120,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name>d</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -148,7 +148,24 @@ <Name></Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint/> + <Breakpoint> + <Bp> + <Number>0</Number> + <Type>0</Type> + <LineNumber>425</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>42270</Address> + <ByteObject>0</ByteObject> + <HtxType>0</HtxType> + <ManyObjects>0</ManyObjects> + <SizeOfObject>0</SizeOfObject> + <BreakByAccess>0</BreakByAccess> + <BreakIfRCount>1</BreakIfRCount> + <Filename><1>.\include\drivers\serial_at_cmd_app.c</Filename> + <ExecCommand></ExecCommand> + <Expression>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\425</Expression> + </Bp> + </Breakpoint> <WatchWindow1> <Ww> <count>0</count> @@ -270,72 +287,122 @@ <WinNumber>1</WinNumber> <ItemText>url</ItemText> </Ww> + <Ww> + <count>24</count> + <WinNumber>1</WinNumber> + <ItemText>current_state</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>userkey_state</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>elapsed_time_jibu,0x0A</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>uwb_time_count,0x0A</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>state_start_time,0x0A</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>current_state</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>bat_percent,0x0A</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>cnn</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>drv_state</ItemText> + </Ww> + <Ww> + <count>34</count> + <WinNumber>1</WinNumber> + <ItemText>Height</ItemText> + </Ww> + <Ww> + <count>35</count> + <WinNumber>1</WinNumber> + <ItemText>gaodu,0x0A</ItemText> + </Ww> + <Ww> + <count>36</count> + <WinNumber>1</WinNumber> + <ItemText>pressure</ItemText> + </Ww> + <Ww> + <count>37</count> + <WinNumber>1</WinNumber> + <ItemText>temperature</ItemText> + </Ww> + <Ww> + <count>38</count> + <WinNumber>1</WinNumber> + <ItemText>nomove_count</ItemText> + </Ww> </WatchWindow1> <WatchWindow2> <Ww> <count>0</count> <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> + <ItemText>m_EUART_DMA_RXBuf</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>tagdist_list</ItemText> + <ItemText>l_au8CmdBuff</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> + <ItemText>usart_receive_state</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>group_id,0x0A</ItemText> + <ItemText>UsartReceiveWaitHead0</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>2</WinNumber> - <ItemText>rx_buf</ItemText> + <ItemText>UsartReceiveWaitChecksum</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>2</WinNumber> - <ItemText>tagofflinetime,0x0A</ItemText> + <ItemText>usart_receive_state</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>2</WinNumber> - <ItemText>taglist_num</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>2</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> - </Ww> - <Ww> - <count>10</count> - <WinNumber>2</WinNumber> - <ItemText>group_id</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>2</WinNumber> - <ItemText>group_id</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>2</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> @@ -732,18 +799,6 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\sn74hc595.h</PathWithFileName> - <FilenameWithoutPath>sn74hc595.h</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>28</FileNumber> - <FileType>5</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> <PathWithFileName>.\mk_4G.h</PathWithFileName> <FilenameWithoutPath>mk_4G.h</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -751,7 +806,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -763,7 +818,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>29</FileNumber> <FileType>5</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -775,7 +830,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -787,7 +842,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>31</FileNumber> <FileType>5</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -807,7 +862,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -819,7 +874,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -831,7 +886,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -843,13 +898,25 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\lis3dh_driver.c</PathWithFileName> <FilenameWithoutPath>lis3dh_driver.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>.\dw_app_anchor.c</PathWithFileName> + <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -872,18 +939,6 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> - <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\global_param.c</PathWithFileName> <FilenameWithoutPath>global_param.c</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -891,7 +946,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -903,7 +958,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -915,7 +970,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -927,7 +982,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -939,7 +994,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -951,7 +1006,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -963,7 +1018,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -975,7 +1030,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -987,7 +1042,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -999,7 +1054,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1011,7 +1066,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1023,7 +1078,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1035,7 +1090,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1045,17 +1100,89 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>52</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\SPIV1.07.c</PathWithFileName> + <FilenameWithoutPath>SPIV1.07.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>53</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps310.c</PathWithFileName> + <FilenameWithoutPath>dps310.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>54</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps368_test.c</PathWithFileName> + <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>55</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\ymodem.c</PathWithFileName> + <FilenameWithoutPath>ymodem.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>56</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\menu.c</PathWithFileName> + <FilenameWithoutPath>menu.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>57</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\aes.c</PathWithFileName> + <FilenameWithoutPath>aes.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>OS</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1067,7 +1194,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1079,7 +1206,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1091,7 +1218,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1103,7 +1230,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1115,7 +1242,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1127,7 +1254,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1139,7 +1266,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1151,7 +1278,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1163,7 +1290,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1177,13 +1304,13 @@ <Group> <GroupName>Platform</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1195,7 +1322,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1207,7 +1334,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1229,13 +1356,13 @@ <Group> <GroupName>Utility</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1247,7 +1374,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>72</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1261,13 +1388,13 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>73</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1279,7 +1406,7 @@ </File> <File> <GroupNumber>9</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1299,7 +1426,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>75</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1311,7 +1438,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1323,7 +1450,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>72</FileNumber> + <FileNumber>77</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1335,7 +1462,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>73</FileNumber> + <FileNumber>78</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1347,7 +1474,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>74</FileNumber> + <FileNumber>79</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1359,7 +1486,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>75</FileNumber> + <FileNumber>80</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1371,7 +1498,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>76</FileNumber> + <FileNumber>81</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1383,7 +1510,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>77</FileNumber> + <FileNumber>82</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1395,7 +1522,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>78</FileNumber> + <FileNumber>83</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1407,7 +1534,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>79</FileNumber> + <FileNumber>84</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1419,7 +1546,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>80</FileNumber> + <FileNumber>85</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1431,7 +1558,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>81</FileNumber> + <FileNumber>86</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1451,7 +1578,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>82</FileNumber> + <FileNumber>87</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3