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 | 263 +++++++++++++++++++++++++++++++--------------------- 1 files changed, 156 insertions(+), 107 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 35724ab..82e82c1 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -148,24 +148,7 @@ <Name></Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>659</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>59804</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\659</Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -287,72 +270,102 @@ <WinNumber>1</WinNumber> <ItemText>url</ItemText> </Ww> + <Ww> + <count>24</count> + <WinNumber>1</WinNumber> + <ItemText>current_state</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>userkey_state</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>elapsed_time_jibu,0x0A</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>uwb_time_count,0x0A</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>state_start_time,0x0A</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>current_state</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>bat_percent,0x0A</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>cnn</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>drv_state</ItemText> + </Ww> + <Ww> + <count>34</count> + <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>TAG_KEEPTIMES</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>TAG_KEEPTIMES</ItemText> - </Ww> - <Ww> - <count>10</count> - <WinNumber>2</WinNumber> - <ItemText>dev_id</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>2</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>2</WinNumber> - <ItemText>deep_sleep_falg</ItemText> + <ItemText>g_com_map</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> @@ -877,8 +890,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\dw_tag.c</PathWithFileName> - <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath> + <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> + <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -889,8 +902,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> - <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> + <PathWithFileName>.\dw_tag.c</PathWithFileName> + <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -961,8 +974,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\TCPClient.c</PathWithFileName> - <FilenameWithoutPath>TCPClient.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_app.c</PathWithFileName> + <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -973,8 +986,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> @@ -985,8 +998,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_tag.c</PathWithFileName> - <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\TCPClient.c</PathWithFileName> + <FilenameWithoutPath>TCPClient.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1062,17 +1075,53 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>53</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\SPIV1.07.c</PathWithFileName> + <FilenameWithoutPath>SPIV1.07.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>54</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps310.c</PathWithFileName> + <FilenameWithoutPath>dps310.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>55</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps368_test.c</PathWithFileName> + <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>OS</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1084,7 +1133,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1096,7 +1145,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1108,7 +1157,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1120,7 +1169,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1132,7 +1181,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1144,7 +1193,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1156,7 +1205,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1168,7 +1217,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1180,7 +1229,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1194,13 +1243,13 @@ <Group> <GroupName>Platform</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1212,7 +1261,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1224,7 +1273,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1246,13 +1295,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>66</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1264,7 +1313,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1278,13 +1327,13 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>71</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1296,7 +1345,7 @@ </File> <File> <GroupNumber>9</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>72</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1316,7 +1365,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>73</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1328,7 +1377,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1340,7 +1389,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>72</FileNumber> + <FileNumber>75</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1352,7 +1401,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>73</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1364,7 +1413,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>74</FileNumber> + <FileNumber>77</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1376,7 +1425,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>75</FileNumber> + <FileNumber>78</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1388,7 +1437,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>76</FileNumber> + <FileNumber>79</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1400,7 +1449,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>77</FileNumber> + <FileNumber>80</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1412,7 +1461,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>78</FileNumber> + <FileNumber>81</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1424,7 +1473,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>79</FileNumber> + <FileNumber>82</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1436,7 +1485,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>80</FileNumber> + <FileNumber>83</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1448,7 +1497,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>81</FileNumber> + <FileNumber>84</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1468,7 +1517,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>82</FileNumber> + <FileNumber>85</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3