From 1b83e716601b4c7ba981a00be6ecf24a9d549d52 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 20 一月 2021 10:18:56 +0800
Subject: [PATCH] V2.20 1.增加静止时间判定参数，测距有BUG抖动较大
---
MDK-ARM/L051.uvoptx | 225 +++++++++++++++++++++++++++++---------------------------
1 files changed, 117 insertions(+), 108 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 898072b..0b27e07 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -8,7 +8,7 @@
<Extensions>
<cExt>*.c</cExt>
<aExt>*.s*; *.src; *.a*</aExt>
- <oExt>*.obj</oExt>
+ <oExt>*.obj; *.o</oExt>
<lExt>*.lib</lExt>
<tExt>*.txt; *.h; *.inc</tExt>
<pExt>*.plm</pExt>
@@ -158,24 +158,7 @@
<Name>-U066CFF564948897767122910 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>860</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134254430</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\application\dw_app.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\860</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -352,6 +335,16 @@
<WinNumber>1</WinNumber>
<ItemText>motor_keeptime</ItemText>
</Ww>
+ <Ww>
+ <count>35</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>stationary_flag</ItemText>
+ </Ww>
+ <Ww>
+ <count>36</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nomove_count</ItemText>
+ </Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
@@ -463,6 +456,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>3</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\ExternalDevices\dps310.c</PathWithFileName>
+ <FilenameWithoutPath>dps310.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>4</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\ExternalDevices\dps368_test.c</PathWithFileName>
+ <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>5</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\decadriver\dw_driver.c</PathWithFileName>
+ <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -473,7 +502,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>3</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -485,7 +514,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -497,7 +526,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -510,34 +539,14 @@
</Group>
<Group>
- <GroupName>ExternalDevices</GroupName>
- <tvExp>1</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <cbSel>0</cbSel>
- <RteFlg>0</RteFlg>
- <File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>6</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\Src\ExternalDevices\dw_driver.c</PathWithFileName>
- <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- </Group>
-
- <Group>
<GroupName>OnChipDevices</GroupName>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>7</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -548,8 +557,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>8</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -560,8 +569,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>9</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -572,8 +581,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>10</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -600,8 +609,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>11</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -612,8 +621,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>12</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -624,8 +633,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>13</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -644,8 +653,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>14</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -656,8 +665,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>15</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -668,8 +677,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -688,8 +697,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>17</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -700,8 +709,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>18</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -712,8 +721,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -724,8 +733,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>20</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -736,8 +745,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>21</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -748,8 +757,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>22</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -760,8 +769,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>23</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -772,8 +781,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>24</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -784,8 +793,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>25</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -796,8 +805,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>26</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -808,8 +817,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>27</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -820,8 +829,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>28</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -832,8 +841,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>29</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -844,8 +853,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>30</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -856,8 +865,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>31</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -868,8 +877,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>32</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -880,8 +889,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>33</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -892,8 +901,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>34</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -904,8 +913,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>35</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -916,8 +925,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>36</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -928,8 +937,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>37</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -940,8 +949,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>38</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -960,8 +969,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>39</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3