From 932b0ff31177b22810351183c9c47e82589167cd Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期二, 17 十二月 2024 14:52:23 +0800 Subject: [PATCH] 开关机逻辑完成,可实现无jlink下开关机 --- keil/uwb_simple_example.uvoptx | 481 ++++++++++++++++++---------------------------------- 1 files changed, 168 insertions(+), 313 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index f5a9852..a758782 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -152,469 +152,276 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>rx_rpt,0x10</ItemText> + <ItemText>valid_sts</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>rx_rpt,0x10</ItemText> + <ItemText>rx_buf</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>rx_buf</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>ancrec_nearbasepos</ItemText> + <ItemText>temp_count3,0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\temp_count1,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancidlist</ItemText> + <ItemText>anchordata_id</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>anchordata_dist,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <ItemText>get_in_num,0x0A</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>mUsart2ReceivePack[index]</ItemText> + <ItemText>anchor_id_in</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>mUsart2ReceivePack</ItemText> + <ItemText>tagofflinetime[0],0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>gps_power_state</ItemText> + <ItemText>tagofflinetime[1],0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>rec_ancdistlist,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>poll_tx_en_start_u32,0x0A</ItemText> + <ItemText>distance,0x0A</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_ts_i64,0x0A</ItemText> + <ItemText>get_out_num,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>tof_f,0x0A</ItemText> + <ItemText>anchor_id_out</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>distance_tag,0x0A</ItemText> + <ItemText>anchor_id_in</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>tround</ItemText> + <ItemText>get_in_num</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>treply</ItemText> + <ItemText>change_count,0x0A</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>tround_temp,0x10</ItemText> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>treply_temp,0x10</ItemText> + <ItemText>temp_internal,0x0A</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>pca9555writedata_output[0]</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_timestamp</ItemText> + <ItemText>pca9555writedata_config,0x10</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>poll_tx_timestamp</ItemText> + <ItemText>pca9555writedata_output[1],0x10</ItemText> </Ww> <Ww> <count>26</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_ts_i64</ItemText> + <ItemText>temp_ack2</ItemText> </Ww> <Ww> <count>27</count> <WinNumber>1</WinNumber> - <ItemText>tt,0x0A</ItemText> + <ItemText>statistic_num</ItemText> </Ww> <Ww> <count>28</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map,0x0A</ItemText> + <ItemText>pca9555writedata_input,0x0A</ItemText> </Ww> <Ww> <count>29</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>wltag_uwbtimer</ItemText> </Ww> <Ww> <count>30</count> <WinNumber>1</WinNumber> - <ItemText>distance,0x0A</ItemText> + <ItemText>wltag_statetimer</ItemText> </Ww> <Ww> <count>31</count> <WinNumber>1</WinNumber> - <ItemText>dist_after_offset</ItemText> + <ItemText>wltag_state</ItemText> </Ww> <Ww> <count>32</count> <WinNumber>1</WinNumber> - <ItemText>tempflag</ItemText> + <ItemText>uwb_losttimer,0x0A</ItemText> </Ww> <Ww> <count>33</count> <WinNumber>1</WinNumber> - <ItemText>flag_temp2</ItemText> + <ItemText>flag_temp1</ItemText> </Ww> <Ww> <count>34</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>g_com_map[10],0x0A</ItemText> </Ww> <Ww> <count>35</count> <WinNumber>1</WinNumber> - <ItemText>range_timeout_us,0x0A</ItemText> + <ItemText>g_com_map[11],0x0A</ItemText> </Ww> <Ww> <count>36</count> <WinNumber>1</WinNumber> - <ItemText>gps_need_data_flag</ItemText> + <ItemText>uwb_rx_flag</ItemText> </Ww> <Ww> <count>37</count> <WinNumber>1</WinNumber> - <ItemText>delaysleep_count</ItemText> + <ItemText>m_EUART_DMA_RXBuf</ItemText> </Ww> <Ww> <count>38</count> <WinNumber>1</WinNumber> - <ItemText>gps_wait_count,0x0A</ItemText> + <ItemText>fVoltage_mv,0x0A</ItemText> </Ww> <Ww> <count>39</count> <WinNumber>1</WinNumber> - <ItemText>index1</ItemText> + <ItemText>state5v</ItemText> </Ww> <Ww> <count>40</count> <WinNumber>1</WinNumber> - <ItemText>index2</ItemText> + <ItemText>state5V_prase_flag</ItemText> </Ww> <Ww> <count>41</count> <WinNumber>1</WinNumber> - <ItemText>index3</ItemText> + <ItemText>keystarttime,0x0A</ItemText> </Ww> <Ww> <count>42</count> <WinNumber>1</WinNumber> - <ItemText>air780_power_state</ItemText> + <ItemText>pca9555writedata_polarity[0],0x10</ItemText> </Ww> + </WatchWindow1> + <WatchWindow2> <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> + <count>0</count> + <WinNumber>2</WinNumber> <ItemText>rec_ancdistlist[0],0x0A</ItemText> </Ww> <Ww> - <count>55</count> - <WinNumber>1</WinNumber> - <ItemText>temp_recdist_before_offset,0x0A</ItemText> + <count>1</count> + <WinNumber>2</WinNumber> + <ItemText>rec_ancdistlist[1]</ItemText> </Ww> <Ww> - <count>56</count> - <WinNumber>1</WinNumber> - <ItemText>dist</ItemText> + <count>2</count> + <WinNumber>2</WinNumber> + <ItemText>anchordata_id[0]</ItemText> </Ww> <Ww> - <count>57</count> - <WinNumber>1</WinNumber> - <ItemText>anchordata_dist[0]</ItemText> + <count>3</count> + <WinNumber>2</WinNumber> + <ItemText>anchordata_id[1]</ItemText> </Ww> <Ww> - <count>58</count> - <WinNumber>1</WinNumber> - <ItemText>dist_temp,0x0A</ItemText> + <count>4</count> + <WinNumber>2</WinNumber> + <ItemText>tagofflinetime[0]</ItemText> </Ww> <Ww> - <count>59</count> - <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> + <count>5</count> + <WinNumber>2</WinNumber> + <ItemText>tagofflinetime[1]</ItemText> </Ww> <Ww> - <count>60</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buf[FZ_NEARBASENUM_INDEX]</ItemText> + <count>6</count> + <WinNumber>2</WinNumber> + <ItemText>distance,0x0A</ItemText> </Ww> <Ww> - <count>61</count> - <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <count>7</count> + <WinNumber>2</WinNumber> + <ItemText>tag_id_recv</ItemText> </Ww> <Ww> - <count>62</count> - <WinNumber>1</WinNumber> - <ItemText>test4</ItemText> + <count>8</count> + <WinNumber>2</WinNumber> + <ItemText>anchordata_dist[0],0x0A</ItemText> </Ww> <Ww> - <count>63</count> - <WinNumber>1</WinNumber> - <ItemText>moter_open_uwb_flag</ItemText> + <count>9</count> + <WinNumber>2</WinNumber> + <ItemText>anchordata_dist[1],0x0A</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> - </WatchWindow1> + </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> <SubType>8</SubType> - <ItemText>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\mUsart2ReceivePack</ItemText> + <ItemText>\\uwb_simple_example\include/drivers/Usart.c\m_EUART_DMA_RXBuf</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -812,8 +619,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> @@ -824,8 +631,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> @@ -1021,6 +828,54 @@ <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> </Group> <Group> @@ -1031,7 +886,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1043,7 +898,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1055,7 +910,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1067,7 +922,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1079,7 +934,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1091,7 +946,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1103,9 +958,9 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\global_param.c</PathWithFileName> @@ -1115,7 +970,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1127,7 +982,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1139,7 +994,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1151,7 +1006,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1163,7 +1018,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1175,7 +1030,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1187,7 +1042,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1199,7 +1054,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1219,7 +1074,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1231,7 +1086,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1243,7 +1098,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1255,7 +1110,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1267,7 +1122,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1279,7 +1134,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1291,7 +1146,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1303,7 +1158,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1315,7 +1170,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1327,7 +1182,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1347,7 +1202,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1359,7 +1214,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1371,7 +1226,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1399,7 +1254,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1411,7 +1266,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1431,7 +1286,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>63</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1451,7 +1306,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1463,7 +1318,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1475,7 +1330,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1487,7 +1342,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1499,7 +1354,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1511,7 +1366,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1523,7 +1378,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1543,7 +1398,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3