From b45fe21c1ae4689bb551efea21cee6e46a780380 Mon Sep 17 00:00:00 2001
From: chen <15335560115@163.com>
Date: 星期四, 31 十月 2024 17:11:41 +0800
Subject: [PATCH] 修复充电灯指示休眠状态下不亮和闪烁问题，增加充电电量过低4Ggps关闭机制，增加充电到安全阈值后恢复4G，GPS工作逻辑，增加充电灯指示，增加静止休眠唤醒逻辑
---
keil/uwb_simple_example.uvoptx | 595 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 559 insertions(+), 36 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 865df33..523b92c 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></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,24 +152,524 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>rx_rpt,0x10</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>alarm_type</ItemText>
+ <ItemText>rx_rpt,0x10</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
+ <ItemText>rx_buf</ItemText>
+ </Ww>
+ <Ww>
+ <count>3</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>4</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>ancrec_nearbasepos</ItemText>
+ </Ww>
+ <Ww>
+ <count>6</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancdistlist</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancidlist</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack[index]</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>12</count>
+ <WinNumber>1</WinNumber>
<ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>13</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_ancdistlist</ItemText>
+ </Ww>
+ <Ww>
+ <count>14</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>poll_tx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>15</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_rx_ts_i64,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>16</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tof_f,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>distance_tag,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tround</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>treply</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tround_temp,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>treply_temp,0x10</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>poll_rx_en_start_u32,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <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_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>70</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>71</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_timeout_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>72</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_temp2</ItemText>
+ </Ww>
+ <Ww>
+ <count>73</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>74</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>air780_success_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>75</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>UWB_work_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>76</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>flag_secondtask</ItemText>
+ </Ww>
+ <Ww>
+ <count>77</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map[14],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>78</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>pos_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>79</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>userkey_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>80</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>test4</ItemText>
+ </Ww>
+ <Ww>
+ <count>81</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>keystarttime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>82</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>keystarttime2,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>83</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_open_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>84</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>\\uwb_simple_example\include/src/gps.c\gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>85</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>\\uwb_simple_example\include/src/gps.c\gps_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>86</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>GPS_GGAmessage</ItemText>
+ </Ww>
+ <Ww>
+ <count>87</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>88</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nomove_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>89</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>bat_percent,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>90</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>fVoltage_mv,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>91</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>92</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>deep_sleep_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>93</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map[29],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>94</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map[27],0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>95</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>Voltage_input,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>96</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map[31]</ItemText>
+ </Ww>
+ <Ww>
+ <count>97</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>power_low_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>98</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>enbale_blink_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>99</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>data</ItemText>
+ </Ww>
+ <Ww>
+ <count>100</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>data_temp,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>101</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temp_bit</ItemText>
+ </Ww>
+ <Ww>
+ <count>102</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_success_state</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>8</SubType>
- <ItemText>applyid</ItemText>
+ <ItemText>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\mUsart2ReceivePack</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -640,6 +1139,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>
@@ -647,7 +1158,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -659,7 +1170,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -671,7 +1182,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -683,7 +1194,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -695,7 +1206,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -707,7 +1218,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -719,7 +1230,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -731,13 +1242,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>
@@ -751,7 +1274,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -763,7 +1286,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -775,7 +1298,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -787,7 +1310,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -799,7 +1322,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -811,7 +1334,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -823,7 +1346,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -835,7 +1358,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -847,7 +1370,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -859,7 +1382,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -879,7 +1402,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -891,7 +1414,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -903,7 +1426,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -931,7 +1454,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -943,7 +1466,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -963,7 +1486,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -983,7 +1506,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -995,7 +1518,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1007,7 +1530,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1019,7 +1542,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1031,7 +1554,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1043,7 +1566,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1055,7 +1578,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1075,7 +1598,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