From 8217c70984ac4feb7bfc952e4f6e944bf824527d Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 06 五月 2025 16:51:53 +0800
Subject: [PATCH] Merge branch 'MK大工卡-低精度GPS-1/5HZ' of http://47.108.70.204:60062/r/ChinaUWBProject into MK大工卡-低精度GPS-1/5HZ
---
keil/uwb_simple_example.uvoptx | 128 ++++++++++++++++++++++++++++--------------
1 files changed, 85 insertions(+), 43 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index bf0a81e..4cc21f9 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -275,37 +275,67 @@
<Ww>
<count>0</count>
<WinNumber>2</WinNumber>
- <ItemText>rec_ancdistlist[0],0x0A</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>rec_ancdistlist[1]</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>tagofflinetime[0]</ItemText>
+ <ItemText>tagdist_list</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>tagofflinetime[1]</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
+ <ItemText>group_id,0x0A</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>2</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>2</WinNumber>
- <ItemText>tagdist_list</ItemText>
+ <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>nomove_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tag_id_recv</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>group_id</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>group_id</ItemText>
+ </Ww>
+ <Ww>
+ <count>12</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
@@ -322,7 +352,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -439,7 +469,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -830,8 +860,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>
@@ -842,8 +872,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>
@@ -1015,6 +1045,18 @@
<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>
</Group>
<Group>
@@ -1025,7 +1067,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1037,7 +1079,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1049,7 +1091,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1061,7 +1103,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1073,7 +1115,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1085,7 +1127,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1097,7 +1139,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1109,7 +1151,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1121,7 +1163,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1133,7 +1175,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1153,7 +1195,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1165,7 +1207,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1177,7 +1219,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1205,7 +1247,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1217,7 +1259,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1237,7 +1279,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1249,7 +1291,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1269,7 +1311,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1281,7 +1323,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1293,7 +1335,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1305,7 +1347,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1317,7 +1359,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1329,7 +1371,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1341,7 +1383,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1353,7 +1395,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1365,7 +1407,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>78</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1377,7 +1419,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>79</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1389,7 +1431,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>80</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1401,7 +1443,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>81</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1421,7 +1463,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>82</FileNumber>
+ <FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3