From c0a472466cd8e8e1fa66354b8d8e3fabce758765 Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期三, 28 八月 2024 15:30:24 +0800
Subject: [PATCH] Merge branch '安邦测距手环' of http://47.108.70.204:60062/r/ChinaUWBProject into 安邦测距手环
---
keil/uwb_simple_example.uvoptx | 336 ++++++++++++++++++++++++++++++-------------------------
1 files changed, 184 insertions(+), 152 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index 738f1ab..2a1ffb4 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -119,13 +119,8 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
- <Key>DLGUARM</Key>
- <Name>d</Name>
- </SetRegEntry>
- <SetRegEntry>
- <Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name>
+ <Name>-U20090928 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -148,45 +143,142 @@
<Name></Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>71</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>23696</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>.\include\src\TCPClient.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\uwb_simple_example\include/src/TCPClient.c\71</Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>75</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>23744</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>.\include\src\TCPClient.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\uwb_simple_example\include/src/TCPClient.c\75</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>nomove_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_timeout_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>2</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_wait_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>3</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>moter_open_uwb_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>4</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_open_air_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>6</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_need_data_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>7</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>UWB_Work_State</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>distance,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>anchordata_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack_now,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_uwb_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>12</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>13</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>mUsart2ReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>14</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>uwb_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>15</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>receive_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>16</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>recev_error_num,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_rpt</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>UWB_work_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>recev_error_num,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>poll_rx_ts_i64</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>resp_tx_ts_i64</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_power_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>gps_prase_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>state5V_prase_flag</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -203,7 +295,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -288,7 +380,7 @@
<Group>
<GroupName>Device</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -740,6 +832,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>40</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\src\gps.c</PathWithFileName>
+ <FilenameWithoutPath>gps.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>41</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>
</Group>
<Group>
@@ -750,7 +866,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -762,7 +878,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -774,7 +890,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -786,7 +902,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -798,7 +914,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -810,7 +926,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -822,7 +938,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -834,7 +950,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -846,7 +962,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -858,7 +974,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -872,13 +988,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>50</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -890,7 +1006,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -902,7 +1018,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -916,94 +1032,10 @@
<Group>
<GroupName>Simple</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>53</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\simple_ss_twr_dw_resp.c</PathWithFileName>
- <FilenameWithoutPath>simple_ss_twr_dw_resp.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>54</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_init\simple_ds_twr_init.c</PathWithFileName>
- <FilenameWithoutPath>simple_ds_twr_init.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>55</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_init_sts\simple_ds_twr_init_sts.c</PathWithFileName>
- <FilenameWithoutPath>simple_ds_twr_init_sts.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>56</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_resp\simple_ds_twr_resp.c</PathWithFileName>
- <FilenameWithoutPath>simple_ds_twr_resp.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>57</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_ds_twr_resp_sts\simple_ds_twr_resp_sts.c</PathWithFileName>
- <FilenameWithoutPath>simple_ds_twr_resp_sts.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>58</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_rx\simple_rx.c</PathWithFileName>
- <FilenameWithoutPath>simple_rx.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- <File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>59</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\include\src\uwb_examples\uwb_simple_example\simple_tx\simple_tx.c</PathWithFileName>
- <FilenameWithoutPath>simple_tx.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
</Group>
<Group>
@@ -1014,7 +1046,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1026,7 +1058,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1046,7 +1078,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1066,7 +1098,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1078,7 +1110,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1090,7 +1122,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1102,7 +1134,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1114,7 +1146,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1126,7 +1158,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1138,7 +1170,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1158,7 +1190,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3