From cc919e4e5e2395b61b86f922a07440f47ae2ad0a Mon Sep 17 00:00:00 2001 From: WXK <287788329@qq.com> Date: 星期一, 24 二月 2025 15:25:16 +0800 Subject: [PATCH] 开发差不多完成,等新板子来了测一下充电跟休眠那块的逻辑。目前4g跟gps上传那块跟urtf4的差不多。 --- keil/uwb_simple_example.uvoptx | 208 ++++++--------------------------------------------- 1 files changed, 27 insertions(+), 181 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 327e8d6..48b1f2d 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -120,6 +120,7 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> + <Name></Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -152,207 +153,77 @@ <Ww> <count>0</count> <WinNumber>1</WinNumber> - <ItemText>valid_sts</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>1</WinNumber> - <ItemText>rx_buf</ItemText> + <ItemText>taglist_pos</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>tagid_list[0]</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>wltag_statetimer</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> + <ItemText>TAG_KEEPTIMES</ItemText> </Ww> <Ww> <count>5</count> <WinNumber>1</WinNumber> - <ItemText>temp_count3,0x0A</ItemText> + <ItemText>taglist_num</ItemText> </Ww> <Ww> <count>6</count> <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\temp_count1,0x0A</ItemText> + <ItemText>tagdist_list,0x0A</ItemText> </Ww> <Ww> <count>7</count> <WinNumber>1</WinNumber> - <ItemText>anchordata_id</ItemText> + <ItemText>tagofflinetime,0x0A</ItemText> </Ww> <Ww> <count>8</count> <WinNumber>1</WinNumber> - <ItemText>anchordata_dist,0x0A</ItemText> + <ItemText>tagid_list</ItemText> </Ww> <Ww> <count>9</count> <WinNumber>1</WinNumber> - <ItemText>get_in_num,0x0A</ItemText> + <ItemText>dev_id</ItemText> </Ww> <Ww> <count>10</count> <WinNumber>1</WinNumber> - <ItemText>anchor_id_in</ItemText> + <ItemText>input5vflag</ItemText> </Ww> <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>tagofflinetime[0],0x0A</ItemText> + <ItemText>-ledontime,0x0A</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>tagofflinetime[1],0x0A</ItemText> + <ItemText>port,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist,0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>distance,0x0A</ItemText> - </Ww> - <Ww> - <count>15</count> - <WinNumber>1</WinNumber> - <ItemText>get_out_num,0x0A</ItemText> - </Ww> - <Ww> - <count>16</count> - <WinNumber>1</WinNumber> - <ItemText>anchor_id_out</ItemText> - </Ww> - <Ww> - <count>17</count> - <WinNumber>1</WinNumber> - <ItemText>anchor_id_in</ItemText> - </Ww> - <Ww> - <count>18</count> - <WinNumber>1</WinNumber> - <ItemText>get_in_num</ItemText> - </Ww> - <Ww> - <count>19</count> - <WinNumber>1</WinNumber> - <ItemText>change_count,0x0A</ItemText> - </Ww> - <Ww> - <count>20</count> - <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> - </Ww> - <Ww> - <count>21</count> - <WinNumber>1</WinNumber> - <ItemText>temp_internal,0x0A</ItemText> - </Ww> - <Ww> - <count>22</count> - <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>23</count> - <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_output[0]</ItemText> - </Ww> - <Ww> - <count>24</count> - <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_config,0x10</ItemText> - </Ww> - <Ww> - <count>25</count> - <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_output[1],0x10</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>temp_ack2</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>statistic_num</ItemText> - </Ww> - <Ww> - <count>28</count> - <WinNumber>1</WinNumber> - <ItemText>pca9555writedata_input,0x10</ItemText> - </Ww> - <Ww> - <count>29</count> - <WinNumber>1</WinNumber> - <ItemText>wltag_uwbtimer</ItemText> - </Ww> - <Ww> - <count>30</count> - <WinNumber>1</WinNumber> - <ItemText>wltag_statetimer</ItemText> - </Ww> - <Ww> - <count>31</count> - <WinNumber>1</WinNumber> - <ItemText>wltag_state</ItemText> - </Ww> - <Ww> - <count>32</count> - <WinNumber>1</WinNumber> - <ItemText>uwb_losttimer,0x0A</ItemText> - </Ww> - <Ww> - <count>33</count> - <WinNumber>1</WinNumber> - <ItemText>flag_temp1</ItemText> - </Ww> - <Ww> - <count>34</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[10],0x0A</ItemText> - </Ww> - <Ww> - <count>35</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[11],0x0A</ItemText> - </Ww> - <Ww> - <count>36</count> - <WinNumber>1</WinNumber> - <ItemText>uwb_rx_flag</ItemText> - </Ww> - <Ww> - <count>37</count> - <WinNumber>1</WinNumber> - <ItemText>m_EUART_DMA_RXBuf</ItemText> - </Ww> - <Ww> - <count>38</count> - <WinNumber>1</WinNumber> - <ItemText>fVoltage_mv,0x0A</ItemText> - </Ww> - <Ww> - <count>39</count> - <WinNumber>1</WinNumber> - <ItemText>state5v</ItemText> - </Ww> - <Ww> - <count>40</count> - <WinNumber>1</WinNumber> - <ItemText>state5V_prase_flag</ItemText> + <ItemText>mUsartReceivePack</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -369,49 +240,24 @@ <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>anchordata_id[0]</ItemText> + <ItemText>tagofflinetime[0]</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>anchordata_id[1]</ItemText> + <ItemText>tagofflinetime[1]</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[0]</ItemText> - </Ww> - <Ww> - <count>5</count> - <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[1]</ItemText> - </Ww> - <Ww> - <count>6</count> - <WinNumber>2</WinNumber> - <ItemText>distance,0x0A</ItemText> - </Ww> - <Ww> - <count>7</count> - <WinNumber>2</WinNumber> <ItemText>tag_id_recv</ItemText> - </Ww> - <Ww> - <count>8</count> - <WinNumber>2</WinNumber> - <ItemText>anchordata_dist[0],0x0A</ItemText> - </Ww> - <Ww> - <count>9</count> - <WinNumber>2</WinNumber> - <ItemText>anchordata_dist[1],0x0A</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> <SubType>8</SubType> - <ItemText>\\uwb_simple_example\include/drivers/serial_at_cmd_app.c\mUsart2ReceivePack</ItemText> + <ItemText>\\uwb_simple_example\include/drivers/Usart.c\m_EUART_DMA_RXBuf</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -538,7 +384,7 @@ <Group> <GroupName>Driver</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -1025,8 +871,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\gps.c</PathWithFileName> - <FilenameWithoutPath>gps.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_app.c</PathWithFileName> + <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1037,8 +883,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_app.c</PathWithFileName> - <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_tag.c</PathWithFileName> + <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1049,8 +895,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_tag.c</PathWithFileName> - <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\GPS.c</PathWithFileName> + <FilenameWithoutPath>GPS.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1186,7 +1032,7 @@ <Group> <GroupName>Platform</GroupName> - <tvExp>1</tvExp> + <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> -- Gitblit v1.9.3