From 5cb269400905175cf618729ab44dfa4ccd3d0331 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期一, 21 七月 2025 17:51:51 +0800 Subject: [PATCH] 串口扫描功能调通,升级有问题 --- keil/uwb_simple_example.uvoptx | 270 ++++++++++++++++++++++++++++++++--------------------- 1 files changed, 161 insertions(+), 109 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index dae2517..e8f367d 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>d</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -340,32 +340,72 @@ <WinNumber>1</WinNumber> <ItemText>temperature</ItemText> </Ww> + <Ww> + <count>38</count> + <WinNumber>1</WinNumber> + <ItemText>nomove_count</ItemText> + </Ww> </WatchWindow1> <WatchWindow2> <Ww> <count>0</count> <WinNumber>2</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>tag_id_recv</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>apcSplitStr</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>apcSplitStr</ItemText> + <ItemText>rx_buf</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>apcSplitStr</ItemText> + <ItemText>temp_count3,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + </Ww> + <Ww> + <count>5</count> + <WinNumber>2</WinNumber> + <ItemText>tempid</ItemText> + </Ww> + <Ww> + <count>6</count> + <WinNumber>2</WinNumber> + <ItemText>tempid_test,0x10</ItemText> + </Ww> + <Ww> + <count>7</count> + <WinNumber>2</WinNumber> + <ItemText>dev_id</ItemText> + </Ww> + <Ww> + <count>8</count> + <WinNumber>2</WinNumber> + <ItemText>group_id</ItemText> + </Ww> + <Ww> + <count>9</count> + <WinNumber>2</WinNumber> + <ItemText>send_buffer</ItemText> + </Ww> + <Ww> + <count>10</count> + <WinNumber>2</WinNumber> + <ItemText>ceju_count,0x0A</ItemText> + </Ww> + <Ww> + <count>11</count> + <WinNumber>2</WinNumber> + <ItemText>dev_id</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> @@ -762,18 +802,6 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\sn74hc595.h</PathWithFileName> - <FilenameWithoutPath>sn74hc595.h</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>28</FileNumber> - <FileType>5</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> <PathWithFileName>.\mk_4G.h</PathWithFileName> <FilenameWithoutPath>mk_4G.h</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -781,7 +809,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -793,7 +821,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>29</FileNumber> <FileType>5</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -805,7 +833,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -817,25 +845,13 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>31</FileNumber> <FileType>5</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\WS2812.h</PathWithFileName> <FilenameWithoutPath>WS2812.h</FilenameWithoutPath> - <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> @@ -849,7 +865,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -861,7 +877,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -873,7 +889,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -885,7 +901,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -897,7 +913,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -909,7 +925,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -921,7 +937,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -933,7 +949,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -945,7 +961,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -957,7 +973,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -969,7 +985,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -981,31 +997,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>45</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>.\uwb_app.c</PathWithFileName> - <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>4</GroupNumber> - <FileNumber>46</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>.\uwb_tag.c</PathWithFileName> - <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>4</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1017,7 +1009,31 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>44</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\uwb_app.c</PathWithFileName> + <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>45</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\uwb_tag.c</PathWithFileName> + <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1029,7 +1045,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1041,7 +1057,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1053,7 +1069,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1065,7 +1081,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1077,7 +1093,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1089,7 +1105,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1101,7 +1117,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1113,13 +1129,49 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>54</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> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>55</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\ymodem.c</PathWithFileName> + <FilenameWithoutPath>ymodem.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>56</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\menu.c</PathWithFileName> + <FilenameWithoutPath>menu.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>57</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\aes.c</PathWithFileName> + <FilenameWithoutPath>aes.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1133,7 +1185,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1145,7 +1197,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1157,7 +1209,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1169,7 +1221,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1181,7 +1233,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1193,7 +1245,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1205,7 +1257,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1217,7 +1269,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1229,7 +1281,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1241,7 +1293,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1261,7 +1313,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1273,7 +1325,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1285,7 +1337,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1313,7 +1365,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1325,7 +1377,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>72</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1345,7 +1397,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>72</FileNumber> + <FileNumber>73</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1357,7 +1409,7 @@ </File> <File> <GroupNumber>9</GroupNumber> - <FileNumber>73</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1377,7 +1429,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>74</FileNumber> + <FileNumber>75</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1389,7 +1441,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>75</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1401,7 +1453,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>76</FileNumber> + <FileNumber>77</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1413,7 +1465,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>77</FileNumber> + <FileNumber>78</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1425,7 +1477,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>78</FileNumber> + <FileNumber>79</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1437,7 +1489,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>79</FileNumber> + <FileNumber>80</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1449,7 +1501,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>80</FileNumber> + <FileNumber>81</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1461,7 +1513,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>81</FileNumber> + <FileNumber>82</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1473,7 +1525,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>82</FileNumber> + <FileNumber>83</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1485,7 +1537,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>83</FileNumber> + <FileNumber>84</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1497,7 +1549,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>84</FileNumber> + <FileNumber>85</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1509,7 +1561,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>85</FileNumber> + <FileNumber>86</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1529,7 +1581,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>86</FileNumber> + <FileNumber>87</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3