From f9a7514dbb14628b5caba76be951db2b55b1050b Mon Sep 17 00:00:00 2001 From: yincheng.zhong <634916154@qq.com> Date: 星期四, 29 二月 2024 14:19:35 +0800 Subject: [PATCH] 去掉UWB功率写死0,和增加UWB读取回复的delay时间 --- MDK-ARM/L051.uvoptx | 210 +++++++++++++++++++++++++++++++++------------------- 1 files changed, 134 insertions(+), 76 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 1556d88..f2b3311 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -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> @@ -120,12 +120,12 @@ <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> + <Name>-X"Horco CMSIS-DAP v2" -U482752542668 -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> - <Name>d</Name> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -163,77 +163,147 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>taglist_id</ItemText> + <ItemText>taglist_total_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>taglist_dist[0],0x0A</ItemText> + <ItemText>taglist_id[0]</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>taglist_keeptime,0x0A</ItemText> + <ItemText>taglist_dist[0],0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>count1,0x0A</ItemText> + <ItemText>taglist_keeptime[0],0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>count2,0x0A</ItemText> + <ItemText>sync_lost_count</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>taglist_dist[0],0x0A</ItemText> + <ItemText>sync_state</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>taglist_dist[1],0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>taglist_dist[2],0x0A</ItemText> + <ItemText>config_state_count,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>taglist_total_num,0x0A</ItemText> + <ItemText>taglist_keeptime[0],0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>taglist_dist[0]</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>taglist_current_index,0x0A</ItemText> + <ItemText>taglist_dist[1]</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>tag_num_tosend,0x0A</ItemText> + <ItemText>taglist_dist[0]</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>rec_tag_index,0x0A</ItemText> + <ItemText>taglist_id</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>taglist_current_index</ItemText> + <ItemText>taglist_keeptime[0],0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>temp_index</ItemText> + <ItemText>taglist_keeptime[1],0x0A</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>taglist_keeptime[2],0x0A</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>taglist_keeptime[3],0x0A</ItemText> + </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>g_com_map[10]</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <ItemText>muqiandeshengjibao,0x0A</ItemText> + </Ww> + <Ww> + <count>19</count> + <WinNumber>1</WinNumber> + <ItemText>huifushengjibaoerror_num</ItemText> + </Ww> + <Ww> + <count>20</count> + <WinNumber>1</WinNumber> + <ItemText>bat_percent</ItemText> + </Ww> + <Ww> + <count>21</count> + <WinNumber>1</WinNumber> + <ItemText>AD_value</ItemText> + </Ww> + <Ww> + <count>22</count> + <WinNumber>1</WinNumber> + <ItemText>aaa</ItemText> + </Ww> + <Ww> + <count>23</count> + <WinNumber>1</WinNumber> + <ItemText>Anchor_Vcc_time</ItemText> + </Ww> + <Ww> + <count>24</count> + <WinNumber>1</WinNumber> + <ItemText>bat_volt</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>ceshi,0x0A</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>AD_value,0x0A</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>verfint_cal</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>bat_percent,0x0A</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -322,18 +392,6 @@ <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> - <File> - <GroupNumber>2</GroupNumber> - <FileNumber>2</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>..\Drivers\ExternlDrivers\lis3dh_driver.c</PathWithFileName> - <FilenameWithoutPath>lis3dh_driver.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> </Group> <Group> @@ -344,7 +402,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>3</FileNumber> + <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -356,7 +414,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>3</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -368,7 +426,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>4</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -388,7 +446,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>6</FileNumber> + <FileNumber>5</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -408,7 +466,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>7</FileNumber> + <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -420,7 +478,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>8</FileNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -432,7 +490,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -444,7 +502,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -472,7 +530,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>11</FileNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -484,7 +542,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -496,7 +554,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -508,7 +566,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -520,7 +578,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -540,7 +598,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -552,7 +610,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -564,7 +622,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -584,7 +642,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -604,7 +662,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -616,7 +674,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -628,7 +686,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -640,7 +698,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -652,7 +710,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -664,7 +722,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -684,7 +742,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -696,7 +754,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -708,7 +766,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -720,7 +778,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -732,7 +790,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -744,7 +802,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -756,7 +814,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -768,7 +826,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -780,7 +838,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -792,7 +850,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -804,7 +862,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -816,7 +874,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -828,7 +886,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -840,7 +898,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -852,7 +910,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -864,7 +922,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -876,7 +934,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -888,7 +946,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -900,7 +958,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -912,7 +970,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -924,7 +982,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>46</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -936,7 +994,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>47</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -948,7 +1006,7 @@ </File> <File> <GroupNumber>11</GroupNumber> - <FileNumber>48</FileNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3