From 4225a893c6c67cbed43e1aae264a3f79c010c998 Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期二, 14 一月 2025 10:32:50 +0800 Subject: [PATCH] 3.2,修改灯亮的逻辑。 --- MDK-ARM/STM32L071RB.uvoptx | 179 ++++++++++++++++++++++++++++++++++++++++------------------- 1 files changed, 122 insertions(+), 57 deletions(-) diff --git a/MDK-ARM/STM32L071RB.uvoptx b/MDK-ARM/STM32L071RB.uvoptx index 1902e63..44e9ca2 100644 --- a/MDK-ARM/STM32L071RB.uvoptx +++ b/MDK-ARM/STM32L071RB.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> @@ -163,72 +163,72 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancidlist</ItemText> + <ItemText>rx_buffer</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>LBS_data</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map</ItemText> + <ItemText>LBS_dLon</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>nomove_count,0x0A</ItemText> + <ItemText>l_acUploadBuff</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>fangchai_time,0x0A</ItemText> + <ItemText>GPS_data</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>fangchai_time</ItemText> + <ItemText>air780_state</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>_pstLBSLocation,0x10</ItemText> + <ItemText>fangchai_state</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>yundong_time,0x0A</ItemText> + <ItemText>pstData</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>_pstLBSLocation</ItemText> + <ItemText>l_acCCID</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>LBS_data</ItemText> + <ItemText>testlorarecve,0x0A</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>pclk1,0x0A</ItemText> + <ItemText>module_power</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>g_com_map[IP_0]</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancidlist</ItemText> + <ItemText>g_com_map,0x10</ItemText> </Ww> <Ww> <count>14</count> @@ -238,59 +238,124 @@ <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>tagid_list</ItemText> + <ItemText>uwb_send</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>uwb_send</ItemText> + <ItemText>GPS_data</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>l_stGPSRecv</ItemText> + <ItemText>l_au8CmdBuff</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>rx_buffer</ItemText> + <ItemText>l_acUploadBuff</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>LBS_data</ItemText> + <ItemText>l_stGPSRecv.m_acRecvBuf</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>LBS_dLon</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>l_acUploadBuff</ItemText> + <ItemText>fangchai_flag</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>GPS_data</ItemText> + <ItemText>l_u32HeartBeatTick,0x0A</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>air780_state</ItemText> + <ItemText>u32CurTick,0x0A</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>fangchai_state</ItemText> + <ItemText>debug,0x0A</ItemText> + </Ww> + <Ww> + <count>25</count> + <WinNumber>1</WinNumber> + <ItemText>debug1</ItemText> + </Ww> + <Ww> + <count>26</count> + <WinNumber>1</WinNumber> + <ItemText>debug2,0x0A</ItemText> + </Ww> + <Ww> + <count>27</count> + <WinNumber>1</WinNumber> + <ItemText>debug3</ItemText> + </Ww> + <Ww> + <count>28</count> + <WinNumber>1</WinNumber> + <ItemText>l_u32UploadBuffLen</ItemText> + </Ww> + <Ww> + <count>29</count> + <WinNumber>1</WinNumber> + <ItemText>l_au8CmdBuff</ItemText> + </Ww> + <Ww> + <count>30</count> + <WinNumber>1</WinNumber> + <ItemText>_pcGGA</ItemText> + </Ww> + <Ww> + <count>31</count> + <WinNumber>1</WinNumber> + <ItemText>GPS_ParseGGA_data</ItemText> + </Ww> + <Ww> + <count>32</count> + <WinNumber>1</WinNumber> + <ItemText>receive1_gotosleep_flag</ItemText> + </Ww> + <Ww> + <count>33</count> + <WinNumber>1</WinNumber> + <ItemText>uwb_send</ItemText> + </Ww> + <Ww> + <count>34</count> + <WinNumber>1</WinNumber> + <ItemText>debug3,0x0A</ItemText> + </Ww> + <Ww> + <count>35</count> + <WinNumber>1</WinNumber> + <ItemText>delaysleep_count</ItemText> + </Ww> + <Ww> + <count>36</count> + <WinNumber>1</WinNumber> + <ItemText>nomove_flag</ItemText> + </Ww> + <Ww> + <count>37</count> + <WinNumber>1</WinNumber> + <ItemText>nomove_count,0x0A</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> <SubType>8</SubType> - <ItemText>0x200001e4</ItemText> + <ItemText>0x2000278c</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -348,7 +413,7 @@ <Group> <GroupName>Application/MDK-ARM</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -639,6 +704,30 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> + <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart.c</PathWithFileName> + <FilenameWithoutPath>stm32l0xx_hal_uart.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>24</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> + <File> + <GroupNumber>3</GroupNumber> + <FileNumber>25</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_rtc.c</PathWithFileName> <FilenameWithoutPath>stm32l0xx_hal_rtc.c</FilenameWithoutPath> <RteFlg>0</RteFlg> @@ -646,7 +735,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>24</FileNumber> + <FileNumber>26</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -658,7 +747,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>25</FileNumber> + <FileNumber>27</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -670,7 +759,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>26</FileNumber> + <FileNumber>28</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -682,7 +771,7 @@ </File> <File> <GroupNumber>3</GroupNumber> - <FileNumber>27</FileNumber> + <FileNumber>29</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -692,35 +781,11 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>28</FileNumber> - <FileType>1</FileType> - <tvExp>0</tvExp> - <tvExpOptDlg>0</tvExpOptDlg> - <bDave2>0</bDave2> - <PathWithFileName>../Drivers/STM32L0xx_HAL_Driver/Src/stm32l0xx_hal_uart.c</PathWithFileName> - <FilenameWithoutPath>stm32l0xx_hal_uart.c</FilenameWithoutPath> - <RteFlg>0</RteFlg> - <bShared>0</bShared> - </File> - <File> - <GroupNumber>3</GroupNumber> - <FileNumber>29</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>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1212,7 +1277,7 @@ <Group> <GroupName>decadriver</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> -- Gitblit v1.9.3