From 5b8bde9ae08b29e4ce6d04149fe0cb78e0c5d68c Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期日, 24 三月 2024 13:48:14 +0800
Subject: [PATCH] 1.12，加入lora'升级标签。
---
MDK-ARM/L051.uvoptx | 221 ++++++++++++++++++++++++++-----------------------------
1 files changed, 104 insertions(+), 117 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index a19e7ec..fe75027 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -88,7 +88,7 @@
<sRmem>1</sRmem>
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
- <tLdApp>1</tLdApp>
+ <tLdApp>0</tLdApp>
<tGomain>1</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
@@ -125,7 +125,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name>d</Name>
+ <Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -158,144 +158,107 @@
<Name>-U066CFF564948897767122910 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(0BC11477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
- <Breakpoint>
- <Bp>
- <Number>0</Number>
- <Type>0</Type>
- <LineNumber>2247</LineNumber>
- <EnabledFlag>1</EnabledFlag>
- <Address>134241068</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_adc.c</Filename>
- <ExecCommand></ExecCommand>
- <Expression>\\L051\../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_adc.c\2247</Expression>
- </Bp>
- </Breakpoint>
+ <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>wg_lost_count,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
+ <ItemText>intheight,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>poll_rx_ts</ItemText>
+ <ItemText>bat_percent,0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>resp_tx_time</ItemText>
+ <ItemText>bat_volt</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancnum</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>Lora_status</ItemText>
+ <ItemText>rec_ancdistlist</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
+ <ItemText>seq_num,0x0A</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>irq_num</ItemText>
+ <ItemText>motor_keeptime,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>Lora_rece_error</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>last_lpcount,0x0A</ItemText>
+ <ItemText>wg_report_id</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>lpcount,0x0A</ItemText>
+ <ItemText>nomove_count</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>lp_time</ItemText>
+ <ItemText>wg_report_freq,0x0A</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>lora_zhuangtai</ItemText>
+ <ItemText>delaytime,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>Loratx_frequency,0x0A</ItemText>
+ <ItemText>report_ancnum</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>usart_send</ItemText>
+ <ItemText>huifushengjibaoerror_num</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>send_frame1</ItemText>
+ <ItemText>muqiandeshengjibao</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>Lora_tx_ancdist</ItemText>
+ <ItemText>LoraUp_flag</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_ancdistlist,0x0A</ItemText>
+ <ItemText>shengji_flag</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>rec_ancidlist</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>value,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>ble_rxzhongzhuandate</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>ble_rxdate</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>wg_report_freq,0x0A</ItemText>
+ <ItemText>RX_Buffer</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
@@ -364,18 +327,6 @@
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
- <File>
- <GroupNumber>1</GroupNumber>
- <FileNumber>1</FileNumber>
- <FileType>2</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>startup_stm32l051xx.s</PathWithFileName>
- <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
</Group>
<Group>
@@ -386,6 +337,18 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>2</GroupNumber>
+ <FileNumber>1</FileNumber>
+ <FileType>2</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>startup_stm32l051xx.s</PathWithFileName>
+ <FilenameWithoutPath>startup_stm32l051xx.s</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
@@ -393,6 +356,30 @@
<bDave2>0</bDave2>
<PathWithFileName>..\Drivers\ExternlDrivers\lis3dh_driver.c</PathWithFileName>
<FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>3</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\ExternalDevices\dps310.c</PathWithFileName>
+ <FilenameWithoutPath>dps310.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>2</GroupNumber>
+ <FileNumber>4</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\ExternalDevices\dps368_test.c</PathWithFileName>
+ <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -406,7 +393,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>3</FileNumber>
+ <FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -418,7 +405,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>4</FileNumber>
+ <FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -430,7 +417,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
- <FileNumber>5</FileNumber>
+ <FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -450,7 +437,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
- <FileNumber>6</FileNumber>
+ <FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -470,7 +457,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>7</FileNumber>
+ <FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -482,7 +469,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>8</FileNumber>
+ <FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -494,7 +481,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>9</FileNumber>
+ <FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -506,7 +493,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>10</FileNumber>
+ <FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -534,7 +521,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>11</FileNumber>
+ <FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -546,7 +533,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>12</FileNumber>
+ <FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -558,7 +545,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>13</FileNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -570,7 +557,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -582,7 +569,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -602,7 +589,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -614,7 +601,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -626,7 +613,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -646,7 +633,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -666,7 +653,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -678,7 +665,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -690,7 +677,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -702,7 +689,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -714,7 +701,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -726,7 +713,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -746,7 +733,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -758,7 +745,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -770,7 +757,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -782,7 +769,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -794,7 +781,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -806,7 +793,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -818,7 +805,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -830,7 +817,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -842,7 +829,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -854,7 +841,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -866,7 +853,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -878,7 +865,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>39</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -890,7 +877,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>38</FileNumber>
+ <FileNumber>40</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -902,7 +889,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>39</FileNumber>
+ <FileNumber>41</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -914,7 +901,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>40</FileNumber>
+ <FileNumber>42</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -926,7 +913,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>41</FileNumber>
+ <FileNumber>43</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -938,7 +925,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>42</FileNumber>
+ <FileNumber>44</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -950,7 +937,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>43</FileNumber>
+ <FileNumber>45</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -962,7 +949,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>44</FileNumber>
+ <FileNumber>46</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -974,7 +961,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>45</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -986,7 +973,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>46</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -998,7 +985,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>47</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
--
Gitblit v1.9.3