From a1750f172c28e19df54b6ca29ab5eb012a2373fe Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 17 十月 2024 15:51:56 +0800
Subject: [PATCH] 加入低功耗，成功实现4G休眠唤醒，有小概率偶发性手环解绑后马达震动问题，打印log偶发性末尾输出有方块未解决
---
keil/uwb_simple_example.uvoptx | 390 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 329 insertions(+), 61 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 4ee6eb7..d0a9cf8 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -120,7 +120,6 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,62 +152,62 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>nomove_count</ItemText>
+ <ItemText>rx_rpt,0x10</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_timeout_flag</ItemText>
+ <ItemText>rx_rpt,0x10</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_wait_count,0x0A</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>moter_open_uwb_flag</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>motor_open_air_flag</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>motor_power_state</ItemText>
+ <ItemText>ancrec_nearbasepos</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_need_data_flag</ItemText>
+ <ItemText>rec_ancdistlist</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>UWB_Work_State</ItemText>
+ <ItemText>rec_ancidlist</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>anchordata_num</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsart2ReceivePack_now,0x0A</ItemText>
+ <ItemText>mUsart2ReceivePack[index]</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_uwb_flag</ItemText>
+ <ItemText>mUsart2ReceivePack</ItemText>
</Ww>
<Ww>
<count>12</count>
@@ -218,69 +217,314 @@
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsart2ReceivePack</ItemText>
+ <ItemText>rec_ancdistlist</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>uwb_state</ItemText>
+ <ItemText>poll_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>receive_flag</ItemText>
+ <ItemText>resp_rx_ts_i64,0x0A</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>recev_error_num,0x0A</ItemText>
+ <ItemText>tof_f,0x0A</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt</ItemText>
+ <ItemText>distance_tag,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>tround</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>UWB_work_state</ItemText>
+ <ItemText>treply</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
- <ItemText>recev_error_num,0x0A</ItemText>
+ <ItemText>tround_temp,0x10</ItemText>
</Ww>
<Ww>
<count>21</count>
<WinNumber>1</WinNumber>
- <ItemText>poll_rx_ts_i64</ItemText>
+ <ItemText>treply_temp,0x10</ItemText>
</Ww>
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
- <ItemText>resp_tx_ts_i64</ItemText>
+ <ItemText>poll_rx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
- <ItemText>motor_power_state</ItemText>
+ <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
+ <ItemText>resp_rx_timestamp</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>poll_tx_timestamp</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_rx_ts_i64</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tt,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>28</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancdistlist[0],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>distance,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>31</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>dist_after_offset</ItemText>
+ </Ww>
+ <Ww>
+ <count>32</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tempflag</ItemText>
+ </Ww>
+ <Ww>
+ <count>33</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_temp2</ItemText>
+ </Ww>
+ <Ww>
+ <count>34</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancdistlist[0],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>35</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>range_timeout_us,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>36</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>37</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>delaysleep_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>38</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>39</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>index1</ItemText>
+ </Ww>
+ <Ww>
+ <count>40</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>index2</ItemText>
+ </Ww>
+ <Ww>
+ <count>41</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>index3</ItemText>
+ </Ww>
+ <Ww>
+ <count>42</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>air780_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>43</count>
+ <WinNumber>1</WinNumber>
<ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>44</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_4guart_needinit</ItemText>
+ </Ww>
+ <Ww>
+ <count>45</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_uwb_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>46</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_4g_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>47</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>48</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tt2,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>49</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>50</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temp_count1,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>51</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buf,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>52</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>poll_rx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>53</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>54</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancdistlist[0],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>55</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temp_recdist_before_offset,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>56</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>dist</ItemText>
+ </Ww>
+ <Ww>
+ <count>57</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>anchordata_dist[0]</ItemText>
+ </Ww>
+ <Ww>
+ <count>58</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>dist_temp,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>59</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>60</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buf[FZ_NEARBASENUM_INDEX]</ItemText>
+ </Ww>
+ <Ww>
+ <count>61</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>62</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>test4</ItemText>
+ </Ww>
+ <Ww>
+ <count>63</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>moter_open_uwb_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>64</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_open_air_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>65</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>66</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>67</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_uwb_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>68</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_4g_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>69</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>70</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>71</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>72</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_timeout_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>73</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_temp2</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>8</SubType>
- <ItemText>_u8Data</ItemText>
+ <SubType>0</SubType>
+ <ItemText>rx_buf</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -290,7 +534,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -308,7 +552,7 @@
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
- <StkLoc>0</StkLoc>
+ <StkLoc>1</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
@@ -407,7 +651,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -750,6 +994,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>.\dw_tag.c</PathWithFileName>
+ <FilenameWithoutPath>dw_tag.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>.\dw_app_anchor.c</PathWithFileName>
<FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -757,7 +1013,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -769,7 +1025,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -781,7 +1037,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -793,7 +1049,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -805,7 +1061,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -817,7 +1073,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -829,7 +1085,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -841,13 +1097,25 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>42</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>43</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>
@@ -861,7 +1129,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -873,7 +1141,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -885,7 +1153,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -897,7 +1165,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -909,7 +1177,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -921,7 +1189,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -933,7 +1201,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -945,7 +1213,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -957,7 +1225,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -969,7 +1237,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -989,7 +1257,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1001,7 +1269,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1013,7 +1281,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1041,7 +1309,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1053,7 +1321,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1073,7 +1341,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1093,7 +1361,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1105,7 +1373,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1117,7 +1385,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1129,7 +1397,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1141,7 +1409,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1153,7 +1421,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1165,7 +1433,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1185,7 +1453,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3