From 5f233123900cccf931ee970202c12ccdecc85377 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 12 三月 2024 09:50:43 +0800
Subject: [PATCH] 版本2.7 修改灯的逻辑，充电时设备不再进入静止休眠状态，不再发射uwb lora 运行gps
---
MDK-ARM/L071.uvoptx | 75 +++++++++++++++++++++++++++++++++----
1 files changed, 66 insertions(+), 9 deletions(-)
diff --git a/MDK-ARM/L071.uvoptx b/MDK-ARM/L071.uvoptx
index aefda5d..15db085 100644
--- a/MDK-ARM/L071.uvoptx
+++ b/MDK-ARM/L071.uvoptx
@@ -135,7 +135,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -157,18 +157,18 @@
<Bp>
<Number>0</Number>
<Type>0</Type>
- <LineNumber>283</LineNumber>
+ <LineNumber>130</LineNumber>
<EnabledFlag>1</EnabledFlag>
- <Address>134259800</Address>
+ <Address>134260506</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
- <Filename>C:\git\XRange_Tag - 閸忔澘绐為張鍝勬簚\FML\lora.c</Filename>
+ <Filename>C:\git\XRange_Tag - 閸忔澘绐為張鍝勬簚\Core\Src\main.c</Filename>
<ExecCommand></ExecCommand>
- <Expression>\\L071\../FML/lora.c\283</Expression>
+ <Expression>\\L071\../Core/Src/main.c\130</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
@@ -240,7 +240,7 @@
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>lp_time</ItemText>
+ <ItemText>lp_time,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
@@ -285,7 +285,7 @@
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>g_com_map[18]</ItemText>
</Ww>
<Ww>
<count>23</count>
@@ -297,7 +297,64 @@
<WinNumber>1</WinNumber>
<ItemText>rx_buffer</ItemText>
</Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>bat_percent,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lora_rxbuf</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lora_rxbufnum</ItemText>
+ </Ww>
+ <Ww>
+ <count>28</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lp_time%5</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lp_time-GPSDateTime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbase_distlist</ItemText>
+ </Ww>
+ <Ww>
+ <count>31</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>rec_nearbaseid</ItemText>
+ </Ww>
+ <Ww>
+ <count>32</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>nearbaseid_list</ItemText>
+ </Ww>
+ <Ww>
+ <count>33</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>lp_time-GPSDateTime,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>34</count>
+ <WinNumber>1</WinNumber>
+ <ItemText>fengming_flag</ItemText>
+ </Ww>
</WatchWindow1>
+ <WatchWindow2>
+ <Ww>
+ <count>0</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>g_com_map</ItemText>
+ </Ww>
+ </WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
@@ -312,7 +369,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -832,7 +889,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