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 | 78 +++++++++++++++++++++++++-------------
1 files changed, 51 insertions(+), 27 deletions(-)
diff --git a/MDK-ARM/L071.uvoptx b/MDK-ARM/L071.uvoptx
index b470c4f..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>
@@ -153,7 +153,24 @@
<Name>-U-O142 -O2254 -S0 -C0 -N00("ARM CoreSight SW-DP") -D00(2BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -STM32L0xx_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32L071CBTx$CMSIS\Flash\STM32L0xx_128.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint/>
+ <Breakpoint>
+ <Bp>
+ <Number>0</Number>
+ <Type>0</Type>
+ <LineNumber>130</LineNumber>
+ <EnabledFlag>1</EnabledFlag>
+ <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 - 閸忔澘绐為張鍝勬簚\Core\Src\main.c</Filename>
+ <ExecCommand></ExecCommand>
+ <Expression>\\L071\../Core/Src/main.c\130</Expression>
+ </Bp>
+ </Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -218,119 +235,126 @@
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>powerled</ItemText>
+ <ItemText>lp_time-uwb_timer</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>loraled</ItemText>
+ <ItemText>lp_time,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>gpsled</ItemText>
+ <ItemText>uwb_timer</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>uwbled</ItemText>
+ <ItemText>nearbase_distlist</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>lp_time-GPSDateTime,0x0A</ItemText>
+ <ItemText>bat_percent,0x0A</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>GPS_final_data</ItemText>
+ <ItemText>tag_resprx[0]</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>lora_rxbuf</ItemText>
+ <ItemText>poll_tx_ts</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>GPS_ON_flag</ItemText>
+ <ItemText>anc_resptx[0]</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
- <ItemText>uwb_work_num</ItemText>
+ <ItemText>anc_pollrx[0]</ItemText>
</Ww>
<Ww>
<count>21</count>
<WinNumber>1</WinNumber>
- <ItemText>youxiao_ceju</ItemText>
+ <ItemText>tag_frequency</ItemText>
</Ww>
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>g_com_map[18]</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_buffer</ItemText>
+ <ItemText>mainbase_id</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
- <ItemText>nomove_time</ItemText>
+ <ItemText>rx_buffer</ItemText>
</Ww>
<Ww>
<count>25</count>
<WinNumber>1</WinNumber>
- <ItemText>nomove_flag</ItemText>
+ <ItemText>bat_percent,0x0A</ItemText>
</Ww>
<Ww>
<count>26</count>
<WinNumber>1</WinNumber>
- <ItemText>lp_time-GPSDateTime</ItemText>
+ <ItemText>lora_rxbuf</ItemText>
</Ww>
<Ww>
<count>27</count>
<WinNumber>1</WinNumber>
- <ItemText>agc_config</ItemText>
+ <ItemText>lora_rxbufnum</ItemText>
</Ww>
<Ww>
<count>28</count>
<WinNumber>1</WinNumber>
- <ItemText>prfIndex</ItemText>
+ <ItemText>lp_time%5</ItemText>
</Ww>
<Ww>
<count>29</count>
<WinNumber>1</WinNumber>
- <ItemText>agc_config</ItemText>
+ <ItemText>lp_time-GPSDateTime,0x0A</ItemText>
</Ww>
<Ww>
<count>30</count>
<WinNumber>1</WinNumber>
- <ItemText>hlpuart1,0x0A</ItemText>
+ <ItemText>nearbase_distlist</ItemText>
</Ww>
<Ww>
<count>31</count>
<WinNumber>1</WinNumber>
- <ItemText>huart->Init.BaudRate</ItemText>
+ <ItemText>rec_nearbaseid</ItemText>
</Ww>
<Ww>
<count>32</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
+ <ItemText>nearbaseid_list</ItemText>
</Ww>
<Ww>
<count>33</count>
<WinNumber>1</WinNumber>
- <ItemText>_pcData_final</ItemText>
+ <ItemText>lp_time-GPSDateTime,0x0A</ItemText>
</Ww>
<Ww>
<count>34</count>
<WinNumber>1</WinNumber>
- <ItemText>lora_rxbuf</ItemText>
+ <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>
@@ -345,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>
@@ -865,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