From a6e5c60a9ec30574bf7c3d584046444b15f8680f Mon Sep 17 00:00:00 2001 From: zhyinch <zhyinch@gmail.com> Date: 星期四, 10 二月 2022 16:29:20 +0800 Subject: [PATCH] V1.61 修改成中断模式,测试不丢包。 --- 源码/核心板/MDK-ARM/Project.uvoptx | 244 +++++++++++++++++++++++++++++++----------------- 1 files changed, 158 insertions(+), 86 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 2d23427..eaca0dc 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>6</nTsel> + <nTsel>4</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -150,7 +150,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGTARM</Key> - <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=747,81,1158,476,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,26,744,720,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name> + <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=767,133,1188,538,0)(121=747,81,1158,476,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=346,0,745,345,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=150,26,744,720,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=677,0,1280,634,0)(151=-1,-1,-1,-1,0)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -158,24 +158,7 @@ <Name>-T0</Name> </SetRegEntry> </TargetDriverDllRegistry> - <Breakpoint> - <Bp> - <Number>0</Number> - <Type>0</Type> - <LineNumber>991</LineNumber> - <EnabledFlag>1</EnabledFlag> - <Address>0</Address> - <ByteObject>0</ByteObject> - <HtxType>0</HtxType> - <ManyObjects>0</ManyObjects> - <SizeOfObject>0</SizeOfObject> - <BreakByAccess>0</BreakByAccess> - <BreakIfRCount>0</BreakIfRCount> - <Filename>..\Src\application\dw_app.c</Filename> - <ExecCommand></ExecCommand> - <Expression></Expression> - </Bp> - </Breakpoint> + <Breakpoint/> <WatchWindow1> <Ww> <count>0</count> @@ -185,37 +168,37 @@ <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>tyncpoll_time,0x0A</ItemText> + <ItemText>target_time,0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_distlist</ItemText> + <ItemText>time,0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>true_nearbase_idlist</ItemText> + <ItemText>record_time,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>true_exsistbase_list</ItemText> + <ItemText>current_slotnum,0x0A</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>temp_sync_timer1,0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>dw1000local</ItemText> + <ItemText>tyncpoll_time,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>dw_vbat</ItemText> + <ItemText>flag_syncbase</ItemText> </Ww> <Ww> <count>8</count> @@ -225,7 +208,72 @@ <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>target_time,0x0A</ItemText> + <ItemText>sync_timer,0x0A</ItemText> + </Ww> + <Ww> + <count>10</count> + <WinNumber>1</WinNumber> + <ItemText>status_reg</ItemText> + </Ww> + <Ww> + <count>11</count> + <WinNumber>1</WinNumber> + <ItemText>status_reg</ItemText> + </Ww> + <Ww> + <count>12</count> + <WinNumber>1</WinNumber> + <ItemText>testt6,0x0A</ItemText> + </Ww> + <Ww> + <count>13</count> + <WinNumber>1</WinNumber> + <ItemText>testt4,0x0A</ItemText> + </Ww> + <Ww> + <count>14</count> + <WinNumber>1</WinNumber> + <ItemText>testt5,0x0A</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>m_EUART_TxFrm_FreeFrmLen,0x0A</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>m_EUART_TxFrames</ItemText> + </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>m_bEUARTPushingFrms</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <ItemText>m_bEUARTCheckingSend</ItemText> + </Ww> + <Ww> + <count>19</count> + <WinNumber>1</WinNumber> + <ItemText>testt,0x0A</ItemText> + </Ww> + <Ww> + <count>20</count> + <WinNumber>1</WinNumber> + <ItemText>tagslotpos</ItemText> + </Ww> + <Ww> + <count>21</count> + <WinNumber>1</WinNumber> + <ItemText>tagpos_binary</ItemText> + </Ww> + <Ww> + <count>22</count> + <WinNumber>1</WinNumber> + <ItemText>tyncpoll_time</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -250,7 +298,7 @@ <DebugFlag> <trace>0</trace> <periodic>1</periodic> - <aLwin>0</aLwin> + <aLwin>1</aLwin> <aCover>0</aCover> <aSer1>0</aSer1> <aSer2>0</aSer2> @@ -309,18 +357,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> @@ -328,7 +364,7 @@ </File> <File> <GroupNumber>1</GroupNumber> - <FileNumber>3</FileNumber> + <FileNumber>2</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -340,13 +376,37 @@ </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> + <File> + <GroupNumber>1</GroupNumber> + <FileNumber>5</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\modbus.c</PathWithFileName> + <FilenameWithoutPath>modbus.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -360,7 +420,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>2</GroupNumber> - <FileNumber>5</FileNumber> + <FileNumber>6</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -372,7 +432,7 @@ </File> <File> <GroupNumber>2</GroupNumber> - <FileNumber>6</FileNumber> + <FileNumber>7</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -392,7 +452,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>3</GroupNumber> - <FileNumber>7</FileNumber> + <FileNumber>8</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -402,17 +462,29 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>9</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>10</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -424,7 +496,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>9</FileNumber> + <FileNumber>11</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -436,7 +508,7 @@ </File> <File> <GroupNumber>4</GroupNumber> - <FileNumber>10</FileNumber> + <FileNumber>12</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -450,13 +522,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>13</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -468,7 +540,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>12</FileNumber> + <FileNumber>14</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -480,7 +552,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>13</FileNumber> + <FileNumber>15</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -500,7 +572,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>14</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -512,7 +584,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -524,7 +596,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -536,7 +608,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>19</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -548,7 +620,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>20</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -560,7 +632,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>19</FileNumber> + <FileNumber>21</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -580,7 +652,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>7</GroupNumber> - <FileNumber>20</FileNumber> + <FileNumber>22</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -592,7 +664,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>21</FileNumber> + <FileNumber>23</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -604,7 +676,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>22</FileNumber> + <FileNumber>24</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -616,7 +688,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>23</FileNumber> + <FileNumber>25</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -628,7 +700,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -640,7 +712,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -652,7 +724,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -664,7 +736,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -676,7 +748,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>28</FileNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -688,7 +760,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>29</FileNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -700,7 +772,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>30</FileNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -712,7 +784,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>31</FileNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -724,7 +796,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>32</FileNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -736,7 +808,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>33</FileNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -748,7 +820,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>34</FileNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -760,7 +832,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>35</FileNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -772,7 +844,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>36</FileNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -784,7 +856,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>37</FileNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -796,7 +868,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>38</FileNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -808,7 +880,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>39</FileNumber> + <FileNumber>41</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -820,7 +892,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>40</FileNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -832,7 +904,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>41</FileNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -844,7 +916,7 @@ </File> <File> <GroupNumber>7</GroupNumber> - <FileNumber>42</FileNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -864,7 +936,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>43</FileNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -876,7 +948,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>44</FileNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -888,7 +960,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>45</FileNumber> + <FileNumber>47</FileNumber> <FileType>2</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3