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 | 185 +++++++++++++++++++++++++--------------------
1 files changed, 102 insertions(+), 83 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 22c1677..dcac2a0 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -120,7 +120,7 @@
<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 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ <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>
@@ -162,9 +162,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>232</LineNumber>
+ <LineNumber>922</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134254650</Address>
+ <Address>134241480</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -173,130 +173,194 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\232</Expression>
+ <Expression>\\L051\../Src/main.c\922</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>233</LineNumber>
+ <LineNumber>166</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
+ <Address>134247762</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
+ <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\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></Expression>
+ <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>tag_state</ItemText>
+ <ItemText>recbase_num</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_num</ItemText>
+ <ItemText>true_nearbase_idlist</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
+ <ItemText>motor_ontime</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_lost_count</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>trygetnearmsg_times</ItemText>
+ <ItemText>tag_state</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>changemainbase_count</ItemText>
+ <ItemText>module_power,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_dist,0x0A</ItemText>
+ <ItemText>target_time,0x0A</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist</ItemText>
+ <ItemText>slotpos_intoatl,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
+ <ItemText>key_keeptime</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_lost_count</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
+ <ItemText>nearbaseid_list</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>recbase_num</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
+ <ItemText>minid</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>status_reg</ItemText>
+ <ItemText>temp_dist,0x0A</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>nearbase_switchdistlist,0x0A</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbase_distlist,0x0A</ItemText>
+ <ItemText>tag_state</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist[0],0x0A</ItemText>
+ <ItemText>nearbase_distlist,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>mainbase_dist,0x0A</ItemText>
+ <ItemText>rec_nearbaseid</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>nomove_count</ItemText>
+ <ItemText>mainbase_lost_count</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
+ <ItemText>offsettimeus,0x0A</ItemText>
</Ww>
<Ww>
<count>21</count>
@@ -311,75 +375,25 @@
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
- <ItemText>current_slotnum*bigslot_num,0x0A</ItemText>
+ <ItemText>ancsync_time-current_count</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
- <ItemText>bigslot_num,0x0A</ItemText>
+ <ItemText>current_count,0x0A</ItemText>
</Ww>
<Ww>
<count>25</count>
<WinNumber>1</WinNumber>
- <ItemText>(current_slotnum*bigslot_num+slotpos)*SLOTTIME_MS</ItemText>
+ <ItemText>target_time,0x0A</ItemText>
</Ww>
<Ww>
<count>26</count>
<WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
+ <ItemText>slotpos_intoatl,0x0A</ItemText>
</Ww>
<Ww>
<count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>sync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>28</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>29</count>
- <WinNumber>1</WinNumber>
- <ItemText>tagslotpos</ItemText>
- </Ww>
- <Ww>
- <count>30</count>
- <WinNumber>1</WinNumber>
- <ItemText>tag_state</ItemText>
- </Ww>
- <Ww>
- <count>31</count>
- <WinNumber>1</WinNumber>
- <ItemText>mainbase_id</ItemText>
- </Ww>
- <Ww>
- <count>32</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- <Ww>
- <count>33</count>
- <WinNumber>1</WinNumber>
- <ItemText>bigslot_num</ItemText>
- </Ww>
- <Ww>
- <count>34</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum</ItemText>
- </Ww>
- <Ww>
- <count>35</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>36</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>37</count>
<WinNumber>1</WinNumber>
<ItemText>bigslot_num,0x0A</ItemText>
</Ww>
@@ -390,6 +404,11 @@
<WinNumber>2</WinNumber>
<ItemText>current_slotnum</ItemText>
</Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>current_slotnum</ItemText>
+ </Ww>
</WatchWindow2>
<MemoryWindow1>
<Mm>
--
Gitblit v1.9.3