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 | 209 +++++++++------------------------------------------- 1 files changed, 37 insertions(+), 172 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 959e193..1c62ae4 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -153,274 +153,139 @@ <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>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>lora_tx_flag</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>temp_count,0x0A</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>group_id</ItemText> + <ItemText>LORA_POLL_COUNT</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> + <ItemText>BT_SEND_flag</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>temp_count3,0x0A</ItemText> + <ItemText>rxdone</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>2</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>txdone</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>2</WinNumber> - <ItemText>rx_buf</ItemText> - </Ww> - <Ww> - <count>7</count> - <WinNumber>2</WinNumber> - <ItemText>tagdist_list</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>wltag_state</ItemText> - </Ww> - <Ww> - <count>10</count> - <WinNumber>2</WinNumber> - <ItemText>report_ancid</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>2</WinNumber> - <ItemText>tagid_list</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>2</WinNumber> - <ItemText>report_ancdist</ItemText> + <ItemText>time_count</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> @@ -486,7 +351,7 @@ <Group> <GroupName>Algo</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -530,7 +395,7 @@ <Group> <GroupName>Device</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1082,7 +947,7 @@ <Group> <GroupName>OS</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1210,7 +1075,7 @@ <Group> <GroupName>Platform</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1262,7 +1127,7 @@ <Group> <GroupName>Utility</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1294,7 +1159,7 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1449,8 +1314,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName> - <FilenameWithoutPath>radio.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName> + <FilenameWithoutPath>sx126x.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1461,8 +1326,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName> - <FilenameWithoutPath>sx126x.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName> + <FilenameWithoutPath>radio.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> -- Gitblit v1.9.3