From 41776246aed24b42e1d05da230f6f114e02c87b6 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期日, 27 五月 2018 17:39:52 +0800
Subject: [PATCH] 增加低通滤波与渐进报警功能
---
源码/核心板/MDK-ARM/Project.uvoptx | 185 ++++++++++++++++++++++++++-------------------
1 files changed, 107 insertions(+), 78 deletions(-)
diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
index 4e5c0c6..e8abde3 100644
--- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
+++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx"
@@ -101,8 +101,6 @@
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
- <bSchkAxf>0</bSchkAxf>
- <bTchkAxf>0</bTchkAxf>
<nTsel>3</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
@@ -159,6 +157,21 @@
<WinNumber>1</WinNumber>
<ItemText>dist_cm</ItemText>
</Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_beep_on_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>2</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_beep_off_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>3</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>dis_after_filter</ItemText>
+ </Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
@@ -214,10 +227,6 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
- <pMisraNamep></pMisraNamep>
- <pszMrulep></pszMrulep>
- <pSingCmdsp></pSingCmdsp>
- <pMultCmdsp></pMultCmdsp>
<DebugDescription>
<Enable>1</Enable>
<EnableLog>0</EnableLog>
@@ -249,7 +258,7 @@
<Group>
<GroupName>User</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -280,8 +289,8 @@
</Group>
<Group>
- <GroupName>decadriver</GroupName>
- <tvExp>1</tvExp>
+ <GroupName>algorithm</GroupName>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -292,16 +301,36 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>..\Src\algorithm\filters.c</PathWithFileName>
+ <FilenameWithoutPath>filters.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ </Group>
+
+ <Group>
+ <GroupName>decadriver</GroupName>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <cbSel>0</cbSel>
+ <RteFlg>0</RteFlg>
+ <File>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>5</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
<PathWithFileName>..\Src\decadriver\deca_device.c</PathWithFileName>
<FilenameWithoutPath>deca_device.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>3</GroupNumber>
- <FileNumber>5</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Src\decadriver\deca_params_init.c</PathWithFileName>
@@ -310,8 +339,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>3</GroupNumber>
- <FileNumber>6</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -330,8 +359,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>7</FileNumber>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -342,8 +371,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>8</FileNumber>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -354,8 +383,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>9</FileNumber>
+ <GroupNumber>5</GroupNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -374,8 +403,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>10</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -386,8 +415,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>11</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -398,8 +427,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>12</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -418,8 +447,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>13</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -430,8 +459,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>14</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -442,8 +471,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>15</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -454,8 +483,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>16</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -466,8 +495,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>17</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -478,8 +507,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>18</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -490,8 +519,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>19</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -502,8 +531,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>20</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -514,8 +543,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>21</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -526,8 +555,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>22</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -538,8 +567,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>23</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -550,8 +579,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>24</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -562,8 +591,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>25</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -574,8 +603,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>26</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -586,8 +615,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>27</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -598,8 +627,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>28</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -610,8 +639,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>29</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -622,8 +651,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>30</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -634,8 +663,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>31</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -646,8 +675,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>32</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -658,8 +687,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>33</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -670,8 +699,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>34</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -682,8 +711,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>6</GroupNumber>
- <FileNumber>35</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -702,8 +731,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>36</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -714,8 +743,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>37</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -726,8 +755,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>38</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>39</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3