From 38ee5f2e88aeba329f35bae9cc0d455e4892a9d1 Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 05 九月 2023 15:17:00 +0800
Subject: [PATCH] 版本v1.0，修改灯的顺序，修改gps与灯冲突bug
---
MDK-ARM/L071.uvoptx | 67 ++++++++++++++++++---------------
1 files changed, 37 insertions(+), 30 deletions(-)
diff --git a/MDK-ARM/L071.uvoptx b/MDK-ARM/L071.uvoptx
index e7e3b52..c6f901e 100644
--- a/MDK-ARM/L071.uvoptx
+++ b/MDK-ARM/L071.uvoptx
@@ -135,7 +135,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -218,52 +218,52 @@
<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</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>
@@ -273,29 +273,24 @@
<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>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>lp_time-GPSDateTime</ItemText>
+ <ItemText>bat_percent,0x0A</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
- <SubType>8</SubType>
- <ItemText>l_au8LoraRecvBuff</ItemText>
+ <SubType>0</SubType>
+ <ItemText>0x0800FC00</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -305,7 +300,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>0</aLwin>
+ <aLwin>1</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -323,7 +318,7 @@
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
- <StkLoc>0</StkLoc>
+ <StkLoc>1</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
@@ -825,7 +820,7 @@
<Group>
<GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1028,6 +1023,18 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
+ <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_iwdg.c</PathWithFileName>
+ <FilenameWithoutPath>stm32l0xx_hal_iwdg.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>9</GroupNumber>
+ <FileNumber>52</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>
@@ -1035,7 +1042,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1047,7 +1054,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1059,7 +1066,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1071,7 +1078,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1083,7 +1090,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1103,7 +1110,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3