merge from master and fix files

QuakeGod

2022-10-17 812f8c1cfc7a5dadca5a904fc808e51a2d5af50f

 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,9 +122,13 @@
        <SetRegEntry>
          <Number>0</Number>
          <Key>DLGUARM</Key>
<<<<<<< HEAD
          <Name>H榱
`vH榱
</Name>
=======
          <Name>H榱
`vH榱
</Name>
>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
        </SetRegEntry>
        <SetRegEntry>
          <Number>0</Number>
@@ -153,7 +161,28 @@
          <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>
          <Type>0</Type>
          <LineNumber>450</LineNumber>
          <EnabledFlag>1</EnabledFlag>
          <Address>134233536</Address>
          <ByteObject>0</ByteObject>
          <HtxType>0</HtxType>
          <ManyObjects>0</ManyObjects>
          <SizeOfObject>0</SizeOfObject>
          <BreakByAccess>0</BreakByAccess>
          <BreakIfRCount>1</BreakIfRCount>
          <Filename>../Src/main.c</Filename>
          <ExecCommand></ExecCommand>
          <Expression>\\\../Src/main.c\450</Expression>
        </Bp>
      </Breakpoint>
>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
      <WatchWindow1>
        <Ww>
          <count>0</count>
@@ -220,6 +249,31 @@
      <pszMrule></pszMrule>
      <pSingCmds></pSingCmds>
      <pMultCmds></pMultCmds>
<<<<<<< HEAD
=======
      <SystemViewers>
        <Entry>
          <Name>System Viewer\ADC</Name>
          <WinId>35904</WinId>
        </Entry>
        <Entry>
          <Name>System Viewer\NVIC</Name>
          <WinId>35905</WinId>
        </Entry>
        <Entry>
          <Name>System Viewer\RCC</Name>
          <WinId>35903</WinId>
        </Entry>
        <Entry>
          <Name>System Viewer\TIM6</Name>
          <WinId>35901</WinId>
        </Entry>
        <Entry>
          <Name>System Viewer\USART2</Name>
          <WinId>35902</WinId>
        </Entry>
      </SystemViewers>
>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
      <DebugDescription>
        <Enable>1</Enable>
        <EnableLog>0</EnableLog>
@@ -271,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>
@@ -418,6 +476,21 @@
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
<<<<<<< HEAD
=======
      <PathWithFileName>..\Src\FP0.c</PathWithFileName>
      <FilenameWithoutPath>FP0.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
      <bShared>0</bShared>
    </File>
    <File>
      <GroupNumber>2</GroupNumber>
      <FileNumber>16</FileNumber>
      <FileType>1</FileType>
      <tvExp>0</tvExp>
      <tvExpOptDlg>0</tvExpOptDlg>
      <bDave2>0</bDave2>
>>>>>>> c97b4c545c76ab6dbf5ce168015d87818034f3e2
      <PathWithFileName>..\Src\debug.c</PathWithFileName>
      <FilenameWithoutPath>debug.c</FilenameWithoutPath>
      <RteFlg>0</RteFlg>
@@ -433,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>
@@ -453,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>
@@ -465,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>
@@ -477,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>
@@ -489,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>
@@ -501,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>
@@ -513,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>
@@ -525,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>
@@ -537,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>
@@ -549,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>
@@ -561,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>
@@ -573,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>
@@ -585,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>
@@ -597,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>
@@ -609,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>
@@ -621,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>
@@ -633,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>
@@ -645,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>
@@ -657,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>
@@ -669,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>
@@ -681,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>
@@ -693,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>
@@ -705,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>
@@ -717,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>
@@ -731,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>
@@ -749,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>
@@ -761,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>
@@ -773,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>
@@ -785,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>
@@ -797,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>
@@ -809,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>