From 008f7bc0aefa193932fd3bdc11bbf36c08a28206 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期四, 13 三月 2025 17:02:04 +0800 Subject: [PATCH] 提交给外包的一版,修改不能测距的bug --- keil/uwb_simple_example.uvoptx | 311 ++++++++++++++++++++++----------------------------- 1 files changed, 136 insertions(+), 175 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 519b005..1d544bb 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -120,6 +120,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -152,277 +153,202 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>valid_sts</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>rx_buf</ItemText> + <ItemText>taglist_pos</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>tagid_list[0]</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>wltag_statetimer</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <ItemText>TAG_KEEPTIMES</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>temp_count3,0x0A</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\temp_count1,0x0A</ItemText> + <ItemText>tagdist_list,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>anchordata_id</ItemText> + <ItemText>tagofflinetime,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>anchordata_dist,0x0A</ItemText> + <ItemText>tagid_list</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>get_in_num,0x0A</ItemText> + <ItemText>dev_id</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>anchor_id_in</ItemText> + <ItemText>input5vflag</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>tagofflinetime[0],0x0A</ItemText> + <ItemText>-ledontime,0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>tagofflinetime[1],0x0A</ItemText> + <ItemText>port,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>distance,0x0A</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>get_out_num,0x0A</ItemText> + <ItemText>nomove_count</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>anchor_id_out</ItemText> + <ItemText>g_com_map,0x10</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>anchor_id_in</ItemText> + <ItemText>gpio_state111</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>get_in_num</ItemText> + <ItemText>uwbtasktimer</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>change_count,0x0A</ItemText> + <ItemText>tagdist_list[taglist_pos]</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>temp_internal,0x0A</ItemText> + <ItemText>resp_tx_en_start_u32</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> + <ItemText>test11,0x0A</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_output[0]</ItemText> + <ItemText>test21,0x0A</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_config,0x10</ItemText> + <ItemText>test31,0x0A</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_output[1],0x10</ItemText> + <ItemText>test41,0x0A</ItemText> </Ww> <Ww> <count>26</count> <WinNumber>1</WinNumber> - <ItemText>temp_ack2</ItemText> + <ItemText>test51</ItemText> </Ww> <Ww> <count>27</count> <WinNumber>1</WinNumber> - <ItemText>statistic_num</ItemText> + <ItemText>flag_temp1</ItemText> </Ww> <Ww> <count>28</count> <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_input,0x0A</ItemText> + <ItemText>secondtask_count,0x0A</ItemText> </Ww> <Ww> <count>29</count> <WinNumber>1</WinNumber> - <ItemText>wltag_uwbtimer</ItemText> + <ItemText>rxnum,0x0A</ItemText> </Ww> <Ww> <count>30</count> <WinNumber>1</WinNumber> - <ItemText>wltag_statetimer</ItemText> + <ItemText>resp_tx_error,0x0A</ItemText> </Ww> <Ww> <count>31</count> <WinNumber>1</WinNumber> - <ItemText>wltag_state</ItemText> + <ItemText>flag_temp2</ItemText> </Ww> <Ww> <count>32</count> <WinNumber>1</WinNumber> - <ItemText>uwb_losttimer,0x0A</ItemText> + <ItemText>rxnumoknum</ItemText> </Ww> <Ww> <count>33</count> <WinNumber>1</WinNumber> - <ItemText>flag_temp1</ItemText> + <ItemText>rxnumerrornum</ItemText> </Ww> <Ww> <count>34</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map[10],0x0A</ItemText> + <ItemText>temp_endcount1,0x0A</ItemText> </Ww> <Ww> <count>35</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map[11],0x0A</ItemText> + <ItemText>temp_count1,0x0A</ItemText> </Ww> <Ww> <count>36</count> <WinNumber>1</WinNumber> - <ItemText>uwb_rx_flag</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>37</count> <WinNumber>1</WinNumber> - <ItemText>m_EUART_DMA_RXBuf</ItemText> + <ItemText>resp_tx_num</ItemText> </Ww> <Ww> <count>38</count> <WinNumber>1</WinNumber> - <ItemText>fVoltage_mv,0x0A</ItemText> + <ItemText>rssi,0x0A</ItemText> </Ww> <Ww> <count>39</count> <WinNumber>1</WinNumber> - <ItemText>state5v</ItemText> - </Ww> - <Ww> - <count>40</count> - <WinNumber>1</WinNumber> - <ItemText>state5V_prase_flag</ItemText> - </Ww> - <Ww> - <count>41</count> - <WinNumber>1</WinNumber> - <ItemText>keystarttime,0x0A</ItemText> - </Ww> - <Ww> - <count>42</count> - <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_polarity[0],0x10</ItemText> - </Ww> - <Ww> - <count>43</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[10],0x0A</ItemText> - </Ww> - <Ww> - <count>44</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[11],0x0A</ItemText> - </Ww> - <Ww> - <count>45</count> - <WinNumber>1</WinNumber> - <ItemText>wltag_state</ItemText> - </Ww> - <Ww> - <count>46</count> - <WinNumber>1</WinNumber> - <ItemText>uwb_rx_flag</ItemText> - </Ww> - <Ww> - <count>47</count> - <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> - </Ww> - <Ww> - <count>48</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buf[5],0x0A</ItemText> - </Ww> - <Ww> - <count>49</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buf[6]</ItemText> - </Ww> - <Ww> - <count>50</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buf,0x0A</ItemText> - </Ww> - <Ww> - <count>51</count> - <WinNumber>1</WinNumber> - <ItemText>temp_count3,0x0A</ItemText> - </Ww> - <Ww> - <count>52</count> - <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\poll_rx_en_start_u32,0x0A</ItemText> - </Ww> - <Ww> - <count>53</count> - <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> - </Ww> - <Ww> - <count>54</count> - <WinNumber>1</WinNumber> - <ItemText>temp_internal,0x0A</ItemText> + <ItemText>rx_report</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -439,42 +365,17 @@ <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>anchordata_id[0]</ItemText> + <ItemText>tagofflinetime[0]</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>anchordata_id[1]</ItemText> + <ItemText>tagofflinetime[1]</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[0]</ItemText> - </Ww> - <Ww> - <count>5</count> - <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[1]</ItemText> - </Ww> - <Ww> - <count>6</count> - <WinNumber>2</WinNumber> - <ItemText>distance,0x0A</ItemText> - </Ww> - <Ww> - <count>7</count> - <WinNumber>2</WinNumber> <ItemText>tag_id_recv</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>2</WinNumber> - <ItemText>anchordata_dist[0],0x0A</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>anchordata_dist[1],0x0A</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> @@ -608,7 +509,7 @@ <Group> <GroupName>Driver</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1095,8 +996,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\gps.c</PathWithFileName> - <FilenameWithoutPath>gps.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_app.c</PathWithFileName> + <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1107,8 +1008,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_app.c</PathWithFileName> - <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_tag.c</PathWithFileName> + <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1119,8 +1020,44 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_tag.c</PathWithFileName> - <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\GPS.c</PathWithFileName> + <FilenameWithoutPath>GPS.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>48</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\NTRIPApp.c</PathWithFileName> + <FilenameWithoutPath>NTRIPApp.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>49</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\DBG.c</PathWithFileName> + <FilenameWithoutPath>DBG.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>50</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\Shell.c</PathWithFileName> + <FilenameWithoutPath>Shell.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1134,7 +1071,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1146,7 +1083,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1158,7 +1095,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1170,7 +1107,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1182,7 +1119,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1194,7 +1131,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1206,7 +1143,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1218,7 +1155,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1230,7 +1167,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1242,7 +1179,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1262,7 +1199,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1274,7 +1211,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1286,7 +1223,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1308,13 +1245,13 @@ <Group> <GroupName>Utility</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1326,7 +1263,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1340,19 +1277,31 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>66</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\components\hido\hido.lib</PathWithFileName> <FilenameWithoutPath>hido.lib</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>9</GroupNumber> + <FileNumber>67</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\hido\HIDO_Base64.c</PathWithFileName> + <FilenameWithoutPath>HIDO_Base64.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1366,7 +1315,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1378,7 +1327,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1390,7 +1339,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1402,7 +1351,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1414,7 +1363,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>72</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1426,7 +1375,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>73</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1438,13 +1387,25 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\components\internet\src\Socket.c</PathWithFileName> <FilenameWithoutPath>Socket.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>75</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\internet\src\NTRIPClient.c</PathWithFileName> + <FilenameWithoutPath>NTRIPClient.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1458,7 +1419,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3