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 | 114 ++++++++++++++++++++++++++------------------------------
1 files changed, 53 insertions(+), 61 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index c3afdb3..4cc21f9 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -315,47 +315,27 @@
<Ww>
<count>8</count>
<WinNumber>2</WinNumber>
- <ItemText>TAG_KEEPTIMES</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>2</WinNumber>
- <ItemText>TAG_KEEPTIMES</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>2</WinNumber>
- <ItemText>dev_id</ItemText>
+ <ItemText>group_id</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>2</WinNumber>
- <ItemText>nomove_count</ItemText>
+ <ItemText>group_id</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>2</WinNumber>
- <ItemText>deep_sleep_falg</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>2</WinNumber>
- <ItemText>uwb_time_count</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>2</WinNumber>
- <ItemText>state_start_time</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>2</WinNumber>
- <ItemText>elapsed_time_jibu</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
@@ -372,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>
@@ -489,7 +469,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -880,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>
@@ -892,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>
@@ -1065,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>
@@ -1075,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>
@@ -1087,7 +1079,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1099,7 +1091,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1111,7 +1103,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1123,7 +1115,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1135,7 +1127,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1147,7 +1139,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1159,7 +1151,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1171,7 +1163,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1183,7 +1175,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1203,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>
@@ -1215,7 +1207,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1227,7 +1219,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1255,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>
@@ -1267,7 +1259,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1287,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>
@@ -1299,7 +1291,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1319,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>
@@ -1331,7 +1323,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1343,7 +1335,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>72</FileNumber>
+ <FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1355,7 +1347,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>73</FileNumber>
+ <FileNumber>74</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1367,7 +1359,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>74</FileNumber>
+ <FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1379,7 +1371,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>75</FileNumber>
+ <FileNumber>76</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1391,7 +1383,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>76</FileNumber>
+ <FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1403,7 +1395,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>77</FileNumber>
+ <FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1415,7 +1407,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>78</FileNumber>
+ <FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1427,7 +1419,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>79</FileNumber>
+ <FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1439,7 +1431,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>80</FileNumber>
+ <FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1451,7 +1443,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>81</FileNumber>
+ <FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1471,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