From 5cb269400905175cf618729ab44dfa4ccd3d0331 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期一, 21 七月 2025 17:51:51 +0800
Subject: [PATCH] 串口扫描功能调通，升级有问题
---
keil/uwb_simple_example.uvoptx | 395 ++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 258 insertions(+), 137 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index a9bf2c3..e8f367d 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,56 +148,7 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>644</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>.\include\main\main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>667</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>.\include\main\main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
- </Bp>
- <Bp>
- <Number>2</Number>
- <Type>0</Type>
- <LineNumber>669</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>.\include\main\main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -319,32 +270,142 @@
<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>rec_ancdistlist[0],0x0A</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>rec_ancdistlist[1]</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>tagofflinetime[0]</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>tagofflinetime[1]</ItemText>
+ <ItemText>temp_count3,0x0A</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tempid</ItemText>
+ </Ww>
+ <Ww>
+ <count>6</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tempid_test,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>dev_id</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>group_id</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>send_buffer</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>ceju_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>dev_id</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
@@ -361,7 +422,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -478,7 +539,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -741,18 +802,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>
@@ -760,7 +809,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -772,7 +821,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -784,7 +833,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -796,7 +845,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -816,7 +865,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -828,7 +877,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -840,7 +889,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -852,13 +901,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>
@@ -881,18 +942,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>
@@ -900,7 +949,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -912,7 +961,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -924,7 +973,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -936,7 +985,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -948,7 +997,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -960,7 +1009,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -972,7 +1021,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -984,7 +1033,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -996,7 +1045,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1008,7 +1057,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1020,7 +1069,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1032,7 +1081,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1044,7 +1093,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1054,17 +1103,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>
@@ -1076,7 +1197,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1088,7 +1209,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1100,7 +1221,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1112,7 +1233,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1124,7 +1245,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1136,7 +1257,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1148,7 +1269,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1160,7 +1281,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1172,7 +1293,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1186,13 +1307,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>
@@ -1204,7 +1325,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1216,7 +1337,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1238,13 +1359,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>
@@ -1256,7 +1377,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1270,13 +1391,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>
@@ -1288,7 +1409,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1308,7 +1429,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1320,7 +1441,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1332,7 +1453,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1344,7 +1465,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1356,7 +1477,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1368,7 +1489,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1380,7 +1501,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1392,7 +1513,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1404,7 +1525,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>78</FileNumber>
+ <FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1416,7 +1537,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>79</FileNumber>
+ <FileNumber>84</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1428,7 +1549,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>80</FileNumber>
+ <FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1440,7 +1561,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>81</FileNumber>
+ <FileNumber>86</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1460,7 +1581,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