From 88fead50b413489e979e08dfc53241e40e11515a Mon Sep 17 00:00:00 2001
From: zhyinch <zhyinch@gmail.com>
Date: 星期三, 06 一月 2021 10:40:01 +0800
Subject: [PATCH] Merge branch '定位临近_工卡' into 定位-临近
---
MDK-ARM/L051.uvoptx | 151 +++++++++++++++++++------------------------------
1 files changed, 59 insertions(+), 92 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index dcac2a0..898072b 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -162,98 +162,18 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>922</LineNumber>
+ <LineNumber>860</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134241480</Address>
+ <Address>134254430</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>../Src/main.c</Filename>
+ <Filename>..\Src\application\dw_app.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L051\../Src/main.c\922</Expression>
- </Bp>
- <Bp>
- <Number>1</Number>
- <Type>0</Type>
- <LineNumber>166</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134247762</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\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>
+ <Expression>\\L051\../Src/application/dw_app.c\860</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -397,6 +317,41 @@
<WinNumber>1</WinNumber>
<ItemText>bigslot_num,0x0A</ItemText>
</Ww>
+ <Ww>
+ <count>28</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbaseid_list[MAX_NEARBASE_NUM]</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_keeptime</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>31</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>current_time,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>32</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>hardware_version</ItemText>
+ </Ww>
+ <Ww>
+ <count>33</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>tag_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>34</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>motor_keeptime</ItemText>
+ </Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
@@ -414,7 +369,7 @@
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
- <ItemText>headerBuffer</ItemText>
+ <ItemText>&hardware_version</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -424,7 +379,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -919,6 +874,18 @@
<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>9</GroupNumber>
+ <FileNumber>33</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
<PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_lptim.c</PathWithFileName>
<FilenameWithoutPath>stm32l0xx_hal_lptim.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
@@ -926,7 +893,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -938,7 +905,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -950,7 +917,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -962,7 +929,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -974,7 +941,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -994,7 +961,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3