From 863f8f72d0726c104db21799a8d642f4e04ac93f Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期四, 11 十一月 2021 17:40:09 +0800
Subject: [PATCH] Merge branch '定位-临近' into 定位-临近-物资
---
MDK-ARM/L051.uvoptx | 75 +++++++++++++++++++++++++++++++++++--
1 files changed, 71 insertions(+), 4 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index adef4e6..a633ea7 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -162,9 +162,9 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>1049</LineNumber>
+ <LineNumber>1036</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134254728</Address>
+ <Address>134254846</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
@@ -173,7 +173,39 @@
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\1049</Expression>
+ <Expression>\\L051\../Src/application/dw_app.c\1036</Expression>
+ </Bp>
+ <Bp>
+ <Number>1</Number>
+ <Type>0</Type>
+ <LineNumber>1031</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134254832</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\1031</Expression>
+ </Bp>
+ <Bp>
+ <Number>2</Number>
+ <Type>0</Type>
+ <LineNumber>101</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <Address>134252210</Address>
+ <ByteObject>0</ByteObject>
+ <HtxType>0</HtxType>
+ <ManyObjects>0</ManyObjects>
+ <SizeOfObject>0</SizeOfObject>
+ <BreakByAccess>0</BreakByAccess>
+ <BreakIfRCount>1</BreakIfRCount>
+ <Filename>..\Drivers\ExternlDrivers\lis3dh_driver.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L051\../Drivers/ExternlDrivers/lis3dh_driver.c\101</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -272,6 +304,41 @@
<WinNumber>1</WinNumber>
<ItemText>poll_offsettime,0x0A</ItemText>
</Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>clockoffset,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>error_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rx_buffer</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_keeptime</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>target_offsettime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>status_reg</ItemText>
+ </Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
--
Gitblit v1.9.3