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 | 121 +++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 46 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index c4869f6..2861388 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -88,7 +88,7 @@
<sRmem>1</sRmem>
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
- <tLdApp>0</tLdApp>
+ <tLdApp>1</tLdApp>
<tGomain>1</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,80 +162,97 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>94</LineNumber>
+ <LineNumber>496</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134249532</Address>
+ <Address>134251978</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>../Src/stm32l0xx_it.c</Filename>
+ <Filename>E:\GIT\XRange_Tag - 閸擃垱婀癨Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/stm32l0xx_it.c\94</Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>356</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134258680</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>../Src/main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\356</Expression>
+ <Expression>\\L051\../Src/application/dw_app.c\496</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>tag_frequency</ItemText>
+ <ItemText>exsistbase_list[0]</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>tag_frequency</ItemText>
+ <ItemText>nearbase_num</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>freqlost_count</ItemText>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buffer[TAG_ID_IDX]</ItemText>
+ <ItemText>nearbaseid_list</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_remotepara</ItemText>
+ <ItemText>last_nearbase_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>exsistbase_list</ItemText>
+ </Ww>
+ <Ww>
+ <count>6</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>exsistbase_list[0]</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>\\L051\../Src/application/dw_app.c\nearbaseid_list</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist[2]</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>status_reg</ItemText>
+ </Ww>
+ <Ww>
+ <count>12</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>true_exsistbase_list[0]</ItemText>
+ </Ww>
+ <Ww>
+ <count>13</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>freqlost_count</ItemText>
</Ww>
</WatchWindow1>
- <WatchWindow2>
- <Ww>
- <count>0</count>
- <WinNumber>2</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- <Ww>
- <count>1</count>
- <WinNumber>2</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
- <ItemText>0x200019E8</ItemText>
+ <ItemText>0x0800FC00</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -752,6 +769,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_iwdg.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_iwdg.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>34</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
<PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_lptim.c</PathWithFileName>
<FilenameWithoutPath>stm32l0xx_hal_lptim.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -759,7 +788,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -771,7 +800,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -783,7 +812,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -795,7 +824,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -807,7 +836,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -827,7 +856,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3