From 6e2aa19146fd20603a9e811fddd0e0dd76871efb Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 25 八月 2025 16:07:29 +0800
Subject: [PATCH] 1.7，加入正确电池电量功能
---
keil/uwb_simple_example.uvoptx | 428 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 371 insertions(+), 57 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 6c89eff..271588b 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -119,13 +119,18 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>CMSIS_AGDI</Key>
+ <Name>-X"" -O206 -S0 -C0 -P00000000 -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD2020000 -FC1000 -FN1 -FF0MK800X_512K.FLM -FS04000000 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O78 -S5 -ZTIFSpeedSel1000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name>
+ <Name>-U20090928 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,47 +158,212 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>tagdist_list,0x10</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>alarm_type</ItemText>
+ <ItemText>tagid_list,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_power_state</ItemText>
+ <ItemText>tag_state</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>current_count,0x0A</ItemText>
+ <ItemText>receive_flag</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>start_receive_count,0x0A</ItemText>
+ <ItemText>poll_tx_num</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>delay_time,0x0A</ItemText>
+ <ItemText>tempflag</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>uwb_timer_reload_value,0x0A</ItemText>
+ <ItemText>ggggg,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nomove_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mainbase_lost_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>12</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbaseid_list</ItemText>
+ </Ww>
+ <Ww>
+ <count>13</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>exsistbase_list</ItemText>
+ </Ww>
+ <Ww>
+ <count>14</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist</ItemText>
+ </Ww>
+ <Ww>
+ <count>15</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buf</ItemText>
+ </Ww>
+ <Ww>
+ <count>16</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tx_near_msg</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count11,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count22,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count33,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count44,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count55</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temp_tag_count2,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>fVoltage_mv,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>adc_caiji,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>bat_percent,0x0A</ItemText>
</Ww>
</WatchWindow1>
+ <WatchWindow2>
+ <Ww>
+ <count>0</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>rec_ancdistlist[0],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>rec_ancdistlist[1]</ItemText>
+ </Ww>
+ <Ww>
+ <count>2</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>anchordata_id[0]</ItemText>
+ </Ww>
+ <Ww>
+ <count>3</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>anchordata_id[1]</ItemText>
+ </Ww>
+ <Ww>
+ <count>4</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tagofflinetime[0]</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tagofflinetime[1]</ItemText>
+ </Ww>
+ <Ww>
+ <count>6</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>distance,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tag_id_recv</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>anchordata_dist[0],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>anchordata_dist[1],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>ramsource,0x0A</ItemText>
+ </Ww>
+ </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>8</SubType>
- <ItemText>applyid</ItemText>
+ <SubType>2</SubType>
+ <ItemText>0x40136c0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
+ <MemoryWindow2>
+ <Mm>
+ <WinNumber>2</WinNumber>
+ <SubType>8</SubType>
+ <ItemText>tab_1024</ItemText>
+ <AccSizeX>0</AccSizeX>
+ </Mm>
+ </MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@@ -285,7 +455,7 @@
<Group>
<GroupName>Device</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -388,8 +558,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\drivers\mk_clock.c</PathWithFileName>
- <FilenameWithoutPath>mk_clock.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\drivers\mk_dma.c</PathWithFileName>
+ <FilenameWithoutPath>mk_dma.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -400,8 +570,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\drivers\mk_dma.c</PathWithFileName>
- <FilenameWithoutPath>mk_dma.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\drivers\mk_clock.c</PathWithFileName>
+ <FilenameWithoutPath>mk_clock.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -597,6 +767,66 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>29</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\PCA9555.c</PathWithFileName>
+ <FilenameWithoutPath>PCA9555.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>30</FileNumber>
+ <FileType>5</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\PCA9555.h</PathWithFileName>
+ <FilenameWithoutPath>PCA9555.h</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>31</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\WS2812.c</PathWithFileName>
+ <FilenameWithoutPath>WS2812.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>32</FileNumber>
+ <FileType>5</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\WS2812.h</PathWithFileName>
+ <FilenameWithoutPath>WS2812.h</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>33</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\mk_pwm.c</PathWithFileName>
+ <FilenameWithoutPath>mk_pwm.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -607,7 +837,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -619,7 +849,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -631,7 +861,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -643,7 +873,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -655,19 +885,19 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>38</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>
+ <PathWithFileName>.\dw_tag.c</PathWithFileName>
+ <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -679,7 +909,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -691,7 +921,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -703,7 +933,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -715,7 +945,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -727,7 +957,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -739,7 +969,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -751,13 +981,97 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\uwb_app.c</PathWithFileName>
<FilenameWithoutPath>uwb_app.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>47</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\uwb_tag.c</PathWithFileName>
+ <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>48</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>49</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>50</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>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>51</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\SC7A22H_driver.c</PathWithFileName>
+ <FilenameWithoutPath>SC7A22H_driver.c</FilenameWithoutPath>
+ <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\drivers\SC7A22H_example.c</PathWithFileName>
+ <FilenameWithoutPath>SC7A22H_example.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\SC7A22H_port.c</PathWithFileName>
+ <FilenameWithoutPath>SC7A22H_port.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -771,7 +1085,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -783,7 +1097,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -795,7 +1109,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -807,7 +1121,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -819,7 +1133,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -831,7 +1145,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -843,7 +1157,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -855,7 +1169,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -867,7 +1181,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -879,7 +1193,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -899,7 +1213,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -911,7 +1225,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -923,7 +1237,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -945,13 +1259,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>55</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -963,7 +1277,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -977,13 +1291,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>57</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1003,7 +1317,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1015,7 +1329,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1027,7 +1341,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1039,7 +1353,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1051,7 +1365,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1063,7 +1377,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1075,7 +1389,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1095,7 +1409,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3