From 16ed36e9ca17412fc2886b71fbdefd4fffe8cbe1 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 23 十二月 2019 19:07:07 +0800
Subject: [PATCH] v1.16 修改数据频率bug
---
源码/核心板/MDK-ARM/Project.uvoptx | 272 ++++++++++++-----------------------------------------
1 files changed, 64 insertions(+), 208 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 5fa95a2..5a33680 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"
@@ -143,6 +143,10 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>DLGUARM</Key>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
<Key>UL2CM3</Key>
<Name>-UV0010M9E -O2254 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
@@ -176,207 +180,46 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>182</LineNumber>
+ <LineNumber>68</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134251032</Address>
+ <Address>134253572</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\OnChipDevices\Usart.c</Filename>
+ <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\serial_at_cmd_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/OnChipDevices/Usart.c\182</Expression>
+ <Expression></Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>244</LineNumber>
+ <LineNumber>66</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134251258</Address>
+ <Address>134253564</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\OnChipDevices\Usart.c</Filename>
+ <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\serial_at_cmd_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/OnChipDevices/Usart.c\244</Expression>
- </Bp>
- <Bp>
- <Number>2</Number>
- <Type>0</Type>
- <LineNumber>615</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134242098</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\\../Src/application/dw_app.c\615</Expression>
+ <Expression></Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>dist_cm</ItemText>
+ <ItemText>m_EUART_TxFrm_FreeFrmLen,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>g_beep_on_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>2</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_beep_off_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>3</count>
- <WinNumber>1</WinNumber>
- <ItemText>dis_after_filter</ItemText>
- </Ww>
- <Ww>
- <count>4</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_beep_off_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>aa</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>Anchor_App</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_alarm_dist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_frame_data</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>m_EUART_DMA_RXBuf</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_frame_data_len</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_alarm_dev</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map[DIST_OFFSET]</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
<ItemText>hex_dist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>timer3,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>min_dist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>Modbus_HoldReg</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>t4,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>t2,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>t1,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>1</WinNumber>
- <ItemText>DMACnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>m_EUART_DMA_RXPtr,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>DMA_rxtemp2,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>28</count>
- <WinNumber>1</WinNumber>
- <ItemText>m_EUART_DMA_RXBuf[m_EUART_DMA_RXPtr]</ItemText>
- </Ww>
- <Ww>
- <count>29</count>
- <WinNumber>1</WinNumber>
- <ItemText>m_EUART_DMA_RXBuf</ItemText>
- </Ww>
- <Ww>
- <count>30</count>
- <WinNumber>1</WinNumber>
- <ItemText>hex_dist</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -561,6 +404,19 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>9</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <Focus>0</Focus>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\algorithm\TrackingDiff.c</PathWithFileName>
+ <FilenameWithoutPath>TrackingDiff.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -571,7 +427,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>9</FileNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -584,7 +440,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>10</FileNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -597,7 +453,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>11</FileNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -618,7 +474,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>12</FileNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -631,7 +487,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>13</FileNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -644,7 +500,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -665,7 +521,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -678,7 +534,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -691,7 +547,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -704,7 +560,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -717,7 +573,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -730,7 +586,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -751,7 +607,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -764,7 +620,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -777,7 +633,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -790,7 +646,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -803,7 +659,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -816,7 +672,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -829,7 +685,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -842,7 +698,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -855,7 +711,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -868,7 +724,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -881,7 +737,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -894,7 +750,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -907,7 +763,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -920,7 +776,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -933,7 +789,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -946,7 +802,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -959,7 +815,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -972,7 +828,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -985,7 +841,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -998,7 +854,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1011,7 +867,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1024,7 +880,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1037,7 +893,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1058,7 +914,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1071,7 +927,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
@@ -1084,7 +940,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<Focus>0</Focus>
--
Gitblit v1.9.3