From 0f9a5a119401d9e08cefc4b9cb7f700988a69abe Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期六, 04 六月 2022 17:01:05 +0800 Subject: [PATCH] V1.70修改免报距离不生效bug --- 源码/核心板/MDK-ARM/Project.uvoptx | 212 ++++++++++++++++++++++++++++++---------------------- 1 files changed, 122 insertions(+), 90 deletions(-) diff --git "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" index 8822b70..88e01f2 100644 --- "a/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" +++ "b/\346\272\220\347\240\201/\346\240\270\345\277\203\346\235\277/MDK-ARM/Project.uvoptx" @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>12</nTsel> + <nTsel>4</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -114,7 +114,7 @@ <tDlgDll></tDlgDll> <tDlgPa></tDlgPa> <tIfile></tIfile> - <pMon>BIN\CMSIS_AGDI.dll</pMon> + <pMon>Segger\JL2CM3.dll</pMon> </DebugOpt> <TargetDriverDllRegistry> <SetRegEntry> @@ -125,7 +125,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -162,165 +162,185 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>2758</LineNumber> + <LineNumber>904</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134258532</Address> + <Address>134243140</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> <SizeOfObject>0</SizeOfObject> <BreakByAccess>0</BreakByAccess> <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\decadriver\deca_device.c</Filename> + <Filename>E:\GIT\UWB_SmallModule\濠ф劗鐖淺Src\application\dw_app.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\UWB_Projects\../Src/decadriver/deca_device.c\2758</Expression> + <Expression>\\UWB_Projects\../Src/application/dw_app.c\904</Expression> </Bp> </Breakpoint> <WatchWindow1> <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_num</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>tyncpoll_time,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list</ItemText> + <ItemText>true_nearbase_distlist</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>true_nearbase_idlist</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>next_nearbase_num</ItemText> + <ItemText>true_exsistbase_list</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>status_reg</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist,0x0A</ItemText> + <ItemText>dw1000local</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>pwtag</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>tagdist_list,0x0A</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>tagid_list</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>QUIT_SLOT_TIME</ItemText> + <ItemText>g_Resttimer,0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>taglist_num</ItemText> + <ItemText>rx_buffer[MESSAGE_TYPE_IDX]</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>synclost_timer,0x0A</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>g_start_send_flag</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> + <ItemText>hex_dist,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist[j]</ItemText> + <ItemText>rlv,0x0A</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> + <ItemText>g_com_map[0X78]</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>g_com_map[0X79]</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>min_dist,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>hex_dist,0x0A</ItemText> + <ItemText>min_dist,0x0A</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>sync_timer,0x0A</ItemText> + <ItemText>beep_state</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>synclost_timer,0x0A</ItemText> + <ItemText>min_dist,0x0A</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>min_dist,0x0A</ItemText> + <ItemText>beep_state2</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>tagslotpos,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>pack_index</ItemText> </Ww> <Ww> <count>26</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>min_dist2,0x0A</ItemText> </Ww> <Ww> <count>27</count> <WinNumber>1</WinNumber> - <ItemText>current_slotnum,0x0A</ItemText> + <ItemText>motorstate</ItemText> </Ww> <Ww> <count>28</count> <WinNumber>1</WinNumber> - <ItemText>tagslotpos</ItemText> + <ItemText>dist_threshold,0x0A</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>hex_dist,0x0A</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>rec_antdelay,0x0A</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>recpoll_len,0x0A</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>tx_nearpoll_msg</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -404,18 +424,6 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>..\Src\application\dw_app.c</PathWithFileName> - <FilenameWithoutPath>dw_app.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>1</GroupNumber> - <FileNumber>2</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> <PathWithFileName>..\Src\application\serial_at_cmd_app.c</PathWithFileName> <FilenameWithoutPath>serial_at_cmd_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -423,7 +431,7 @@ </File> <File> <GroupNumber>1</GroupNumber> - <FileNumber>3</FileNumber> + <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -435,13 +443,25 @@ </File> <File> <GroupNumber>1</GroupNumber> - <FileNumber>4</FileNumber> + <FileNumber>3</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>..\Src\application\global_param.c</PathWithFileName> <FilenameWithoutPath>global_param.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>1</GroupNumber> + <FileNumber>4</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\dw_app.c</PathWithFileName> + <FilenameWithoutPath>dw_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -497,17 +517,29 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>8</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\algorithm\TrackingDiff.c</PathWithFileName> + <FilenameWithoutPath>TrackingDiff.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>decadriver</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>4</GroupNumber> - <FileNumber>8</FileNumber> + <FileNumber>9</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -519,7 +551,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -531,7 +563,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -545,13 +577,13 @@ <Group> <GroupName>ExternalDevices</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>11</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -563,7 +595,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -575,7 +607,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -595,7 +627,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -607,7 +639,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -619,7 +651,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -631,7 +663,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -643,7 +675,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -655,7 +687,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -675,7 +707,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -687,7 +719,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -699,7 +731,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -711,7 +743,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -723,7 +755,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -735,7 +767,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -747,7 +779,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -759,7 +791,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -771,7 +803,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -783,7 +815,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -795,7 +827,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -807,7 +839,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -819,7 +851,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -831,7 +863,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -843,7 +875,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -855,7 +887,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -867,7 +899,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -879,7 +911,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -891,7 +923,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -903,7 +935,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -915,7 +947,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -927,7 +959,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -939,7 +971,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -959,7 +991,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -971,7 +1003,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -983,7 +1015,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>46</FileNumber> <FileType>2</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3