From 4f9099aba6a36a6bf803e44f3ab3c5e979ee2446 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 18 十一月 2021 11:45:59 +0800 Subject: [PATCH] V2.44 多功能 --- MDK-ARM/L051.uvoptx | 343 +++++++++++++++++++++++++++++++------------------------- 1 files changed, 191 insertions(+), 152 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 3647373..a633ea7 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -8,7 +8,7 @@ <Extensions> <cExt>*.c</cExt> <aExt>*.s*; *.src; *.a*</aExt> - <oExt>*.obj</oExt> + <oExt>*.obj; *.o</oExt> <lExt>*.lib</lExt> <tExt>*.txt; *.h; *.inc</tExt> <pExt>*.plm</pExt> @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>6</nTsel> + <nTsel>4</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -117,6 +117,11 @@ <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> + <SetRegEntry> + <Number>0</Number> + <Key>CMSIS_AGDI</Key> + <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name> + </SetRegEntry> <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> @@ -157,25 +162,9 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>2798</LineNumber> + <LineNumber>1036</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134265688</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>1</BreakIfRCount> - <Filename>..\Src\decadriver\deca_device.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/decadriver/deca_device.c\2798</Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>445</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134242398</Address> + <Address>134254846</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> @@ -184,154 +173,171 @@ <BreakIfRCount>1</BreakIfRCount> <Filename>..\Src\application\dw_app.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/dw_app.c\445</Expression> + <Expression>\\L051\../Src/application/dw_app.c\1036</Expression> + </Bp> + <Bp> + <Number>1</Number> + <Type>0</Type> + <LineNumber>1031</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>134254832</Address> + <ByteObject>0</ByteObject> + <HtxType>0</HtxType> + <ManyObjects>0</ManyObjects> + <SizeOfObject>0</SizeOfObject> + <BreakByAccess>0</BreakByAccess> + <BreakIfRCount>1</BreakIfRCount> + <Filename>..\Src\application\dw_app.c</Filename> + <ExecCommand></ExecCommand> + <Expression>\\L051\../Src/application/dw_app.c\1031</Expression> + </Bp> + <Bp> + <Number>2</Number> + <Type>0</Type> + <LineNumber>101</LineNumber> + <EnabledFlag>1</EnabledFlag> + <Address>134252210</Address> + <ByteObject>0</ByteObject> + <HtxType>0</HtxType> + <ManyObjects>0</ManyObjects> + <SizeOfObject>0</SizeOfObject> + <BreakByAccess>0</BreakByAccess> + <BreakIfRCount>1</BreakIfRCount> + <Filename>..\Drivers\ExternlDrivers\lis3dh_driver.c</Filename> + <ExecCommand></ExecCommand> + <Expression>\\L051\../Drivers/ExternlDrivers/lis3dh_driver.c\101</Expression> </Bp> </Breakpoint> <WatchWindow1> <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>key_keeptime</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>nomove_count,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>g_com_map,0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>lptime,0x0A</ItemText> + <ItemText>nearbase_distlist,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> + <ItemText>rec_nearbaseid</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>count_offset,0x0A</ItemText> + <ItemText>tx_near_msg</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>offset,0x0A</ItemText> + <ItemText>singlepoll_basedist,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>ancsync_time,0x0A</ItemText> + <ItemText>userkey_state</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>offsettimeus,0x0A</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>dev_id</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>current_slotnum,0x0A</ItemText> + <ItemText>tx_near_msg</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>end_count,0x0A</ItemText> + <ItemText>lpcount,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>lastsync_timer,0x0A</ItemText> + <ItemText>ancsync_time,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist</ItemText> + <ItemText>pd_i</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>bat_percent,0x0A</ItemText> + <ItemText>delaytime,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>bat_volt</ItemText> + <ItemText>temptime,0x0A</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> + <ItemText>error_time,0x0A</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>poll_offsettime,0x0A</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>motor_state</ItemText> + <ItemText>clockoffset,0x0A</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>error_time,0x0A</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>slottime,0x0A</ItemText> + <ItemText>motor_state</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> + <ItemText>motor_keeptime</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>target_offsettime,0x0A</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>current_slotnum,0x0A</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>hadc</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>tx_near_msg</ItemText> - </Ww> - <Ww> - <count>28</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>status_reg</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -340,12 +346,17 @@ <WinNumber>2</WinNumber> <ItemText>current_slotnum</ItemText> </Ww> + <Ww> + <count>1</count> + <WinNumber>2</WinNumber> + <ItemText>current_slotnum</ItemText> + </Ww> </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> - <SubType>0</SubType> - <ItemText>headerBuffer</ItemText> + <SubType>2</SubType> + <ItemText>0x20001360</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -355,7 +366,7 @@ <DebugFlag> <trace>0</trace> <periodic>1</periodic> - <aLwin>0</aLwin> + <aLwin>1</aLwin> <aCover>0</aCover> <aSer1>0</aSer1> <aSer2>0</aSer2> @@ -439,6 +450,42 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>3</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\ExternalDevices\dps310.c</PathWithFileName> + <FilenameWithoutPath>dps310.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>4</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\ExternalDevices\dps368_test.c</PathWithFileName> + <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>2</GroupNumber> + <FileNumber>5</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\decadriver\dw_driver.c</PathWithFileName> + <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -449,7 +496,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>3</FileNumber> + <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -461,7 +508,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -473,7 +520,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -486,34 +533,14 @@ </Group> <Group> - <GroupName>ExternalDevices</GroupName> - <tvExp>1</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>0</RteFlg> - <File> - <GroupNumber>4</GroupNumber> - <FileNumber>6</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>..\Src\ExternalDevices\dw_driver.c</PathWithFileName> - <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - </Group> - - <Group> <GroupName>OnChipDevices</GroupName> <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>5</GroupNumber> - <FileNumber>7</FileNumber> + <GroupNumber>4</GroupNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -524,8 +551,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>5</GroupNumber> - <FileNumber>8</FileNumber> + <GroupNumber>4</GroupNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -536,8 +563,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>5</GroupNumber> - <FileNumber>9</FileNumber> + <GroupNumber>4</GroupNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -548,8 +575,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>5</GroupNumber> - <FileNumber>10</FileNumber> + <GroupNumber>4</GroupNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -576,8 +603,8 @@ <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>7</GroupNumber> - <FileNumber>11</FileNumber> + <GroupNumber>6</GroupNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -588,8 +615,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>7</GroupNumber> - <FileNumber>12</FileNumber> + <GroupNumber>6</GroupNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -600,8 +627,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>7</GroupNumber> - <FileNumber>13</FileNumber> + <GroupNumber>6</GroupNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -620,8 +647,8 @@ <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>14</FileNumber> + <GroupNumber>7</GroupNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -632,8 +659,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>15</FileNumber> + <GroupNumber>7</GroupNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -644,8 +671,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>16</FileNumber> + <GroupNumber>7</GroupNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -664,8 +691,8 @@ <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>17</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -676,8 +703,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>18</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -688,8 +715,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>19</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -700,8 +727,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>20</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -712,8 +739,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>21</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -724,8 +751,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>22</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -736,8 +763,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>23</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -748,8 +775,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>24</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -760,8 +787,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>25</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -772,8 +799,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>26</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -784,8 +811,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>27</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -796,8 +823,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>28</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -808,8 +835,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>29</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -820,8 +847,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>30</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -832,8 +859,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>31</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -844,8 +871,20 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>32</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>34</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_exti.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>8</GroupNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -856,8 +895,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>33</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -868,8 +907,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>34</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -880,8 +919,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>35</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -892,8 +931,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>36</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -904,8 +943,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>37</FileNumber> + <GroupNumber>8</GroupNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -924,8 +963,8 @@ <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> - <GroupNumber>10</GroupNumber> - <FileNumber>38</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3