From c854d51d514c155325b6ea2d011206696d0fcd1a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期日, 24 十一月 2019 23:08:19 +0800
Subject: [PATCH] 修改串口485bug
---
源码/核心板/MDK-ARM/Project.uvoptx | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 6ee4d17..bd485e9 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,11 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>DLGUARM</Key>
+ <Name></Name>
+ </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>
@@ -178,7 +183,7 @@
<Type>0</Type>
<LineNumber>57</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134248160</Address>
+ <Address>134251290</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -187,14 +192,14 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\stm32f10x_it.c</Filename>
<ExecCommand></ExecCommand>
- <Expression></Expression>
+ <Expression>\\UWB_Projects\../Src/stm32f10x_it.c\57</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>132</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134254218</Address>
+ <Address>134256662</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -203,14 +208,14 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\decadriver\deca_device.c</Filename>
<ExecCommand></ExecCommand>
- <Expression></Expression>
+ <Expression>\\UWB_Projects\../Src/decadriver/deca_device.c\132</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>79</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134248258</Address>
+ <Address>134251388</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -219,23 +224,23 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\stm32f10x_it.c</Filename>
<ExecCommand></ExecCommand>
- <Expression></Expression>
+ <Expression>\\UWB_Projects\../Src/stm32f10x_it.c\79</Expression>
</Bp>
<Bp>
<Number>3</Number>
<Type>0</Type>
- <LineNumber>476</LineNumber>
+ <LineNumber>193</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134249658</Address>
+ <Address>134252314</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>
+ <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\OnChipDevices\Usart.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/application/dw_app.c\476</Expression>
+ <Expression>\\UWB_Projects\../Src/OnChipDevices/Usart.c\193</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -279,6 +284,26 @@
<WinNumber>1</WinNumber>
<ItemText>tagslotpos</ItemText>
</Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>max_slotpos,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>dev_id,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tyncpoll_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tagslotpos</ItemText>
+ </Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
--
Gitblit v1.9.3