From 5ee4fd97245fed0d45fb60d1aa38cca83e788ed5 Mon Sep 17 00:00:00 2001
From: zhangbo <zhangbo@qq.com>
Date: 星期二, 20 五月 2025 16:13:14 +0800
Subject: [PATCH] 修改了计步逻辑还有蓝牙上传逻辑
---
keil/uwb_simple_example.uvoptx | 311 ++++++++++++++++++++++-----------------------------
1 files changed, 137 insertions(+), 174 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index e348593..6067cdb 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -153,269 +153,134 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>alarm_type</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_power_state,0x0A</ItemText>
+ <ItemText>taglist_pos</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>bat_percent,0x0A</ItemText>
+ <ItemText>rec_ancdistlist</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>fVoltage_mv,0x0A</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
+ <ItemText>resp_tx_num</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>flag_sleeptimer</ItemText>
+ <ItemText>REPLY_POLL_NUM</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>current_count,0x0A</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>end_receive_count,0x0A</ItemText>
+ <ItemText>tagdist_list</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>\\uwb_simple_example\../keil/uwb_app.c\current_count,0x0A</ItemText>
+ <ItemText>temp_count3</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>UWB_work_state,0x0A</ItemText>
+ <ItemText>resp_tx_en_start_u32</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>temp_count1</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count,0x0A</ItemText>
+ <ItemText>temp_count2</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count3,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>16</count>
- <WinNumber>1</WinNumber>
- <ItemText>mUsart2ReceivePack</ItemText>
- </Ww>
- <Ww>
- <count>17</count>
- <WinNumber>1</WinNumber>
- <ItemText>gps_prase_flag</ItemText>
- </Ww>
- <Ww>
- <count>18</count>
- <WinNumber>1</WinNumber>
- <ItemText>uwb_searchcount,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>19</count>
- <WinNumber>1</WinNumber>
- <ItemText>wd</ItemText>
- </Ww>
- <Ww>
- <count>20</count>
- <WinNumber>1</WinNumber>
- <ItemText>jd</ItemText>
- </Ww>
- <Ww>
- <count>21</count>
- <WinNumber>1</WinNumber>
- <ItemText>pos_state,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>22</count>
- <WinNumber>1</WinNumber>
- <ItemText>ret</ItemText>
- </Ww>
- <Ww>
- <count>23</count>
- <WinNumber>1</WinNumber>
- <ItemText>successful_cnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>24</count>
- <WinNumber>1</WinNumber>
- <ItemText>error_cnt,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>25</count>
- <WinNumber>1</WinNumber>
- <ItemText>ceshi,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>26</count>
- <WinNumber>1</WinNumber>
- <ItemText>io14_state</ItemText>
- </Ww>
- <Ww>
- <count>27</count>
- <WinNumber>1</WinNumber>
- <ItemText>RxDoneParams</ItemText>
- </Ww>
- <Ww>
- <count>28</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
- </Ww>
- <Ww>
- <count>29</count>
- <WinNumber>1</WinNumber>
- <ItemText>uwb_rxflag,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>30</count>
- <WinNumber>1</WinNumber>
- <ItemText>resp_tx_num</ItemText>
- </Ww>
- <Ww>
- <count>31</count>
- <WinNumber>1</WinNumber>
- <ItemText>timeceshi1,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>32</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp_count7,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>33</count>
- <WinNumber>1</WinNumber>
- <ItemText>temp_count3,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>34</count>
- <WinNumber>1</WinNumber>
- <ItemText>uwb_rxflag_num,0x0A</ItemText>
- </Ww>
- <Ww>
- <count>35</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_ancidlist</ItemText>
- </Ww>
- <Ww>
- <count>36</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_ancdistlist</ItemText>
- </Ww>
- <Ww>
- <count>37</count>
- <WinNumber>1</WinNumber>
- <ItemText>rx_rpt</ItemText>
- </Ww>
- <Ww>
- <count>38</count>
- <WinNumber>1</WinNumber>
- <ItemText>current_count</ItemText>
- </Ww>
- <Ww>
- <count>39</count>
- <WinNumber>1</WinNumber>
- <ItemText>end_receive_count</ItemText>
- </Ww>
- <Ww>
- <count>40</count>
- <WinNumber>1</WinNumber>
- <ItemText>rec_nearbase_num</ItemText>
- </Ww>
- <Ww>
- <count>41</count>
- <WinNumber>1</WinNumber>
- <ItemText>delaytime</ItemText>
- </Ww>
- <Ww>
- <count>42</count>
- <WinNumber>1</WinNumber>
- <ItemText>REV_RX_NUM</ItemText>
+ <ItemText>temp_count</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
<count>0</count>
<WinNumber>2</WinNumber>
- <ItemText>REV_RX_NUM</ItemText>
+ <ItemText>elapsed_time_jibu,0x0A</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>2</WinNumber>
- <ItemText>REV_POLL_NUM</ItemText>
+ <ItemText>tag_id_recv</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>2</WinNumber>
- <ItemText>REPLY_POLL_NUM</ItemText>
+ <ItemText>rx_buf</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>2</WinNumber>
- <ItemText>num</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>2</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>send_buffer</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>2</WinNumber>
- <ItemText>tag_id_recv</ItemText>
+ <ItemText>rec_nearbase_num</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>2</WinNumber>
- <ItemText>tagid_list</ItemText>
+ <ItemText>UWB_TX_OK</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>2</WinNumber>
- <ItemText>taglist_num</ItemText>
+ <ItemText>tx_report</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>2</WinNumber>
- <ItemText>rx_report</ItemText>
+ <ItemText>resp_tx_en_start_u32,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>2</WinNumber>
- <ItemText>TX_CALL_POLL_NUM</ItemText>
+ <ItemText>resp_tx_en_start_u32</ItemText>
</Ww>
<Ww>
<count>10</count>
@@ -425,12 +290,102 @@
<Ww>
<count>11</count>
<WinNumber>2</WinNumber>
- <ItemText>lora_sendbuffer</ItemText>
+ <ItemText>tagid_list</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>2</WinNumber>
- <ItemText>BT_SEND_flag,0x0A</ItemText>
+ <ItemText>tagofflinetime</ItemText>
+ </Ww>
+ <Ww>
+ <count>13</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>taglist_num</ItemText>
+ </Ww>
+ <Ww>
+ <count>14</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>tagofflinetime[i]</ItemText>
+ </Ww>
+ <Ww>
+ <count>15</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>report_ancnum</ItemText>
+ </Ww>
+ <Ww>
+ <count>16</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>BT_NUM</ItemText>
+ </Ww>
+ <Ww>
+ <count>17</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>mUsartReceivePack</ItemText>
+ </Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>DMA_RXBuf_BT</ItemText>
+ </Ww>
+ <Ww>
+ <count>19</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>pack_datalen,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>20</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>data_H</ItemText>
+ </Ww>
+ <Ww>
+ <count>21</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>num</ItemText>
+ </Ww>
+ <Ww>
+ <count>22</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>value</ItemText>
+ </Ww>
+ <Ww>
+ <count>23</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>data_L</ItemText>
+ </Ww>
+ <Ww>
+ <count>24</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>lora_sendbuffer</ItemText>
+ </Ww>
+ <Ww>
+ <count>25</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>send_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>26</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>step_count,0x0A</ItemText>
+ </Ww>
+ <Ww>
+ <count>27</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>step_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>28</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>exercise_state</ItemText>
+ </Ww>
+ <Ww>
+ <count>29</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>step_count</ItemText>
+ </Ww>
+ <Ww>
+ <count>30</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>last_step_count</ItemText>
</Ww>
</WatchWindow2>
<MemoryWindow1>
@@ -496,7 +451,7 @@
<Group>
<GroupName>Algo</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -540,7 +495,7 @@
<Group>
<GroupName>Device</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -572,7 +527,7 @@
<Group>
<GroupName>Driver</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -916,7 +871,7 @@
<Group>
<GroupName>Main</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1220,7 +1175,7 @@
<Group>
<GroupName>Platform</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1272,7 +1227,7 @@
<Group>
<GroupName>Utility</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1304,7 +1259,7 @@
<Group>
<GroupName>HidoLib</GroupName>
- <tvExp>0</tvExp>
+ <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1459,8 +1414,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName>
- <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -1471,8 +1426,8 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\src\Radio\sx126x.c</PathWithFileName>
- <FilenameWithoutPath>sx126x.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\src\Radio\radio.c</PathWithFileName>
+ <FilenameWithoutPath>radio.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@@ -1514,4 +1469,12 @@
</File>
</Group>
+ <Group>
+ <GroupName>SC7A22Hlib</GroupName>
+ <tvExp>1</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <cbSel>0</cbSel>
+ <RteFlg>0</RteFlg>
+ </Group>
+
</ProjectOpt>
--
Gitblit v1.9.3