From 5b130136a057f2cec4df6b4f14165b503e8ac816 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 31 五月 2020 18:19:17 +0800
Subject: [PATCH] 修改部分bug
---
源码/核心板/MDK-ARM/Project.uvoptx | 136 +++++++--------------------------------------
1 files changed, 21 insertions(+), 115 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 911da7f..df189f5 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,6 +119,11 @@
<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>
</SetRegEntry>
@@ -157,71 +162,7 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>2747</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134256892</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\decadriver\deca_device.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/decadriver/deca_device.c\2747</Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>75</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134248176</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\main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/main.c\75</Expression>
- </Bp>
- <Bp>
- <Number>2</Number>
- <Type>0</Type>
- <LineNumber>296</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134246560</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>\\UWB_Projects\../Src/application/dw_app.c\296</Expression>
- </Bp>
- <Bp>
- <Number>3</Number>
- <Type>0</Type>
- <LineNumber>296</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134247298</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>\\UWB_Projects\../Src/application/dw_app.c\296</Expression>
- </Bp>
- <Bp>
- <Number>4</Number>
- <Type>0</Type>
- <LineNumber>297</LineNumber>
+ <LineNumber>606</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
@@ -244,7 +185,7 @@
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
+ <ItemText>true_nearbase_idlist</ItemText>
</Ww>
<Ww>
<count>2</count>
@@ -254,57 +195,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</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>
@@ -314,52 +255,17 @@
<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>tyncpoll_time</ItemText>
+ <ItemText>true_nearbase_idlist[j]</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>sync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>synclost_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_syncid,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>flag_syncbase</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map[DEV_ID]</ItemText>
+ <ItemText>nearbase_distlist</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
--
Gitblit v1.9.3