From ec22d5dcf5153cefc08d495ecf339edf3d799cba Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 02 四月 2024 15:58:16 +0800
Subject: [PATCH] Merge branch '免布线URT-LORA-L071' of http://47.108.70.204:60062/r/XRange_Tag into 免布线URT-LORA-L071
---
MDK-ARM/L051.uvoptx | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 45 insertions(+), 5 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 33cc574..e6271d2 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>6</nTsel>
+ <nTsel>4</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -117,6 +117,11 @@
<pMon>Segger\JL2CM3.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
+ <SetRegEntry>
+ <Number>0</Number>
+ <Key>DLGUARM</Key>
+ <Name></Name>
+ </SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>CMSIS_AGDI</Key>
@@ -157,9 +162,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>640</LineNumber>
+ <LineNumber>644</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134275896</Address>
+ <Address>134286144</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -168,7 +173,7 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>C:\git\XRange_Tag -Lora-R - L071 URT - 閸擃垱婀癨Src\main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\640</Expression>
+ <Expression>\\L051\../Src/main.c\644</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -262,6 +267,41 @@
<WinNumber>1</WinNumber>
<ItemText>g_com_map</ItemText>
</Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>recv_end_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>delaytime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>test_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>datalen_offset,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>delaytime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>power,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>muqiandeshengjibao,0x0A</ItemText>
+ </Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
@@ -301,7 +341,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
--
Gitblit v1.9.3