From f043c5196e75fd8048179a678c42a9d58b06515e Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 21 二月 2024 16:07:25 +0800
Subject: [PATCH] Merge branch '免布线基站-lora' of http://47.108.70.204:60062/r/XRange_Tag into 免布线基站-lora
---
MDK-ARM/L051.uvoptx | 205 ++++++++++++++++-----------------------------------
1 files changed, 65 insertions(+), 140 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 2b94e28..5c2bc67 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>3</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -114,13 +114,13 @@
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile>.\Loader.ini</tIfile>
- <pMon>Segger\JL2CM3.dll</pMon>
+ <pMon>BIN\CMSIS_AGDI.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
<Key>CMSIS_AGDI</Key>
- <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ <Name>-X"Horco CMSIS-DAP v2" -U482752542668 -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -163,117 +163,42 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>exsistbase_list[0]</ItemText>
+ <ItemText>taglist_total_num</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_num</ItemText>
+ <ItemText>taglist_id[0]</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
+ <ItemText>taglist_dist[0],0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>taglist_keeptime[0],0x0A</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>last_nearbase_num</ItemText>
+ <ItemText>sync_lost_count</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>exsistbase_list</ItemText>
+ <ItemText>sync_state</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>exsistbase_list[0]</ItemText>
+ <ItemText>g_com_map</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>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>irq_num</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>rx_buffer</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>send_buffer</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>i</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>lp_time</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>RX_TIMEOUTs,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_time</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>end_time</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>usart_send</ItemText>
+ <ItemText>config_state_count,0x0A</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -290,7 +215,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -362,18 +287,6 @@
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
- <File>
- <GroupNumber>2</GroupNumber>
- <FileNumber>2</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\Drivers\ExternlDrivers\lis3dh_driver.c</PathWithFileName>
- <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
</Group>
<Group>
@@ -384,7 +297,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>3</FileNumber>
+ <FileNumber>2</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -396,7 +309,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -408,7 +321,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -428,7 +341,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>6</FileNumber>
+ <FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -448,7 +361,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>7</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -460,7 +373,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>8</FileNumber>
+ <FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -472,7 +385,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>9</FileNumber>
+ <FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -484,7 +397,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>10</FileNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -512,7 +425,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>11</FileNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -524,7 +437,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>12</FileNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -536,7 +449,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>13</FileNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -548,7 +461,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -560,13 +473,13 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>..\Src\application\dw_ancapp.c</PathWithFileName>
- <FilenameWithoutPath>dw_ancapp.c</FilenameWithoutPath>
+ <PathWithFileName>..\Src\application\dw_mbx_anc.c</PathWithFileName>
+ <FilenameWithoutPath>dw_mbx_anc.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -580,7 +493,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -592,7 +505,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -604,7 +517,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -624,7 +537,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -644,7 +557,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -656,7 +569,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -668,7 +581,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -680,7 +593,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -692,7 +605,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -704,7 +617,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -718,13 +631,13 @@
<Group>
<GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -736,7 +649,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -748,7 +661,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -760,7 +673,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -772,7 +685,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -784,7 +697,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -796,7 +709,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -808,7 +721,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -820,7 +733,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -832,7 +745,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -844,7 +757,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -856,7 +769,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -868,7 +781,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -880,7 +793,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -892,7 +805,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -904,6 +817,18 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
+ <FileNumber>40</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_exti.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
<FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
--
Gitblit v1.9.3