From 08ea5e84edd3b20371a679e72146a939ba658994 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 11 三月 2025 10:21:56 +0800
Subject: [PATCH] UWB测距正常，还有部分逻辑没验证与改写
---
keil/uwb_simple_example.uvoptx | 278 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 153 insertions(+), 125 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index d692132..e3c6883 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -360,117 +360,65 @@
<Ww>
<count>0</count>
<WinNumber>2</WinNumber>
- <ItemText>RF_RX_temp</ItemText>
+ <ItemText>poll_rx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>RX_Buffer</ItemText>
+ <ItemText>temp_count,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>DEFAULT_FREQ</ItemText>
+ <ItemText>group_id</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>DEFAULT_SF</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>RF_RX_temp</ItemText>
+ <ItemText>temp_count3,0x0A</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>2</WinNumber>
- <ItemText>rx_buf</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>2</WinNumber>
- <ItemText>uwb_rxflag</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>2</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
+ <ItemText>tagdist_list</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>2</WinNumber>
- <ItemText>send_buffer</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>2</WinNumber>
- <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>2</WinNumber>
- <ItemText>range_timeout_us,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>2</WinNumber>
- <ItemText>time_count_dkjs,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>2</WinNumber>
- <ItemText>time_flag_lorarx,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>2</WinNumber>
- <ItemText>UwbRange</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>2</WinNumber>
- <ItemText>time_count_sdsj,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>2</WinNumber>
- <ItemText>UWB_fachu_count</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>2</WinNumber>
- <ItemText>UWB_shoudao_count</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>2</WinNumber>
- <ItemText>lora_huanxing_count</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>2</WinNumber>
- <ItemText>UWB_qiangzhanfachu_count</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>2</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>8</SubType>
- <ItemText>applyid</ItemText>
+ <ItemText>buffer</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
+ <MemoryWindow2>
+ <Mm>
+ <WinNumber>2</WinNumber>
+ <SubType>1</SubType>
+ <ItemText>lora_sendbuffer</ItemText>
+ <AccSizeX>0</AccSizeX>
+ </Mm>
+ </MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@@ -495,7 +443,7 @@
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
- <StkLoc>1</StkLoc>
+ <StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
@@ -518,7 +466,7 @@
<Group>
<GroupName>Algo</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -562,7 +510,7 @@
<Group>
<GroupName>Device</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -594,7 +542,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -910,6 +858,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>32</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\PCA9555.c</PathWithFileName>
+ <FilenameWithoutPath>PCA9555.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>3</GroupNumber>
+ <FileNumber>33</FileNumber>
+ <FileType>5</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\drivers\PCA9555.h</PathWithFileName>
+ <FilenameWithoutPath>PCA9555.h</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -920,7 +892,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -932,7 +904,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -944,7 +916,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -956,7 +928,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -968,7 +940,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -980,7 +952,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -992,7 +964,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1004,7 +976,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1016,7 +988,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1028,7 +1000,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1040,7 +1012,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1052,7 +1024,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1064,7 +1036,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1076,7 +1048,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1090,13 +1062,13 @@
<Group>
<GroupName>OS</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1108,7 +1080,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1120,7 +1092,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1132,7 +1104,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1144,7 +1116,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1156,7 +1128,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1168,7 +1140,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1180,7 +1152,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1192,7 +1164,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1204,7 +1176,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1218,13 +1190,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>56</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1236,7 +1208,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1248,9 +1220,9 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\include\components\wsf\sources\platform\pal_uart.c</PathWithFileName>
@@ -1270,13 +1242,13 @@
<Group>
<GroupName>Utility</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1288,7 +1260,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1302,13 +1274,13 @@
<Group>
<GroupName>HidoLib</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1328,7 +1300,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1340,7 +1312,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1352,7 +1324,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1364,7 +1336,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1376,7 +1348,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1388,7 +1360,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1400,7 +1372,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1420,7 +1392,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1430,27 +1402,83 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ </Group>
+
+ <Group>
+ <GroupName>radio</GroupName>
+ <tvExp>1</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <cbSel>0</cbSel>
+ <RteFlg>0</RteFlg>
<File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>70</FileNumber>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_port.c</PathWithFileName>
- <FilenameWithoutPath>pan_port.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\lora_1268.c</PathWithFileName>
+ <FilenameWithoutPath>lora_1268.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
- <FileNumber>71</FileNumber>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_rf.c</PathWithFileName>
- <FilenameWithoutPath>pan_rf.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName>
+ <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>74</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>75</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\sx126x-board.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x-board.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>76</FileNumber>
+ <FileType>5</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\lora_1268.h</PathWithFileName>
+ <FilenameWithoutPath>lora_1268.h</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>77</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\Radio\delay.c</PathWithFileName>
+ <FilenameWithoutPath>delay.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
--
Gitblit v1.9.3