From 812f8c1cfc7a5dadca5a904fc808e51a2d5af50f Mon Sep 17 00:00:00 2001
From: QuakeGod <QuakeGod@sina.com>
Date: 星期一, 17 十月 2022 23:53:28 +0800
Subject: [PATCH] merge from master and fix files
---
MDK-ARM/F030C8T6_Test2.uvoptx | 152 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 152 insertions(+), 0 deletions(-)
diff --git a/MDK-ARM/F030C8T6_Test2.uvoptx b/MDK-ARM/F030C8T6_Test2.uvoptx
index 37e0b13..2b1ec5f 100644
--- a/MDK-ARM/F030C8T6_Test2.uvoptx
+++ b/MDK-ARM/F030C8T6_Test2.uvoptx
@@ -106,7 +106,11 @@
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
<sDlgPa></sDlgPa>
+<<<<<<< HEAD
+ <sIfile>.\debug.ini</sIfile>
+=======
<sIfile></sIfile>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<tDll></tDll>
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
@@ -118,7 +122,13 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
+<<<<<<< HEAD
+ <Name>H姒�
+`顕晇H姒�
+</Name>
+=======
<Name>H姒�
`顕晇H姒�
</Name>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -151,6 +161,9 @@
<Name>UL2CM3(-S0 -C0 -P0 ) -FN1 -FC1000 -FD20000000 -FF0STM32F0xx_64 -FL010000 -FS08000000 -FP0($$Device:STM32F030C8Tx$CMSIS\Flash\STM32F0xx_64.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
+<<<<<<< HEAD
+ <Breakpoint/>
+=======
<Breakpoint>
<Bp>
<Number>0</Number>
@@ -169,6 +182,7 @@
<Expression>\\\../Src/main.c\450</Expression>
</Bp>
</Breakpoint>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<WatchWindow1>
<Ww>
<count>0</count>
@@ -235,6 +249,8 @@
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
+<<<<<<< HEAD
+=======
<SystemViewers>
<Entry>
<Name>System Viewer\ADC</Name>
@@ -257,6 +273,7 @@
<WinId>35902</WinId>
</Entry>
</SystemViewers>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<DebugDescription>
<Enable>1</Enable>
<EnableLog>0</EnableLog>
@@ -308,7 +325,11 @@
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
+<<<<<<< HEAD
+ <tvExp>1</tvExp>
+=======
<tvExp>0</tvExp>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Src\GlobalDef.c</PathWithFileName>
@@ -455,6 +476,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+<<<<<<< HEAD
+=======
<PathWithFileName>..\Src\FP0.c</PathWithFileName>
<FilenameWithoutPath>FP0.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -467,6 +490,7 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<PathWithFileName>..\Src\debug.c</PathWithFileName>
<FilenameWithoutPath>debug.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -482,7 +506,11 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>16</FileNumber>
+=======
<FileNumber>17</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -502,7 +530,11 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>17</FileNumber>
+=======
<FileNumber>18</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -514,7 +546,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>18</FileNumber>
+=======
<FileNumber>19</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -526,7 +562,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>19</FileNumber>
+=======
<FileNumber>20</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -538,7 +578,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>20</FileNumber>
+=======
<FileNumber>21</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -550,7 +594,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>21</FileNumber>
+=======
<FileNumber>22</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -562,7 +610,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>22</FileNumber>
+=======
<FileNumber>23</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -574,7 +626,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>23</FileNumber>
+=======
<FileNumber>24</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -586,7 +642,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>24</FileNumber>
+=======
<FileNumber>25</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -598,7 +658,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>25</FileNumber>
+=======
<FileNumber>26</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -610,7 +674,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>26</FileNumber>
+=======
<FileNumber>27</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -622,7 +690,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>27</FileNumber>
+=======
<FileNumber>28</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -634,7 +706,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>28</FileNumber>
+=======
<FileNumber>29</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -646,7 +722,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>29</FileNumber>
+=======
<FileNumber>30</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -658,7 +738,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>30</FileNumber>
+=======
<FileNumber>31</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -670,7 +754,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>31</FileNumber>
+=======
<FileNumber>32</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -682,7 +770,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>32</FileNumber>
+=======
<FileNumber>33</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -694,7 +786,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>33</FileNumber>
+=======
<FileNumber>34</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -706,7 +802,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>34</FileNumber>
+=======
<FileNumber>35</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -718,7 +818,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>35</FileNumber>
+=======
<FileNumber>36</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -730,7 +834,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>36</FileNumber>
+=======
<FileNumber>37</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -742,7 +850,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>37</FileNumber>
+=======
<FileNumber>38</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -754,7 +866,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>38</FileNumber>
+=======
<FileNumber>39</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -766,7 +882,11 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>39</FileNumber>
+=======
<FileNumber>40</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -780,13 +900,21 @@
<Group>
<GroupName>Drivers/W5500</GroupName>
+<<<<<<< HEAD
+ <tvExp>1</tvExp>
+=======
<tvExp>0</tvExp>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>40</FileNumber>
+=======
<FileNumber>41</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -798,7 +926,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>41</FileNumber>
+=======
<FileNumber>42</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -810,7 +942,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>42</FileNumber>
+=======
<FileNumber>43</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -822,7 +958,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>43</FileNumber>
+=======
<FileNumber>44</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -834,7 +974,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>44</FileNumber>
+=======
<FileNumber>45</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -846,7 +990,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>45</FileNumber>
+=======
<FileNumber>46</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -858,7 +1006,11 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
+<<<<<<< HEAD
+ <FileNumber>46</FileNumber>
+=======
<FileNumber>47</FileNumber>
+>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.1