From a05285d3b4ea5aa0609a2a23aa867c17c0611a38 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 18 二月 2024 10:17:57 +0800
Subject: [PATCH] 配合网关调试标签上传回复部分，测距部分已经调通
---
MDK-ARM/L051.uvoptx | 263 +++++++++++++++++++++++-----------------------------
1 files changed, 115 insertions(+), 148 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 1adf60c..2470ca6 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,7 +114,7 @@
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile>.\Loader.ini</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>
@@ -163,97 +163,22 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancnum</ItemText>
+ <ItemText>tagdist_list[0],0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>usart_send</ItemText>
+ <ItemText>taglist_num</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>RX_TIMEOUTs,0x0A</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>RX_TIMEOUTs_UWB,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>4</count>
- <WinNumber>1</WinNumber>
- <ItemText>RX_Buffer[3],0x0A</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>lora_seq_nb2</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancid</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancdist</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>Lora_tx_anc_electricity</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>stationary_num</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>poll_rx_ts</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>resp_tx_time</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancnum</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>Lora_status</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>irq_num</ItemText>
+ <ItemText>tagofflinetime[0],0x0A</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -270,7 +195,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -306,6 +231,12 @@
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
+ <SystemViewers>
+ <Entry>
+ <Name>System Viewer\GPIOA</Name>
+ <WinId>35905</WinId>
+ </Entry>
+ </SystemViewers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
@@ -545,8 +476,32 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>..\Src\application\dw_ancapp.c</PathWithFileName>
- <FilenameWithoutPath>dw_ancapp.c</FilenameWithoutPath>
+ <PathWithFileName>..\Src\application\WS2812.c</PathWithFileName>
+ <FilenameWithoutPath>WS2812.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>16</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\application\syn6288.c</PathWithFileName>
+ <FilenameWithoutPath>syn6288.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>17</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\application\dw_mbx_tag.c</PathWithFileName>
+ <FilenameWithoutPath>dw_mbx_tag.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -560,7 +515,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -572,7 +527,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -584,7 +539,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -604,7 +559,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -624,7 +579,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -636,7 +591,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -648,7 +603,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -660,7 +615,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -672,7 +627,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -684,7 +639,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -704,7 +659,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -716,7 +671,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -728,7 +683,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -740,7 +695,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -752,7 +707,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -764,7 +719,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -776,7 +731,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -788,7 +743,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -800,7 +755,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -812,7 +767,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -824,7 +779,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -836,7 +791,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -848,7 +803,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -860,7 +815,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -872,7 +827,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -884,7 +839,19 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>43</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>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -896,49 +863,13 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>45</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>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>43</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_spi.c</PathWithFileName>
- <FilenameWithoutPath>stm32l0xx_hal_spi.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>44</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim.c</PathWithFileName>
- <FilenameWithoutPath>stm32l0xx_hal_tim.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>45</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim_ex.c</PathWithFileName>
- <FilenameWithoutPath>stm32l0xx_hal_tim_ex.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -966,6 +897,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>48</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_spi.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_spi.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>49</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_tim.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>11</GroupNumber>
+ <FileNumber>50</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_tim_ex.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_tim_ex.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
--
Gitblit v1.9.3