From 469830fa7fcdf4ee29ccbd5f7a5828609bc15d6a Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 15 四月 2025 16:20:49 +0800 Subject: [PATCH] 1.1,修改了版本号 --- MDK-ARM/L051.uvoptx | 278 +++++++++++++++++++++++-------------------------------- 1 files changed, 116 insertions(+), 162 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 0b27e07..e9be476 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -26,7 +26,7 @@ <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> - <CLKADS>32000000</CLKADS> + <CLKADS>8000000</CLKADS> <OPTTT> <gFlags>1</gFlags> <BeepAtEnd>1</BeepAtEnd> @@ -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> @@ -163,97 +163,97 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>recbase_num</ItemText> + <ItemText>mainbase_id</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>nearbase_distlist,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>tag_state</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>motor_ontime</ItemText> + <ItemText>mainbase_lost_count</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> + <ItemText>notenoughdist_count</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>tag_state</ItemText> + <ItemText>test2,0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>module_power,0x0A</ItemText> + <ItemText>exsistbase_list</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>dist_cm</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>slotpos_intoatl,0x0A</ItemText> + <ItemText>dist_cm</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>key_keeptime</ItemText> + <ItemText>hex_dist,0x0A</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>hex_dist,0x0A</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>hex_dist,0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>mainbase_id</ItemText> + <ItemText>uwb_onflag</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>minid</ItemText> + <ItemText>userkey_num</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>temp_dist,0x0A</ItemText> + <ItemText>send_buffer</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_switchdistlist,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>tag_state</ItemText> + <ItemText>g_start_send_flag</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>rec_nearbaseid</ItemText> + <ItemText>id</ItemText> </Ww> <Ww> <count>19</count> @@ -263,87 +263,17 @@ <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>offsettimeus,0x0A</ItemText> + <ItemText>changemainbase_count</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>lptime,0x0A</ItemText> + <ItemText>outrange_times</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>lpcount,0x0A</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>1</WinNumber> - <ItemText>ancsync_time-current_count</ItemText> - </Ww> - <Ww> - <count>24</count> - <WinNumber>1</WinNumber> - <ItemText>current_count,0x0A</ItemText> - </Ww> - <Ww> - <count>25</count> - <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>slotpos_intoatl,0x0A</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>bigslot_num,0x0A</ItemText> - </Ww> - <Ww> - <count>28</count> - <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list[MAX_NEARBASE_NUM]</ItemText> - </Ww> - <Ww> - <count>29</count> - <WinNumber>1</WinNumber> - <ItemText>motor_keeptime</ItemText> - </Ww> - <Ww> - <count>30</count> - <WinNumber>1</WinNumber> - <ItemText>motor_state</ItemText> - </Ww> - <Ww> - <count>31</count> - <WinNumber>1</WinNumber> - <ItemText>current_time,0x0A</ItemText> - </Ww> - <Ww> - <count>32</count> - <WinNumber>1</WinNumber> - <ItemText>hardware_version</ItemText> - </Ww> - <Ww> - <count>33</count> - <WinNumber>1</WinNumber> <ItemText>tag_state</ItemText> - </Ww> - <Ww> - <count>34</count> - <WinNumber>1</WinNumber> - <ItemText>motor_keeptime</ItemText> - </Ww> - <Ww> - <count>35</count> - <WinNumber>1</WinNumber> - <ItemText>stationary_flag</ItemText> - </Ww> - <Ww> - <count>36</count> - <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -361,8 +291,8 @@ <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> - <SubType>0</SubType> - <ItemText>&hardware_version</ItemText> + <SubType>2</SubType> + <ItemText>0x20001A38</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -644,6 +574,18 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>6</GroupNumber> + <FileNumber>16</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\dw_ds_anc.c</PathWithFileName> + <FilenameWithoutPath>dw_ds_anc.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -654,7 +596,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -666,7 +608,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -678,7 +620,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -691,14 +633,34 @@ </Group> <Group> - <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> + <GroupName>Drivers/CMSIS</GroupName> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>20</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> + <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>9</GroupNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -709,8 +671,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>20</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -721,8 +683,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>21</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -733,8 +695,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>22</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -745,8 +707,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>23</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -757,8 +719,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>24</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -769,8 +731,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>25</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -781,8 +743,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>26</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -793,8 +755,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>27</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -805,8 +767,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>28</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -817,8 +779,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>29</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -829,8 +791,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>30</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -841,8 +803,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>31</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -853,8 +815,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>32</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -865,8 +827,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>33</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -877,8 +839,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>34</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -889,8 +851,20 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>35</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>37</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_iwdg.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_iwdg.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>9</GroupNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -901,8 +875,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>36</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -913,8 +887,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>37</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -925,8 +899,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>38</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -937,8 +911,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>39</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -949,34 +923,14 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>8</GroupNumber> - <FileNumber>40</FileNumber> + <GroupNumber>9</GroupNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart_ex.c</PathWithFileName> <FilenameWithoutPath>stm32l0xx_hal_uart_ex.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - </Group> - - <Group> - <GroupName>Drivers/CMSIS</GroupName> - <tvExp>1</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>0</RteFlg> - <File> - <GroupNumber>9</GroupNumber> - <FileNumber>41</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> - <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> -- Gitblit v1.9.3