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 | 42 +++++++++++++-----------------------------
1 files changed, 13 insertions(+), 29 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index 8ea2c26..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,66 +162,50 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>155</LineNumber>
+ <LineNumber>1036</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134241498</Address>
+ <Address>134254846</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\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/stm32l0xx_it.c\155</Expression>
+ <Expression>\\L051\../Src/application/dw_app.c\1036</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
- <LineNumber>156</LineNumber>
+ <LineNumber>1031</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134241504</Address>
+ <Address>134254832</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\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/stm32l0xx_it.c\156</Expression>
+ <Expression>\\L051\../Src/application/dw_app.c\1031</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
- <LineNumber>1071</LineNumber>
+ <LineNumber>101</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134256560</Address>
+ <Address>134252210</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>..\Drivers\ExternlDrivers\lis3dh_driver.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/application/dw_app.c\1071</Expression>
- </Bp>
- <Bp>
- <Number>3</Number>
- <Type>0</Type>
- <LineNumber>1070</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>0</Address>
- <ByteObject>0</ByteObject>
- <HtxType>0</HtxType>
- <ManyObjects>0</ManyObjects>
- <SizeOfObject>0</SizeOfObject>
- <BreakByAccess>0</BreakByAccess>
- <BreakIfRCount>0</BreakIfRCount>
- <Filename>..\Src\application\dw_app.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression></Expression>
+ <Expression>\\L051\../Drivers/ExternlDrivers/lis3dh_driver.c\101</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
--
Gitblit v1.9.3