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 | 310 +++++++++++++++++++++++---------------------------- 1 files changed, 138 insertions(+), 172 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 9d32b6e..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> @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>12</nTsel> + <nTsel>6</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -114,7 +114,7 @@ <tDlgDll></tDlgDll> <tDlgPa></tDlgPa> <tIfile></tIfile> - <pMon>BIN\CMSIS_AGDI.dll</pMon> + <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> <SetRegEntry> @@ -125,7 +125,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -162,147 +162,85 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>96</LineNumber> + <LineNumber>490</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134249236</Address> + <Address>134265024</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> <SizeOfObject>0</SizeOfObject> <BreakByAccess>0</BreakByAccess> <BreakIfRCount>1</BreakIfRCount> - <Filename>../Src/stm32l0xx_it.c</Filename> + <Filename>../Src/main.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/stm32l0xx_it.c\96</Expression> - </Bp> - <Bp> - <Number>1</Number> - <Type>0</Type> - <LineNumber>857</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134252504</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> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/dw_app.c\857</Expression> - </Bp> - <Bp> - <Number>2</Number> - <Type>0</Type> - <LineNumber>782</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>134252350</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> - <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/dw_app.c\782</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> + <ItemText>slotpos_intoatl,0x0A</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -321,7 +259,7 @@ <Mm> <WinNumber>1</WinNumber> <SubType>0</SubType> - <ItemText>headerBuffer</ItemText> + <ItemText>&hardware_version</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -331,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> @@ -415,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> @@ -425,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> @@ -437,7 +411,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -449,7 +423,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -462,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> @@ -500,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> @@ -512,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> @@ -524,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> @@ -552,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> @@ -564,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> @@ -576,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> @@ -596,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> @@ -608,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> @@ -620,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> @@ -640,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> @@ -652,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> @@ -664,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> @@ -676,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> @@ -688,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> @@ -700,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> @@ -712,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> @@ -724,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> @@ -736,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> @@ -748,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> @@ -760,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> @@ -772,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> @@ -784,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> @@ -796,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> @@ -808,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> @@ -820,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> @@ -832,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> @@ -844,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> @@ -856,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> @@ -868,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> @@ -880,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> @@ -900,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