From 6b0fc09ae2e0b714670f17635d17bc273c854943 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期一, 30 十月 2023 16:47:20 +0800
Subject: [PATCH] 版本v2.6，删除机制
---
MDK-ARM/L051.uvoptx | 173 +++++++++++++++++++++++++--------------------------------
1 files changed, 76 insertions(+), 97 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 26dd5e4..af7090b 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>4</nTsel>
+ <nTsel>6</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -158,82 +158,99 @@
<Name>-U066CFF564948897767122910 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint/>
+ <Breakpoint>
+ <Bp>
+ <Number>0</Number>
+ <Type>0</Type>
+ <LineNumber>990</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134248572</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>C:\git\XRange_Tag - 閸擃垱婀� - 閸擃垱婀� - 閸擃垱婀癨Src\main.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L051\../Src/main.c\990</Expression>
+ </Bp>
+ </Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>pressure</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>Height</ItemText>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>fheight</ItemText>
+ <ItemText>tag_state</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
+ <ItemText>mainbase_lost_count</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
+ <ItemText>notenoughdist_count</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>test2,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
+ <ItemText>exsistbase_list</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
+ <ItemText>dist_cm</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
+ <ItemText>dist_cm</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>intheight,0x0A</ItemText>
+ <ItemText>hex_dist,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>i</ItemText>
+ <ItemText>hex_dist,0x0A</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
+ <ItemText>hex_dist,0x0A</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>singlepoll_basedist,0x0A</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>singlepoll_i</ItemText>
+ <ItemText>rx_buffer</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>intheight,0x0A</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>15</count>
@@ -243,62 +260,12 @@
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>frame_seq_nb,0x0A</ItemText>
+ <ItemText>nearbaseid_list</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>pressure</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>intheight</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>key_keeptime</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>nomove_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbaseid</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>1</WinNumber>
- <ItemText>singlepoll_basedist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>userkey_state</ItemText>
- </Ww>
- <Ww>
- <count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
+ <ItemText>gotosleep_flag</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -317,7 +284,7 @@
<Mm>
<WinNumber>1</WinNumber>
<SubType>2</SubType>
- <ItemText>0x20001A38</ItemText>
+ <ItemText>rx_buffer</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -599,6 +566,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>
@@ -609,7 +588,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -621,7 +600,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -633,7 +612,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -653,7 +632,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -665,7 +644,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -677,7 +656,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -689,7 +668,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -701,7 +680,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -713,7 +692,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -725,7 +704,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -737,7 +716,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -749,7 +728,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -761,7 +740,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -773,7 +752,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -785,7 +764,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -797,7 +776,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -809,7 +788,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -821,7 +800,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -833,7 +812,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -845,7 +824,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -857,7 +836,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -869,7 +848,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -881,7 +860,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -893,7 +872,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -905,7 +884,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -925,7 +904,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3