From 9e334e88f1d1d7aeb89f38ff72f4ae3dca078762 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期日, 16 三月 2025 16:58:50 +0800
Subject: [PATCH] 外包开发完ntrip，支持shell配置ID，测试ID正常，ntrip正常
---
keil/uwb_simple_example.uvoptx | 248 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 175 insertions(+), 73 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 086d79c..61a248b 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -120,7 +120,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,192 +153,222 @@
<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>\\uwb_simple_example\../keil/uwb_app.c\temp_count1,0x0A</ItemText>
+ <ItemText>taglist_num</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>tagofflinetime[0],0x0A</ItemText>
+ <ItemText>tagdist_list,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>tagofflinetime[1],0x0A</ItemText>
+ <ItemText>tagofflinetime,0x0A</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_ancdistlist,0x0A</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>get_out_num,0x0A</ItemText>
+ <ItemText>dev_id</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>anchor_id_out</ItemText>
+ <ItemText>input5vflag</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>change_count,0x0A</ItemText>
+ <ItemText>-ledontime,0x0A</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>poll_rx_en_start_u32,0x0A</ItemText>
+ <ItemText>port,0x0A</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>statistic_num</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>wltag_uwbtimer</ItemText>
+ <ItemText>mUsartReceivePack</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>wltag_statetimer</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>pca9555writedata_polarity[0],0x10</ItemText>
+ <ItemText>g_com_map,0x10</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buf[5],0x0A</ItemText>
+ <ItemText>gpio_state111</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buf[6]</ItemText>
+ <ItemText>uwbtasktimer</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buf,0x0A</ItemText>
+ <ItemText>tagdist_list[taglist_pos]</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
- <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ <ItemText>taglist_num</ItemText>
</Ww>
<Ww>
<count>21</count>
<WinNumber>1</WinNumber>
- <ItemText>tag_id_recv</ItemText>
+ <ItemText>resp_tx_en_start_u32</ItemText>
</Ww>
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buf,0x10</ItemText>
+ <ItemText>test11,0x0A</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
- <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
+ <ItemText>test21,0x0A</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt</ItemText>
+ <ItemText>test31,0x0A</ItemText>
</Ww>
<Ww>
<count>25</count>
<WinNumber>1</WinNumber>
- <ItemText>tagofflinetime[0],0x0A</ItemText>
+ <ItemText>test41,0x0A</ItemText>
</Ww>
<Ww>
<count>26</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num,0x0A</ItemText>
+ <ItemText>test51</ItemText>
</Ww>
<Ww>
<count>27</count>
<WinNumber>1</WinNumber>
- <ItemText>tagdist_list[0],0x10</ItemText>
+ <ItemText>flag_temp1</ItemText>
</Ww>
<Ww>
<count>28</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
+ <ItemText>secondtask_count,0x0A</ItemText>
</Ww>
<Ww>
<count>29</count>
<WinNumber>1</WinNumber>
- <ItemText>taglist_pos</ItemText>
+ <ItemText>rxnum,0x0A</ItemText>
</Ww>
<Ww>
<count>30</count>
<WinNumber>1</WinNumber>
- <ItemText>tagid_list[0]</ItemText>
+ <ItemText>resp_tx_error,0x0A</ItemText>
</Ww>
<Ww>
<count>31</count>
<WinNumber>1</WinNumber>
- <ItemText>wltag_statetimer</ItemText>
+ <ItemText>flag_temp2</ItemText>
</Ww>
<Ww>
<count>32</count>
<WinNumber>1</WinNumber>
- <ItemText>TAG_KEEPTIMES</ItemText>
+ <ItemText>rxnumoknum</ItemText>
</Ww>
<Ww>
<count>33</count>
<WinNumber>1</WinNumber>
- <ItemText>taglist_num</ItemText>
+ <ItemText>rxnumerrornum</ItemText>
</Ww>
<Ww>
<count>34</count>
<WinNumber>1</WinNumber>
- <ItemText>tagdist_list,0x0A</ItemText>
+ <ItemText>temp_endcount1,0x0A</ItemText>
</Ww>
<Ww>
<count>35</count>
<WinNumber>1</WinNumber>
- <ItemText>tagofflinetime,0x0A</ItemText>
+ <ItemText>temp_count1,0x0A</ItemText>
</Ww>
<Ww>
<count>36</count>
<WinNumber>1</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>37</count>
<WinNumber>1</WinNumber>
- <ItemText>dev_id</ItemText>
+ <ItemText>resp_tx_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>38</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rssi,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>39</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_report</ItemText>
+ </Ww>
+ <Ww>
+ <count>40</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>ceshidata</ItemText>
+ </Ww>
+ <Ww>
+ <count>41</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>ceshichangdu,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>42</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>ceshidata</ItemText>
+ </Ww>
+ <Ww>
+ <count>43</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>l_astUartInfo[0].m_stRxArraryQueue</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -371,8 +401,8 @@
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>8</SubType>
- <ItemText>\\uwb_simple_example\include/drivers/Usart.c\m_EUART_DMA_RXBuf</ItemText>
+ <SubType>0</SubType>
+ <ItemText>ceshidata</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -499,7 +529,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -986,8 +1016,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>
@@ -998,8 +1028,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>
@@ -1010,8 +1040,56 @@
<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>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>51</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\TCPClient_1.c</PathWithFileName>
+ <FilenameWithoutPath>TCPClient_1.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -1025,7 +1103,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1037,7 +1115,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1049,7 +1127,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1061,7 +1139,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1073,7 +1151,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1085,7 +1163,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1097,7 +1175,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1109,7 +1187,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1121,7 +1199,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1133,7 +1211,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1147,13 +1225,13 @@
<Group>
<GroupName>Platform</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1165,7 +1243,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1177,7 +1255,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1205,7 +1283,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1217,7 +1295,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1237,13 +1315,25 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>67</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>68</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>
@@ -1257,7 +1347,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1269,7 +1359,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1281,7 +1371,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1293,7 +1383,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1305,7 +1395,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1317,7 +1407,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1329,13 +1419,25 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>75</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>76</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>
@@ -1349,7 +1451,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3