From dbdff32c9e492abf93f618efe526d0961428bd88 Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 17 三月 2021 09:51:18 +0800
Subject: [PATCH] 修改固定IDbug
---
MDK-ARM/L051.uvoptx | 279 +++++++++++++++++++++++++++----------------------------
1 files changed, 136 insertions(+), 143 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 38409f6..2601f80 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -8,7 +8,7 @@
<Extensions>
<cExt>*.c</cExt>
<aExt>*.s*; *.src; *.a*</aExt>
- <oExt>*.obj</oExt>
+ <oExt>*.obj; *.o</oExt>
<lExt>*.lib</lExt>
<tExt>*.txt; *.h; *.inc</tExt>
<pExt>*.plm</pExt>
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,120 +162,85 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>998</LineNumber>
+ <LineNumber>490</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134255062</Address>
+ <Address>134265024</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\application\dw_app.c</Filename>
+ <Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\998</Expression>
+ <Expression>\\L051\../Src/main.c\490</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
+ <ItemText>motor_keeptime</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>true_nearbase_idlist</ItemText>
+ <ItemText>motor_keeptime</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
+ <ItemText>test_motor</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>motor_ontime</ItemText>
+ <ItemText>dev_id</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>nomove_count</ItemText>
+ <ItemText>status_reg</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>module_power,0x0A</ItemText>
+ <ItemText>frame_seq_nb%255,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
+ <ItemText>recbase_num</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>slotpos_intoatl,0x0A</ItemText>
+ <ItemText>flag_finalsend</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>key_keeptime</ItemText>
+ <ItemText>current_slotnum,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>sync_timer,0x0A</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>tagslotpos,0x0A</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>minid</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp_dist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>nearbase_switchdistlist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbaseid</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_lost_count</ItemText>
+ <ItemText>slotpos_intoatl,0x0A</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -294,7 +259,7 @@
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
- <ItemText>headerBuffer</ItemText>
+ <ItemText>&hardware_version</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -304,7 +269,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -388,6 +353,42 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>3</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>2</GroupNumber>
+ <FileNumber>4</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>2</GroupNumber>
+ <FileNumber>5</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\decadriver\dw_driver.c</PathWithFileName>
+ <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -398,7 +399,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>3</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -410,7 +411,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -422,7 +423,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -435,34 +436,14 @@
</Group>
<Group>
- <GroupName>ExternalDevices</GroupName>
- <tvExp>1</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <cbSel>0</cbSel>
- <RteFlg>0</RteFlg>
- <File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>6</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>..\Src\ExternalDevices\dw_driver.c</PathWithFileName>
- <FilenameWithoutPath>dw_driver.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
- </Group>
-
- <Group>
<GroupName>OnChipDevices</GroupName>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>7</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -473,8 +454,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>8</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -485,8 +466,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>9</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -497,8 +478,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>5</GroupNumber>
- <FileNumber>10</FileNumber>
+ <GroupNumber>4</GroupNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -525,8 +506,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>11</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -537,8 +518,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>12</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -549,8 +530,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>7</GroupNumber>
- <FileNumber>13</FileNumber>
+ <GroupNumber>6</GroupNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -569,8 +550,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>14</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -581,8 +562,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>15</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -593,8 +574,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -613,8 +594,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>17</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -625,8 +606,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>18</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -637,8 +618,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -649,8 +630,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>20</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -661,8 +642,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>21</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -673,8 +654,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>22</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -685,8 +666,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>23</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -697,8 +678,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>24</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -709,8 +690,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>25</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -721,8 +702,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>26</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -733,8 +714,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>27</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -745,8 +726,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>28</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -757,8 +738,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>29</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -769,8 +750,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>30</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -781,8 +762,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>31</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -793,8 +774,20 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>32</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>34</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_exti.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -805,8 +798,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>33</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -817,8 +810,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>34</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -829,8 +822,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>35</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -841,8 +834,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>36</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -853,8 +846,8 @@
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>9</GroupNumber>
- <FileNumber>37</FileNumber>
+ <GroupNumber>8</GroupNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -873,8 +866,8 @@
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
- <GroupNumber>10</GroupNumber>
- <FileNumber>38</FileNumber>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3