From 0e4f298824b83e1a1e81ec8ced2e6c007a1c8961 Mon Sep 17 00:00:00 2001
From: guanjiao <sqrgj@163.com>
Date: 星期三, 29 八月 2018 21:10:40 +0800
Subject: [PATCH] 1. 修改为外部晶振 2. 修改led与蜂鸣器pin角
---
源码/核心板/MDK-ARM/Project.uvoptx | 208 +++++++++++++++++++++++++++++++---------------------
1 files changed, 124 insertions(+), 84 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 ef378e0..92fc17d 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"
@@ -77,7 +77,7 @@
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
- <CpuCode>18</CpuCode>
+ <CpuCode>255</CpuCode>
<DebugOpt>
<uSim>0</uSim>
<uTrg>1</uTrg>
@@ -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>
@@ -119,7 +117,8 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
- <Key>DLGUARM</Key>
+ <Key>UL2CM3</Key>
+ <Name>-UV0010M9E -O2254 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -128,8 +127,8 @@
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
- <Key>UL2CM3</Key>
- <Name>-UV0010M9E -O2254 -S0 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FN1 -FC1000 -FD20000000 -FF0STM32F10x_128 -FL020000 -FS08000000 -FP0($$Device:STM32F103T8$Flash\STM32F10x_128.FLM)</Name>
+ <Key>DLGUARM</Key>
+ <Name>顭�?</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -144,7 +143,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
- <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
+ <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -158,6 +157,31 @@
<count>0</count>
<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>
+ <Ww>
+ <count>4</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_beep_off_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>5</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>status_reg</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -182,7 +206,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -214,10 +238,6 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
- <pMisraNamep></pMisraNamep>
- <pszMrulep></pszMrulep>
- <pSingCmdsp></pSingCmdsp>
- <pMultCmdsp></pMultCmdsp>
<DebugDescription>
<Enable>1</Enable>
<EnableLog>0</EnableLog>
@@ -229,7 +249,7 @@
<Group>
<GroupName>App</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -249,7 +269,7 @@
<Group>
<GroupName>User</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -280,7 +300,7 @@
</Group>
<Group>
- <GroupName>decadriver</GroupName>
+ <GroupName>algorithm</GroupName>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
@@ -292,14 +312,34 @@
<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>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -310,8 +350,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 +370,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 +382,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 +394,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>
@@ -369,13 +409,13 @@
<Group>
<GroupName>OnChipDevices</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<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 +426,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 +438,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 +458,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 +470,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 +482,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 +494,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 +506,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 +518,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 +530,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 +542,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 +554,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 +566,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 +578,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 +590,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 +602,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 +614,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 +626,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 +638,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 +650,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 +662,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 +674,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 +686,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 +698,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 +710,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 +722,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 +742,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 +754,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 +766,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