From 8ce130f6cc614e60783c162153dc438ee43ad460 Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期五, 17 九月 2021 16:52:43 +0800 Subject: [PATCH] V2.26 --- 源码/核心板/MDK-ARM/Project.uvoptx | 182 +++++++++++++++++++++------------------------ 1 files changed, 84 insertions(+), 98 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 8ce029b..feca54d 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" @@ -26,7 +26,7 @@ <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> - <CLKADS>12000000</CLKADS> + <CLKADS>8000000</CLKADS> <OPTTT> <gFlags>1</gFlags> <BeepAtEnd>1</BeepAtEnd> @@ -119,6 +119,11 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>ULP2CM3</Key> + <Name>-UV0010M9E -O2254 -S8 -C0 -P00000000 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP11 -TDX0 -TDD0 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name> + </SetRegEntry> + <SetRegEntry> + <Number>0</Number> <Key>CMSIS_AGDI</Key> <Name>-X"ATK-HSWL-CMSIS-DAP" -UATK 20190528 -O2254 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103C8$Flash\STM32F10x_128.FLM)</Name> </SetRegEntry> @@ -150,7 +155,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=747,81,1158,476,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=150,26,744,720,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=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name> + <Name>(1010=-1,-1,-1,-1,0)(1007=108,145,295,420,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=18,3,664,676,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,1)(121=1005,0,1426,405,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=150,26,744,720,0)(133=-1,-1,-1,-1,0)(160=475,231,923,645,0)(161=167,212,615,626,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=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -163,97 +168,42 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_num</ItemText> + <ItemText>DMACnt</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>rec_times1,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>next_nearbase_num</ItemText> + <ItemText>rec_times2,0x0A</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist,0x0A</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>1</WinNumber> - <ItemText>tagdist_list</ItemText> - </Ww> - <Ww> - <count>10</count> - <WinNumber>1</WinNumber> - <ItemText>tagid_list</ItemText> - </Ww> - <Ww> - <count>11</count> - <WinNumber>1</WinNumber> - <ItemText>QUIT_SLOT_TIME</ItemText> - </Ww> - <Ww> - <count>12</count> - <WinNumber>1</WinNumber> - <ItemText>taglist_num</ItemText> - </Ww> - <Ww> - <count>13</count> - <WinNumber>1</WinNumber> - <ItemText>synclost_timer,0x0A</ItemText> - </Ww> - <Ww> - <count>14</count> - <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist[j]</ItemText> - </Ww> - <Ww> - <count>17</count> - <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist</ItemText> - </Ww> - <Ww> - <count>18</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>module_power,0x0A</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -478,7 +428,7 @@ <Group> <GroupName>ExternalDevices</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -518,6 +468,42 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>5</GroupNumber> + <FileNumber>14</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>5</GroupNumber> + <FileNumber>15</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>5</GroupNumber> + <FileNumber>16</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\ExternalDevices\lis3dh_driver.c</PathWithFileName> + <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -528,7 +514,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -540,7 +526,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -552,7 +538,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -564,7 +550,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -576,7 +562,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -588,7 +574,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -608,7 +594,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -620,7 +606,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -632,7 +618,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -644,7 +630,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -656,7 +642,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -668,7 +654,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -680,7 +666,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -692,7 +678,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -704,7 +690,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -716,7 +702,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -728,7 +714,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -740,7 +726,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -752,7 +738,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -764,7 +750,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -776,7 +762,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -788,7 +774,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -800,7 +786,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -812,7 +798,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -824,7 +810,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -836,7 +822,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -848,7 +834,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -860,7 +846,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -872,7 +858,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -892,7 +878,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -904,7 +890,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -916,7 +902,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>48</FileNumber> <FileType>2</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3