From d3a77da7be3808ce65448dbfa9d43d13ba9e0ecd Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期二, 17 八月 2021 14:58:21 +0800
Subject: [PATCH] 增加基站状态输出，增加map表对比
---
源码/核心板/MDK-ARM/Project.uvoptx | 154 +++++++++++++++++++++++++++++++++------------------
1 files changed, 100 insertions(+), 54 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
index 4aa7cb2..03396ec 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
@@ -119,13 +119,18 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>ULP2CM3</Key>
+ <Name>-UV0010M9E -O2254 -S8 -C0 -P00000000 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP11 -TDX0 -TDD0 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
<Key>CMSIS_AGDI</Key>
<Name>-X"ATK-HSWL-CMSIS-DAP" -UATK 20190528 -O2254 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -150,7 +155,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
- <Name>(1010=-1,-1,-1,-1,0)(1007=108,145,295,420,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=18,3,664,676,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=847,206,1268,611,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,26,744,720,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name>
+ <Name>(1010=-1,-1,-1,-1,0)(1007=108,145,295,420,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=18,3,664,676,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=1005,0,1426,405,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,26,744,720,0)(133=-1,-1,-1,-1,0)(160=475,231,923,645,0)(161=167,212,615,626,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,9 +167,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>1197</LineNumber>
+ <LineNumber>473</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134242050</Address>
+ <Address>134249480</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -173,84 +178,84 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\\../Src/application/dw_app.c\1197</Expression>
+ <Expression>\\UWB_Projects\../Src/application/dw_app.c\473</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>pwtag,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time,0x0A</ItemText>
+ <ItemText>m_EUART_DMA_RXPtr</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist</ItemText>
+ <ItemText>DMACnt</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>true_nearbase_idlist</ItemText>
+ <ItemText>frame_len,0x0A</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>true_exsistbase_list</ItemText>
+ <ItemText>rec_tagheight,0x0A</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
+ <ItemText>rx_buffer</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>dw1000local</ItemText>
+ <ItemText>frame_len,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>pwtag</ItemText>
+ <ItemText>frame_len</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
+ <ItemText>recnearbaselist_dist,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buffer[9]</ItemText>
+ <ItemText>intheight,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map[NEARBASE_ID1]</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>time_monitor[3]-time_monitor[0],0x0A</ItemText>
+ <ItemText>pressure</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>dist_cm</ItemText>
+ <ItemText>temperature</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>time_monitor,0x0A</ItemText>
+ <ItemText>tagdist_list,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>usart_send,0x0A</ItemText>
+ <ItemText>anc_id_recv</ItemText>
</Ww>
<Ww>
<count>15</count>
@@ -259,6 +264,11 @@
</Ww>
<Ww>
<count>16</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>status_reg</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
<WinNumber>1</WinNumber>
<ItemText>regtag_map</ItemText>
</Ww>
@@ -285,7 +295,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -485,7 +495,7 @@
<Group>
<GroupName>ExternalDevices</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -525,6 +535,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>14</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>5</GroupNumber>
+ <FileNumber>15</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>5</GroupNumber>
+ <FileNumber>16</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\ExternalDevices\lis3dh_driver.c</PathWithFileName>
+ <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -535,7 +581,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -547,7 +593,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -559,7 +605,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -571,7 +617,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -583,7 +629,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -595,7 +641,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -615,7 +661,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -627,7 +673,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -639,7 +685,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -651,7 +697,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -663,7 +709,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -675,7 +721,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -687,7 +733,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -699,7 +745,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -711,7 +757,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -723,7 +769,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -735,7 +781,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -747,7 +793,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -759,7 +805,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -771,7 +817,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -783,7 +829,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -795,7 +841,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -807,7 +853,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -819,7 +865,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -831,7 +877,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -843,7 +889,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -855,7 +901,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -867,7 +913,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -879,7 +925,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -899,7 +945,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -911,7 +957,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -923,7 +969,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3