From 44812eee65f5e9eb47c2b01b6cf86c101083eb61 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期五, 25 七月 2025 17:41:24 +0800 Subject: [PATCH] 修改激活对应com表标志位位置,避免与其他元素耦合 --- keil/uwb_simple_example.uvoptx | 336 ++++++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 267 insertions(+), 69 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index e37a073..90e2967 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -119,6 +119,11 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>DLGUARM</Key> + <Name></Name> + </SetRegEntry> + <SetRegEntry> + <Number>0</Number> <Key>JL2CM3</Key> <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> @@ -280,6 +285,151 @@ <WinNumber>1</WinNumber> <ItemText>anchor_id_in</ItemText> </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>distance,0x0A</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>angle_temp</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>send_buffer</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>m_EUART_DMA_RXBuf</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>pd_offset</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>sts_rssi1</ItemText> + </Ww> + <Ww> + <count>34</count> + <WinNumber>1</WinNumber> + <ItemText>sts_rssi[0]</ItemText> + </Ww> + <Ww> + <count>35</count> + <WinNumber>1</WinNumber> + <ItemText>srs_rssi[1]</ItemText> + </Ww> + <Ww> + <count>36</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\poll_rx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>37</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>38</count> + <WinNumber>1</WinNumber> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> + </Ww> + <Ww> + <count>39</count> + <WinNumber>1</WinNumber> + <ItemText>rssi_result</ItemText> + </Ww> + <Ww> + <count>40</count> + <WinNumber>1</WinNumber> + <ItemText>sts_first_rssi_result</ItemText> + </Ww> + <Ww> + <count>41</count> + <WinNumber>1</WinNumber> + <ItemText>distance,0x0A</ItemText> + </Ww> + <Ww> + <count>42</count> + <WinNumber>1</WinNumber> + <ItemText>tx_num,0x0A</ItemText> + </Ww> + <Ww> + <count>43</count> + <WinNumber>1</WinNumber> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>44</count> + <WinNumber>1</WinNumber> + <ItemText>poll_rx_num,0x0A</ItemText> + </Ww> + <Ww> + <count>45</count> + <WinNumber>1</WinNumber> + <ItemText>m_EUART_DMA_RXBuf</ItemText> + </Ww> + <Ww> + <count>46</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map</ItemText> + </Ww> + <Ww> + <count>47</count> + <WinNumber>1</WinNumber> + <ItemText>checksum_temp1,0x0A</ItemText> + </Ww> + <Ww> + <count>48</count> + <WinNumber>1</WinNumber> + <ItemText>checksum_temp,0x10</ItemText> + </Ww> + <Ww> + <count>49</count> + <WinNumber>1</WinNumber> + <ItemText>usart_receive_state</ItemText> + </Ww> + <Ww> + <count>50</count> + <WinNumber>1</WinNumber> + <ItemText>group_id,0x0A</ItemText> + </Ww> + <Ww> + <count>51</count> + <WinNumber>1</WinNumber> + <ItemText>bind_count,0x0A</ItemText> + </Ww> + <Ww> + <count>52</count> + <WinNumber>1</WinNumber> + <ItemText>distance,0x0A</ItemText> + </Ww> + <Ww> + <count>53</count> + <WinNumber>1</WinNumber> + <ItemText>temp_group_id</ItemText> + </Ww> + <Ww> + <count>54</count> + <WinNumber>1</WinNumber> + <ItemText>board_param,0x0A</ItemText> + </Ww> + <Ww> + <count>55</count> + <WinNumber>1</WinNumber> + <ItemText>distance</ItemText> + </Ww> </WatchWindow1> <WatchWindow2> <Ww> @@ -336,8 +486,8 @@ <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> - <SubType>8</SubType> - <ItemText>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\mUsart2ReceivePack</ItemText> + <SubType>6</SubType> + <ItemText>sts_rssi1</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -428,6 +578,18 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>1</GroupNumber> + <FileNumber>4</FileNumber> + <FileType>4</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\algo\lib\lib_kf.lib</PathWithFileName> + <FilenameWithoutPath>lib_kf.lib</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -438,7 +600,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>2</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>5</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -450,7 +612,7 @@ </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -470,7 +632,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>6</FileNumber> + <FileNumber>7</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -482,7 +644,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>7</FileNumber> + <FileNumber>8</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -494,7 +656,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>8</FileNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -506,7 +668,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -518,7 +680,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -530,7 +692,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>11</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -542,7 +704,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -554,7 +716,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -566,7 +728,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -578,7 +740,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -590,7 +752,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -602,7 +764,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -614,7 +776,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -626,7 +788,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -638,7 +800,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -650,7 +812,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -662,7 +824,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -674,7 +836,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -686,7 +848,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -698,7 +860,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -710,7 +872,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -722,7 +884,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>28</FileNumber> <FileType>5</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -734,13 +896,49 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>29</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> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>30</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\CommMap.c</PathWithFileName> + <FilenameWithoutPath>CommMap.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>31</FileNumber> + <FileType>5</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\CommMap.h</PathWithFileName> + <FilenameWithoutPath>CommMap.h</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>32</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\algo\src\kf\MK8000_kf_top.c</PathWithFileName> + <FilenameWithoutPath>MK8000_kf_top.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -754,7 +952,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -766,7 +964,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -778,7 +976,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -790,7 +988,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -802,7 +1000,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -814,9 +1012,9 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> @@ -826,9 +1024,9 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\global_param.c</PathWithFileName> @@ -838,7 +1036,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -850,7 +1048,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -862,7 +1060,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -874,7 +1072,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -886,7 +1084,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -898,7 +1096,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -910,9 +1108,9 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\uwb_app.c</PathWithFileName> @@ -922,7 +1120,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -942,7 +1140,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -954,7 +1152,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -966,7 +1164,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -978,7 +1176,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -990,7 +1188,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1002,7 +1200,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1014,7 +1212,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1026,7 +1224,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1038,7 +1236,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1050,7 +1248,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1070,7 +1268,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1082,7 +1280,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1094,7 +1292,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1122,7 +1320,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1134,7 +1332,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1154,7 +1352,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>63</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1174,7 +1372,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1186,7 +1384,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1198,7 +1396,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1210,7 +1408,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1222,7 +1420,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1234,7 +1432,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1246,7 +1444,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1266,7 +1464,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