From fa5a89bd9f87ef619619194d00cd495d165e1f12 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期六, 27 六月 2020 19:33:44 +0800
Subject: [PATCH] V1.19 测试10对10 200ms防撞。
---
源码/核心板/MDK-ARM/Project.uvoptx | 131 ++++++++++++++++++++++++++++++++-----------
1 files changed, 97 insertions(+), 34 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 0f4473a..2fff69d 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"
@@ -103,7 +103,7 @@
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
- <nTsel>6</nTsel>
+ <nTsel>12</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -114,13 +114,18 @@
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
- <pMon>Segger\JL2CM3.dll</pMon>
+ <pMon>BIN\CMSIS_AGDI.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<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>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,24 +158,7 @@
<Name>-T0</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>36</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134249374</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\serial_at_cmd_app.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/application/serial_at_cmd_app.c\36</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -180,7 +168,7 @@
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
+ <ItemText>true_nearbase_idlist</ItemText>
</Ww>
<Ww>
<count>2</count>
@@ -190,57 +178,57 @@
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>dist_cm</ItemText>
+ <ItemText>last_nearbase_num</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>next_nearbase_num</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
+ <ItemText>nearbaseid_list</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time,0x0A</ItemText>
+ <ItemText>true_nearbase_distlist,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>random_value,0x0A</ItemText>
+ <ItemText>true_nearbase_idlist</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_adc</ItemText>
+ <ItemText>status_reg</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>max_slotpos,0x0A</ItemText>
+ <ItemText>tagdist_list,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>tmp_time,0x0A</ItemText>
+ <ItemText>QUIT_SLOT_TIME</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buffer[ANCTIMEMS]</ItemText>
+ <ItemText>taglist_num</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buffer,0x0A</ItemText>
+ <ItemText>synclost_timer,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
@@ -250,7 +238,82 @@
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>usart_timer,0x0A</ItemText>
+ <ItemText>sync_timer,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>16</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>true_nearbase_idlist[j]</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buffer</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>min_dist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>hex_dist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>sync_timer,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>synclost_timer,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>min_dist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tagslotpos,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>target_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tyncpoll_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_slotnum,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>28</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tagslotpos</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>last_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
--
Gitblit v1.9.3