From b48eddff30f5c99659a3ec444760b8507ef4aedf Mon Sep 17 00:00:00 2001
From: yincheng.zhong <634916154@qq.com>
Date: 星期二, 28 二月 2023 11:15:33 +0800
Subject: [PATCH] V1.47 1.增加唤醒后delay 100us。否则UWB模块有概率启动失败 2.修复无法激活的bug
---
MDK-ARM/L051.uvoptx | 209 ++++++++++++++-------------------------------------
1 files changed, 58 insertions(+), 151 deletions(-)
diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx
index b52c747..40a7b96 100644
--- a/MDK-ARM/L051.uvoptx
+++ b/MDK-ARM/L051.uvoptx
@@ -8,7 +8,7 @@
<Extensions>
<cExt>*.c</cExt>
<aExt>*.s*; *.src; *.a*</aExt>
- <oExt>*.obj</oExt>
+ <oExt>*.obj; *.o</oExt>
<lExt>*.lib</lExt>
<tExt>*.txt; *.h; *.inc</tExt>
<pExt>*.plm</pExt>
@@ -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>
@@ -103,7 +103,7 @@
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
- <nTsel>6</nTsel>
+ <nTsel>4</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@@ -113,10 +113,15 @@
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
- <tIfile></tIfile>
+ <tIfile>.\Loader.ini</tIfile>
<pMon>Segger\JL2CM3.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
+ <SetRegEntry>
+ <Number>0</Number>
+ <Key>CMSIS_AGDI</Key>
+ <Name>-X"Any" -UAny -O206 -S8 -C0 -P00000000 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP20 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ </SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
@@ -140,7 +145,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>JL2CM3</Key>
- <Name>-U20090928 -O78 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
+ <Name>-U20090928 -O70 -S2 -ZTIFSpeedSel5000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BC11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32L0xx_64.FLM -FS08000000 -FL010000 -FP0($$Device:STM32L051C8Tx$CMSIS\Flash\STM32L0xx_64.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -158,142 +163,27 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>last_nearbase_num</ItemText>
+ <ItemText>tag_frequency</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>nearbaseid_list</ItemText>
+ <ItemText>tag_frequency</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time,0x0A</ItemText>
+ <ItemText>freqlost_count</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>lptime,0x0A</ItemText>
+ <ItemText>rx_buffer[TAG_ID_IDX]</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>lpcount,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>5</count>
- <WinNumber>1</WinNumber>
- <ItemText>count_offset,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>6</count>
- <WinNumber>1</WinNumber>
- <ItemText>offset,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>7</count>
- <WinNumber>1</WinNumber>
- <ItemText>ancsync_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>8</count>
- <WinNumber>1</WinNumber>
- <ItemText>offsettimeus,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>9</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>10</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>11</count>
- <WinNumber>1</WinNumber>
- <ItemText>sync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>12</count>
- <WinNumber>1</WinNumber>
- <ItemText>end_count,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>13</count>
- <WinNumber>1</WinNumber>
- <ItemText>lastsync_timer,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>14</count>
- <WinNumber>1</WinNumber>
- <ItemText>true_nearbase_distlist</ItemText>
- </Ww>
- <Ww>
- <count>15</count>
- <WinNumber>1</WinNumber>
- <ItemText>bat_percent,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>bat_volt</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>nomove_count</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>rx_buffer</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>motor_state</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>tyncpoll_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>slottime,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>lpcount,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>target_time,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_slotnum,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>hadc</ItemText>
- </Ww>
- <Ww>
- <count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>tx_near_msg</ItemText>
+ <ItemText>rec_remotepara</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -302,12 +192,17 @@
<WinNumber>2</WinNumber>
<ItemText>current_slotnum</ItemText>
</Ww>
+ <Ww>
+ <count>1</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>current_slotnum</ItemText>
+ </Ww>
</WatchWindow2>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
- <ItemText>headerBuffer</ItemText>
+ <ItemText>0x200019E8</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
@@ -573,6 +468,18 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
+ <File>
+ <GroupNumber>7</GroupNumber>
+ <FileNumber>14</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>..\Src\application\CRC.c</PathWithFileName>
+ <FilenameWithoutPath>CRC.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
</Group>
<Group>
@@ -583,7 +490,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>14</FileNumber>
+ <FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -595,7 +502,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>15</FileNumber>
+ <FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -607,7 +514,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>16</FileNumber>
+ <FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -627,7 +534,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>17</FileNumber>
+ <FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -639,7 +546,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>18</FileNumber>
+ <FileNumber>19</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -651,7 +558,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>19</FileNumber>
+ <FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -663,7 +570,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>20</FileNumber>
+ <FileNumber>21</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -675,7 +582,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>21</FileNumber>
+ <FileNumber>22</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -687,7 +594,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>22</FileNumber>
+ <FileNumber>23</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -699,7 +606,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>23</FileNumber>
+ <FileNumber>24</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -711,7 +618,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>24</FileNumber>
+ <FileNumber>25</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -723,7 +630,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>25</FileNumber>
+ <FileNumber>26</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -735,7 +642,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>26</FileNumber>
+ <FileNumber>27</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -747,7 +654,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>27</FileNumber>
+ <FileNumber>28</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -759,7 +666,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>28</FileNumber>
+ <FileNumber>29</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -771,7 +678,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>29</FileNumber>
+ <FileNumber>30</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -783,7 +690,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>30</FileNumber>
+ <FileNumber>31</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -795,7 +702,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>31</FileNumber>
+ <FileNumber>32</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -807,7 +714,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>32</FileNumber>
+ <FileNumber>33</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -819,7 +726,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>33</FileNumber>
+ <FileNumber>34</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -831,7 +738,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>34</FileNumber>
+ <FileNumber>35</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -843,7 +750,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>35</FileNumber>
+ <FileNumber>36</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -855,7 +762,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>36</FileNumber>
+ <FileNumber>37</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -867,7 +774,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>37</FileNumber>
+ <FileNumber>38</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -887,7 +794,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