From de542f653793306c903085bc3a1b590ce29caec8 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期四, 20 三月 2025 18:17:57 +0800
Subject: [PATCH] 时间同步BUG修复
---
keil/uwb_simple_example.uvoptx | 353 ++++++++++++++++------------------------------------------
1 files changed, 100 insertions(+), 253 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 7512319..1c62ae4 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -148,371 +148,162 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>676</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>10844</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename><1>.\include\main\main.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\uwb_simple_example\include/main/main.c\676</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>temp_count3,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>alarm_type</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_power_state,0x0A</ItemText>
+ <ItemText>REV_RX_NUM</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>bat_percent,0x0A</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>fVoltage_mv,0x0A</ItemText>
+ <ItemText>ERR_RX_NUM</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>taglist_num</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
+ <ItemText>taglist_pos</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>flag_sleeptimer</ItemText>
+ <ItemText>rec_ancdistlist</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>current_count,0x0A</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>end_receive_count,0x0A</ItemText>
+ <ItemText>resp_tx_num</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>\\uwb_simple_example\../keil/uwb_app.c\current_count,0x0A</ItemText>
+ <ItemText>REPLY_POLL_NUM</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>UWB_work_state,0x0A</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>temp_count3,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count,0x0A</ItemText>
+ <ItemText>RX_Buffer</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count3,0x0A</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsart2ReceivePack</ItemText>
+ <ItemText>tagdist_list</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_prase_flag</ItemText>
+ <ItemText>sleep_time_count,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>uwb_searchcount,0x0A</ItemText>
+ <ItemText>rec_delaytime,0x0A</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>wd</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>jd</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>pos_state,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>ret</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>successful_cnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>error_cnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>1</WinNumber>
- <ItemText>ceshi,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>io14_state</ItemText>
- </Ww>
- <Ww>
- <count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>RxDoneParams</ItemText>
- </Ww>
- <Ww>
- <count>28</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
- </Ww>
- <Ww>
- <count>29</count>
- <WinNumber>1</WinNumber>
- <ItemText>uwb_rxflag,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>30</count>
- <WinNumber>1</WinNumber>
- <ItemText>resp_tx_num</ItemText>
- </Ww>
- <Ww>
- <count>31</count>
- <WinNumber>1</WinNumber>
- <ItemText>timeceshi1,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>32</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp_count7,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>33</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp_count3,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>34</count>
- <WinNumber>1</WinNumber>
- <ItemText>uwb_rxflag_num,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>35</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_ancidlist</ItemText>
- </Ww>
- <Ww>
- <count>36</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_ancdistlist</ItemText>
- </Ww>
- <Ww>
- <count>37</count>
- <WinNumber>1</WinNumber>
- <ItemText>rx_rpt</ItemText>
- </Ww>
- <Ww>
- <count>38</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_count</ItemText>
- </Ww>
- <Ww>
- <count>39</count>
- <WinNumber>1</WinNumber>
- <ItemText>end_receive_count</ItemText>
- </Ww>
- <Ww>
- <count>40</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
+ <ItemText>datalen_offset,0x0A</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
<count>0</count>
<WinNumber>2</WinNumber>
- <ItemText>packet_transmit</ItemText>
+ <ItemText>lora_tx_flag</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>RADIO_FLAG_IDLE</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>tx_flag</ItemText>
+ <ItemText>LORA_POLL_COUNT</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>wg_report_freq,0x0A</ItemText>
+ <ItemText>BT_SEND_flag</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>REPORT_CHANNEL_SF</ItemText>
+ <ItemText>rxdone</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>2</WinNumber>
- <ItemText>RX_Buffer</ItemText>
+ <ItemText>txdone</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>2</WinNumber>
- <ItemText>CRC16</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>2</WinNumber>
- <ItemText>DEST_ID</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>2</WinNumber>
- <ItemText>wg_state</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>2</WinNumber>
- <ItemText>SOURCE_ID_IDX</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>2</WinNumber>
- <ItemText>lora_sendbuffer</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>2</WinNumber>
- <ItemText>Loratx_flag</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>2</WinNumber>
- <ItemText>Lorarx_time_out_flag,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>2</WinNumber>
- <ItemText>recv_flag</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>2</WinNumber>
- <ItemText>rx_timeout,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>2</WinNumber>
- <ItemText>wg_report_id</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>2</WinNumber>
- <ItemText>wg_report_freq,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>2</WinNumber>
- <ItemText>wg_report_sf</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>2</WinNumber>
- <ItemText>REG_OP_MODE</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>2</WinNumber>
- <ItemText>temreg</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>2</WinNumber>
- <ItemText>lora_huanxing_count</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>2</WinNumber>
- <ItemText>lora_sendbuffer</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>2</WinNumber>
- <ItemText>report_ancid</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>2</WinNumber>
- <ItemText>report_ancdist</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>2</WinNumber>
- <ItemText>tx_flag</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>2</WinNumber>
- <ItemText>lora_sendbuffer</ItemText>
+ <ItemText>time_count</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>8</SubType>
- <ItemText>applyid</ItemText>
+ <ItemText>buffer</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
+ <MemoryWindow2>
+ <Mm>
+ <WinNumber>2</WinNumber>
+ <SubType>1</SubType>
+ <ItemText>lora_sendbuffer</ItemText>
+ <AccSizeX>0</AccSizeX>
+ </Mm>
+ </MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@@ -537,7 +328,7 @@
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
- <StkLoc>1</StkLoc>
+ <StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
@@ -1496,27 +1287,83 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ </Group>
+
+ <Group>
+ <GroupName>radio</GroupName>
+ <tvExp>1</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <cbSel>0</cbSel>
+ <RteFlg>0</RteFlg>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>12</GroupNumber>
<FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_port.c</PathWithFileName>
- <FilenameWithoutPath>pan_port.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\lora_1268.c</PathWithFileName>
+ <FilenameWithoutPath>lora_1268.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>12</GroupNumber>
<FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_rf.c</PathWithFileName>
- <FilenameWithoutPath>pan_rf.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>74</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName>
+ <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>75</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\sx126x-board.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x-board.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>76</FileNumber>
+ <FileType>5</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\lora_1268.h</PathWithFileName>
+ <FilenameWithoutPath>lora_1268.h</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>77</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\delay.c</PathWithFileName>
+ <FilenameWithoutPath>delay.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
--
Gitblit v1.9.3