From 8e3c571a48a30e8c1bd07dca4786a53d7c9994f5 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期一, 19 十月 2020 10:49:54 +0800
Subject: [PATCH] 修改基站临近接收BUG
---
源码/核心板/MDK-ARM/Project.uvoptx | 130 +++++++------------------------------------
1 files changed, 22 insertions(+), 108 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 6921389..db84018 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,7 +114,7 @@
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
- <pMon>Segger\JL2CM3.dll</pMon>
+ <pMon>BIN\CMSIS_AGDI.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,130 +162,34 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>235</LineNumber>
+ <LineNumber>1192</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134260338</Address>
+ <Address>134242206</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>
+ <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/main.c\235</Expression>
+ <Expression>\\UWB_Projects\../Src/application/dw_app.c\1192</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>103</LineNumber>
+ <LineNumber>1195</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134255514</Address>
+ <Address>0</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>
+ <BreakIfRCount>0</BreakIfRCount>
+ <Filename>..\Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\UWB_Projects\../Src/application/serial_at_cmd_app.c\103</Expression>
- </Bp>
- <Bp>
- <Number>2</Number>
- <Type>0</Type>
- <LineNumber>130</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134255670</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\130</Expression>
- </Bp>
- <Bp>
- <Number>3</Number>
- <Type>0</Type>
- <LineNumber>59</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134251924</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\59</Expression>
- </Bp>
- <Bp>
- <Number>4</Number>
- <Type>0</Type>
- <LineNumber>218</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134247746</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\218</Expression>
- </Bp>
- <Bp>
- <Number>5</Number>
- <Type>0</Type>
- <LineNumber>50</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134251868</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\50</Expression>
- </Bp>
- <Bp>
- <Number>6</Number>
- <Type>0</Type>
- <LineNumber>54</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134251882</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\54</Expression>
- </Bp>
- <Bp>
- <Number>7</Number>
- <Type>0</Type>
- <LineNumber>56</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134251900</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\56</Expression>
+ <Expression></Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -339,6 +243,16 @@
<WinNumber>1</WinNumber>
<ItemText>mUsartReceivePack</ItemText>
</Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buffer[9]</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map[NEARBASE_ID1]</ItemText>
+ </Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
--
Gitblit v1.9.3