From 3dc93e0626cf3dcf3c265f902da8a7de5070f083 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期一, 13 五月 2024 17:31:42 +0800
Subject: [PATCH] Merge branch '免布线基站' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站
---
MDK-ARM/L051.uvoptx | 18 ++++++------------
1 files changed, 6 insertions(+), 12 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 9772e68..2861388 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -103,7 +103,7 @@
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
- <nTsel>4</nTsel>
+ <nTsel>6</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -162,18 +162,18 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>367</LineNumber>
+ <LineNumber>496</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
+ <Address>134251978</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>../Src/main.c</Filename>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>E:\GIT\XRange_Tag - 閸擃垱婀癨Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression></Expression>
+ <Expression>\\L051\../Src/application/dw_app.c\496</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -298,12 +298,6 @@
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
- <SystemViewers>
- <Entry>
- <Name>System Viewer\LPTIM</Name>
- <WinId>35905</WinId>
- </Entry>
- </SystemViewers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
--
Gitblit v1.9.3