From 08f19873a4a31b79da6f5438a936568b0c6c5b48 Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期二, 11 三月 2025 17:31:14 +0800 Subject: [PATCH] 蓝牙转发添加进去,测试正常,现在的逻辑是3s唤醒一次测距 --- keil/uwb_simple_example.uvoptx | 318 ++++++++++++++++++++++++++++++++++------------------ 1 files changed, 208 insertions(+), 110 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 23449a8..959e193 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> @@ -148,56 +148,7 @@ <Name></Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>357</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>7534</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-閺嶅洨顒�-RX\keil\uwb_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression>\\uwb_simple_example\../keil/uwb_app.c\357</Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>214</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>0</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>0</BreakIfRCount> - <Filename>.\uwb_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - <Bp> - <Number>2</Number> - <Type>0</Type> - <LineNumber>231</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>0</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>0</BreakIfRCount> - <Filename>.\uwb_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -389,62 +340,105 @@ <WinNumber>1</WinNumber> <ItemText>rx_rpt</ItemText> </Ww> + <Ww> + <count>38</count> + <WinNumber>1</WinNumber> + <ItemText>current_count</ItemText> + </Ww> + <Ww> + <count>39</count> + <WinNumber>1</WinNumber> + <ItemText>end_receive_count</ItemText> + </Ww> + <Ww> + <count>40</count> + <WinNumber>1</WinNumber> + <ItemText>rec_nearbase_num</ItemText> + </Ww> </WatchWindow1> <WatchWindow2> <Ww> <count>0</count> <WinNumber>2</WinNumber> - <ItemText>ret</ItemText> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>rx_buf</ItemText> + <ItemText>temp_count,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>RADIO_FLAG_RXDONE</ItemText> + <ItemText>group_id</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>packet_received</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>rec_ancdistlist</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>2</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>rx_buf</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>2</WinNumber> - <ItemText>rx_rpt</ItemText> + <ItemText>tagdist_list</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>2</WinNumber> - <ItemText>range_timeout_us,0x0A</ItemText> + <ItemText>tagid_list</ItemText> + </Ww> + <Ww> + <count>9</count> + <WinNumber>2</WinNumber> + <ItemText>wltag_state</ItemText> + </Ww> + <Ww> + <count>10</count> + <WinNumber>2</WinNumber> + <ItemText>report_ancid</ItemText> + </Ww> + <Ww> + <count>11</count> + <WinNumber>2</WinNumber> + <ItemText>tagid_list</ItemText> + </Ww> + <Ww> + <count>12</count> + <WinNumber>2</WinNumber> + <ItemText>report_ancdist</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> @@ -469,7 +463,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> @@ -860,17 +854,65 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>30</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\mk_timer.c</PathWithFileName> + <FilenameWithoutPath>mk_timer.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>31</FileNumber> + <FileType>5</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\mk_timer.h</PathWithFileName> + <FilenameWithoutPath>mk_timer.h</FilenameWithoutPath> + <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> <GroupName>Main</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -882,7 +924,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -894,7 +936,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -906,7 +948,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -918,7 +960,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -930,7 +972,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -942,7 +984,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -954,7 +996,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -966,7 +1008,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -978,7 +1020,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -990,7 +1032,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1002,7 +1044,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1014,7 +1056,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1026,7 +1068,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1046,7 +1088,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1058,7 +1100,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>49</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1070,7 +1112,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>50</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1082,7 +1124,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>51</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1094,7 +1136,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>52</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1106,7 +1148,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1118,7 +1160,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1130,7 +1172,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1142,7 +1184,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1154,7 +1196,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1174,7 +1216,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1186,7 +1228,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1198,7 +1240,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1226,7 +1268,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1238,7 +1280,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1258,7 +1300,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>63</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1272,13 +1314,13 @@ <Group> <GroupName>Internet</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1290,7 +1332,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1302,7 +1344,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1314,7 +1356,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1326,7 +1368,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1338,7 +1380,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1350,7 +1392,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1370,7 +1412,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1380,27 +1422,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>68</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>69</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