From 003aff1766ffd3ccfe9df6096ef137340ebfeabf Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期五, 18 十二月 2020 16:57:26 +0800
Subject: [PATCH] Merge branch '调试' into 定位-临近
---
MDK-ARM/L051.uvoptx | 229 ++++++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 200 insertions(+), 29 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index b95f8b4..dcac2a0 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -119,6 +119,11 @@
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
+ <Key>CMSIS_AGDI</Key>
+ <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ </SetRegEntry>
+ <SetRegEntry>
+ <Number>0</Number>
<Key>DLGUARM</Key>
<Name>d</Name>
</SetRegEntry>
@@ -140,7 +145,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -157,9 +162,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>293</LineNumber>
+ <LineNumber>922</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134264610</Address>
+ <Address>134241480</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -168,67 +173,243 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\293</Expression>
+ <Expression>\\L051\../Src/main.c\922</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>55</LineNumber>
+ <LineNumber>166</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134258446</Address>
+ <Address>134247762</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>..\Src\OnChipDevices\Usart.c</Filename>
+ <Filename>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/OnChipDevices/Usart.c\55</Expression>
+ <Expression>\\L051\../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c\166</Expression>
+ </Bp>
+ <Bp>
+ <Number>2</Number>
+ <Type>0</Type>
+ <LineNumber>203</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134247886</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L051\../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c\203</Expression>
+ </Bp>
+ <Bp>
+ <Number>3</Number>
+ <Type>0</Type>
+ <LineNumber>287</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134248146</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L051\../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rcc_ex.c\287</Expression>
+ </Bp>
+ <Bp>
+ <Number>4</Number>
+ <Type>0</Type>
+ <LineNumber>507</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134259504</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>\\L051\../Src/main.c\507</Expression>
+ </Bp>
+ <Bp>
+ <Number>5</Number>
+ <Type>0</Type>
+ <LineNumber>513</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134259512</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>\\L051\../Src/main.c\513</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>headerBuffer</ItemText>
+ <ItemText>recbase_num</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>bodyBuffer</ItemText>
+ <ItemText>true_nearbase_idlist</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>buffer</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>bodyBuffer</ItemText>
+ <ItemText>motor_ontime</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>tx_poll_msg</ItemText>
+ <ItemText>tag_state</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>last_value</ItemText>
+ <ItemText>module_power,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>bat_volt</ItemText>
+ <ItemText>target_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>8</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>slotpos_intoatl,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>9</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>key_keeptime</ItemText>
+ </Ww>
+ <Ww>
+ <count>10</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ <Ww>
+ <count>11</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbaseid_list</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>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>offsettimeus,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lptime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lpcount,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>ancsync_time-current_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>target_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>slotpos_intoatl,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>bigslot_num,0x0A</ItemText>
</Ww>
</WatchWindow1>
+ <WatchWindow2>
+ <Ww>
+ <count>0</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>current_slotnum</ItemText>
+ </Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>current_slotnum</ItemText>
+ </Ww>
+ </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
@@ -243,7 +424,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -279,16 +460,6 @@
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
- <SystemViewers>
- <Entry>
- <Name>System Viewer\GPIOB</Name>
- <WinId>35904</WinId>
- </Entry>
- <Entry>
- <Name>System Viewer\USART1</Name>
- <WinId>35905</WinId>
- </Entry>
- </SystemViewers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
@@ -301,7 +472,7 @@
<Group>
<GroupName>Application/MDK-ARM</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -557,7 +728,7 @@
<Group>
<GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
--
Gitblit v1.9.3