From 88da33b0d531f61e1b75d27e18b6f244ad2c3224 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期四, 25 一月 2024 18:05:19 +0800 Subject: [PATCH] 完成升级基站开发 --- MDK-ARM/L051.uvoptx | 366 ++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 269 insertions(+), 97 deletions(-) diff --git a/MDK-ARM/L051.uvoptx b/MDK-ARM/L051.uvoptx index 8d73332..2868a1e 100644 --- a/MDK-ARM/L051.uvoptx +++ b/MDK-ARM/L051.uvoptx @@ -26,7 +26,7 @@ <ToolsetNumber>0x4</ToolsetNumber> <ToolsetName>ARM-ADS</ToolsetName> <TargetOption> - <CLKADS>32000000</CLKADS> + <CLKADS>8000000</CLKADS> <OPTTT> <gFlags>1</gFlags> <BeepAtEnd>1</BeepAtEnd> @@ -88,7 +88,7 @@ <sRmem>1</sRmem> <sRfunc>1</sRfunc> <sRbox>1</sRbox> - <tLdApp>0</tLdApp> + <tLdApp>1</tLdApp> <tGomain>1</tGomain> <tRbreak>1</tRbreak> <tRwatch>1</tRwatch> @@ -103,7 +103,7 @@ <bEvRecOn>1</bEvRecOn> <bSchkAxf>0</bSchkAxf> <bTchkAxf>0</bTchkAxf> - <nTsel>4</nTsel> + <nTsel>6</nTsel> <sDll></sDll> <sDllPa></sDllPa> <sDlgDll></sDlgDll> @@ -162,107 +162,181 @@ <Bp> <Number>0</Number> <Type>0</Type> - <LineNumber>476</LineNumber> + <LineNumber>463</LineNumber> <EnabledFlag>1</EnabledFlag> - <Address>134251848</Address> + <Address>134250582</Address> <ByteObject>0</ByteObject> <HtxType>0</HtxType> <ManyObjects>0</ManyObjects> <SizeOfObject>0</SizeOfObject> <BreakByAccess>0</BreakByAccess> <BreakIfRCount>1</BreakIfRCount> - <Filename>E:\GIT\XRange_Tag - 閸擃垱婀癨Src\application\dw_app.c</Filename> + <Filename>..\Src\radio\Lora.c</Filename> <ExecCommand></ExecCommand> - <Expression>\\L051\../Src/application/dw_app.c\476</Expression> + <Expression>\\L051\../Src/radio/Lora.c\463</Expression> </Bp> </Breakpoint> <WatchWindow1> <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list[0]</ItemText> + <ItemText>taglist_id</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_num</ItemText> + <ItemText>taglist_dist[0],0x0A</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> + <ItemText>taglist_keeptime,0x0A</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>nearbaseid_list</ItemText> + <ItemText>count1,0x0A</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>last_nearbase_num</ItemText> + <ItemText>count2,0x0A</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list</ItemText> + <ItemText>taglist_dist[0],0x0A</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>exsistbase_list[0]</ItemText> + <ItemText>taglist_dist[1],0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist,0x0A</ItemText> + <ItemText>taglist_dist[2],0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>taglist_total_num,0x0A</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>\\L051\../Src/application/dw_app.c\nearbaseid_list</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>nearbase_distlist[2]</ItemText> + <ItemText>taglist_current_index,0x0A</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>status_reg</ItemText> + <ItemText>tag_num_tosend,0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>true_exsistbase_list[0]</ItemText> + <ItemText>rec_tag_index,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>freqlost_count</ItemText> + <ItemText>taglist_current_index</ItemText> + </Ww> + <Ww> + <count>14</count> + <WinNumber>1</WinNumber> + <ItemText>temp_index</ItemText> + </Ww> + <Ww> + <count>15</count> + <WinNumber>1</WinNumber> + <ItemText>current_slotnum,0x0A</ItemText> + </Ww> + <Ww> + <count>16</count> + <WinNumber>1</WinNumber> + <ItemText>g_start_send_flag</ItemText> + </Ww> + <Ww> + <count>17</count> + <WinNumber>1</WinNumber> + <ItemText>lora_up_rec_flag11</ItemText> + </Ww> + <Ww> + <count>18</count> + <WinNumber>1</WinNumber> + <ItemText>huifushengjibaoerror_num</ItemText> + </Ww> + <Ww> + <count>19</count> + <WinNumber>1</WinNumber> + <ItemText>tttt,0x0A</ItemText> + </Ww> + <Ww> + <count>20</count> + <WinNumber>1</WinNumber> + <ItemText>current_count1</ItemText> + </Ww> + <Ww> + <count>21</count> + <WinNumber>1</WinNumber> + <ItemText>rxbuffer</ItemText> + </Ww> + <Ww> + <count>22</count> + <WinNumber>1</WinNumber> + <ItemText>muqiandeshengjibao,0x0A</ItemText> + </Ww> + <Ww> + <count>23</count> + <WinNumber>1</WinNumber> + <ItemText>huifushengjibaoerror_num</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> - <SubType>0</SubType> - <ItemText>0x0800FC00</ItemText> + <SubType>8</SubType> + <ItemText>\\L051\../Src/radio/Lora.c\rxbuffer</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> + <MemoryWindow2> + <Mm> + <WinNumber>2</WinNumber> + <SubType>0</SubType> + <ItemText>pData</ItemText> + <AccSizeX>0</AccSizeX> + </Mm> + </MemoryWindow2> + <MemoryWindow3> + <Mm> + <WinNumber>3</WinNumber> + <SubType>8</SubType> + <ItemText>0X8018000</ItemText> + <AccSizeX>0</AccSizeX> + </Mm> + </MemoryWindow3> + <MemoryWindow4> + <Mm> + <WinNumber>4</WinNumber> + <SubType>0</SubType> + <ItemText>Zhongjian_data</ItemText> + <AccSizeX>0</AccSizeX> + </Mm> + </MemoryWindow4> <Tracepoint> <THDelay>0</THDelay> </Tracepoint> <DebugFlag> <trace>0</trace> <periodic>1</periodic> - <aLwin>1</aLwin> + <aLwin>0</aLwin> <aCover>0</aCover> <aSer1>0</aSer1> <aSer2>0</aSer2> @@ -298,12 +372,6 @@ <pszMrulep></pszMrulep> <pSingCmdsp></pSingCmdsp> <pMultCmdsp></pMultCmdsp> - <SystemViewers> - <Entry> - <Name>System Viewer\LPTIM</Name> - <WinId>35905</WinId> - </Entry> - </SystemViewers> <DebugDescription> <Enable>1</Enable> <EnableFlashSeq>0</EnableFlashSeq> @@ -536,6 +604,18 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>7</GroupNumber> + <FileNumber>15</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\application\dw_mbx_anc.c</PathWithFileName> + <FilenameWithoutPath>dw_mbx_anc.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> @@ -546,7 +626,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>15</FileNumber> + <FileNumber>16</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -558,7 +638,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>16</FileNumber> + <FileNumber>17</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -570,7 +650,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>17</FileNumber> + <FileNumber>18</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -583,14 +663,114 @@ </Group> <Group> - <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> + <GroupName>Drivers/CMSIS</GroupName> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>18</FileNumber> + <FileNumber>19</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> + <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>radio</GroupName> + <tvExp>1</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>20</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\crc.c</PathWithFileName> + <FilenameWithoutPath>crc.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>21</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\delay.c</PathWithFileName> + <FilenameWithoutPath>delay.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>22</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\radio.c</PathWithFileName> + <FilenameWithoutPath>radio.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>23</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\sx126x.c</PathWithFileName> + <FilenameWithoutPath>sx126x.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>24</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\sx126x-board.c</PathWithFileName> + <FilenameWithoutPath>sx126x-board.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>25</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>..\Src\radio\Lora.c</PathWithFileName> + <FilenameWithoutPath>Lora.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + </Group> + + <Group> + <GroupName>Drivers/STM32L0xx_HAL_Driver</GroupName> + <tvExp>1</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <cbSel>0</cbSel> + <RteFlg>0</RteFlg> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -601,8 +781,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>19</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -613,8 +793,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>20</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -625,8 +805,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>21</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -637,8 +817,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>22</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>30</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -649,8 +829,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>23</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>31</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -661,8 +841,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>24</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>32</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -673,8 +853,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>25</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>33</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -685,8 +865,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>26</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>34</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -697,8 +877,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>27</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>35</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -709,8 +889,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>28</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>36</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -721,8 +901,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>29</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>37</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -733,8 +913,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>30</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>38</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -745,8 +925,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>31</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>39</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -757,8 +937,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>32</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>40</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -769,8 +949,20 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>33</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>41</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_exti.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_exti.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>11</GroupNumber> + <FileNumber>42</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -781,8 +973,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>34</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>43</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -793,8 +985,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>35</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>44</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -805,8 +997,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>36</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>45</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -817,8 +1009,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>37</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>46</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -829,8 +1021,8 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>38</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>47</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -841,34 +1033,14 @@ <bShared>0</bShared> </File> <File> - <GroupNumber>9</GroupNumber> - <FileNumber>39</FileNumber> + <GroupNumber>11</GroupNumber> + <FileNumber>48</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart_ex.c</PathWithFileName> <FilenameWithoutPath>stm32l0xx_hal_uart_ex.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - </Group> - - <Group> - <GroupName>Drivers/CMSIS</GroupName> - <tvExp>1</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <cbSel>0</cbSel> - <RteFlg>0</RteFlg> - <File> - <GroupNumber>10</GroupNumber> - <FileNumber>40</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Src/system_stm32l0xx.c</PathWithFileName> - <FilenameWithoutPath>system_stm32l0xx.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> -- Gitblit v1.9.3