From 75544b683feca0b57fb7d5fa00cbc376dc6e62a5 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期五, 04 七月 2025 18:06:30 +0800
Subject: [PATCH] V1.28 针对东营高精度方案，专网匹配，去掉了4G入网 APN和查询IP的代码。
---
keil/uwb_simple_example.uvoptx | 278 ++++++++++++++----------------------------------------
1 files changed, 74 insertions(+), 204 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index e3dc58b..82e82c1 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -148,40 +148,7 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>528</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>44626</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>D:\zhangbo\2024\Code\ChinaUWB\楠炲灝鎼辩粔缁橆槻\ChinaUWBProject\keil\include\src\TCPClient.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\uwb_simple_example\include/src/TCPClient.c\528</Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>672</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>12880</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>D:\zhangbo\2024\Code\ChinaUWB\楠炲灝鎼辩粔缁橆槻\ChinaUWBProject\keil\include\src\GPS.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\uwb_simple_example\include/src/GPS.c\672</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -358,132 +325,47 @@
<WinNumber>1</WinNumber>
<ItemText>Height</ItemText>
</Ww>
+ <Ww>
+ <count>35</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gaodu,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>36</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>pressure</ItemText>
+ </Ww>
+ <Ww>
+ <count>37</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>temperature</ItemText>
+ </Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
<count>0</count>
<WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>apcSplitStr</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>tagdist_list</ItemText>
+ <ItemText>apcSplitStr</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>apcSplitStr</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>group_id,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>2</WinNumber>
- <ItemText>rx_buf</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>2</WinNumber>
- <ItemText>tagofflinetime,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>2</WinNumber>
- <ItemText>taglist_num</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>2</WinNumber>
- <ItemText>nomove_count</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>2</WinNumber>
- <ItemText>group_id</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>2</WinNumber>
- <ItemText>group_id</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>2</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>2</WinNumber>
- <ItemText>uwb_offtime_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>2</WinNumber>
- <ItemText>current_state</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>2</WinNumber>
- <ItemText>_u32Event</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>2</WinNumber>
- <ItemText>elapsed_time_jibu</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>2</WinNumber>
- <ItemText>state_start_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>2</WinNumber>
- <ItemText>uwb_time_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>2</WinNumber>
- <ItemText>uwb_offtime_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>2</WinNumber>
- <ItemText>state_start_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>2</WinNumber>
- <ItemText>step_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>2</WinNumber>
- <ItemText>uwb_time_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>2</WinNumber>
- <ItemText>state_start_time_jibu</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>2</WinNumber>
- <ItemText>current_state</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
@@ -945,18 +827,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
- <File>
- <GroupNumber>3</GroupNumber>
- <FileNumber>33</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\drivers\lis3dh_driver.c</PathWithFileName>
- <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
</Group>
<Group>
@@ -967,7 +837,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -979,7 +849,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -991,7 +861,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1003,7 +873,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1015,7 +885,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1027,7 +897,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1039,7 +909,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1051,7 +921,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1063,7 +933,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1075,7 +945,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1087,7 +957,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1099,7 +969,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1111,7 +981,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1123,7 +993,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1135,7 +1005,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1147,7 +1017,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1159,7 +1029,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1171,7 +1041,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1183,7 +1053,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1195,7 +1065,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1207,7 +1077,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1219,7 +1089,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1231,7 +1101,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1251,7 +1121,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1263,7 +1133,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1275,7 +1145,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1287,7 +1157,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1299,7 +1169,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1311,7 +1181,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1323,7 +1193,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1335,7 +1205,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1347,7 +1217,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1359,7 +1229,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1379,7 +1249,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1391,7 +1261,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1403,7 +1273,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1431,7 +1301,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1443,7 +1313,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1463,7 +1333,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1475,7 +1345,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1495,7 +1365,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1507,7 +1377,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1519,7 +1389,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1531,7 +1401,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1543,7 +1413,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>78</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1555,7 +1425,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>79</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1567,7 +1437,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>80</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1579,7 +1449,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>81</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1591,7 +1461,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>82</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1603,7 +1473,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>83</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1615,7 +1485,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>84</FileNumber>
+ <FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1627,7 +1497,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>85</FileNumber>
+ <FileNumber>84</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1647,7 +1517,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>86</FileNumber>
+ <FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3