From 50bba4559b0c7846613efd6bf9ec8a9c3b1982ce Mon Sep 17 00:00:00 2001
From: WXK <287788329@qq.com>
Date: 星期二, 18 二月 2025 16:59:11 +0800
Subject: [PATCH] 移植了外国sx1268lora模块代码。等板子再调，刚把error解决
---
keil/uwb_simple_example.uvoptx | 269 +++++++++++++++++++++++------------------------------
1 files changed, 119 insertions(+), 150 deletions(-)
diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx
index c788ba5..f0245cc 100644
--- a/keil/uwb_simple_example.uvoptx
+++ b/keil/uwb_simple_example.uvoptx
@@ -120,7 +120,7 @@
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
- <Name></Name>
+ <Name>d</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
@@ -153,207 +153,127 @@
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
- <ItemText>distance,0x0A</ItemText>
+ <ItemText>resp_tx_num</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
- <ItemText>alarm_type</ItemText>
+ <ItemText>tagdist_list[taglist_pos]</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_power_state,0x0A</ItemText>
+ <ItemText>tagdist_list,0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
- <ItemText>bat_percent,0x0A</ItemText>
+ <ItemText>maintime,0x0A</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
- <ItemText>fVoltage_mv,0x0A</ItemText>
+ <ItemText>g_com_map</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
- <ItemText>g_com_map</ItemText>
+ <ItemText>Loratx_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsartReceivePack</ItemText>
+ <ItemText>Lorarx_time_out_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
- <ItemText>flag_sleeptimer</ItemText>
+ <ItemText>lora_jianting_flag</ItemText>
</Ww>
<Ww>
<count>8</count>
<WinNumber>1</WinNumber>
- <ItemText>current_count,0x0A</ItemText>
+ <ItemText>freq,0x0A</ItemText>
</Ww>
<Ww>
<count>9</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>debugfreq,0x0A</ItemText>
</Ww>
<Ww>
<count>10</count>
<WinNumber>1</WinNumber>
- <ItemText>end_receive_count,0x0A</ItemText>
+ <ItemText>lora_huanxing_count</ItemText>
</Ww>
<Ww>
<count>11</count>
<WinNumber>1</WinNumber>
- <ItemText>\\uwb_simple_example\../keil/uwb_app.c\current_count,0x0A</ItemText>
+ <ItemText>BufferSize</ItemText>
</Ww>
<Ww>
<count>12</count>
<WinNumber>1</WinNumber>
- <ItemText>UWB_work_state,0x0A</ItemText>
+ <ItemText>Loratx_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>13</count>
<WinNumber>1</WinNumber>
- <ItemText>rx_rpt,0x10</ItemText>
+ <ItemText>Lorarx_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>14</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count,0x0A</ItemText>
+ <ItemText>Lorarx_time_out_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>15</count>
<WinNumber>1</WinNumber>
- <ItemText>temp_count3,0x0A</ItemText>
+ <ItemText>Lorarx_time_error_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>16</count>
<WinNumber>1</WinNumber>
- <ItemText>mUsart2ReceivePack</ItemText>
+ <ItemText>Lorairq_time_flag,0x0A</ItemText>
</Ww>
<Ww>
<count>17</count>
<WinNumber>1</WinNumber>
- <ItemText>gps_prase_flag</ItemText>
+ <ItemText>lora_huanxing_count,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>1</WinNumber>
- <ItemText>uwb_searchcount,0x0A</ItemText>
+ <ItemText>wg_report_freq,0x0A</ItemText>
</Ww>
<Ww>
<count>19</count>
<WinNumber>1</WinNumber>
- <ItemText>wd</ItemText>
+ <ItemText>wg_report_sf</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
- <ItemText>jd</ItemText>
+ <ItemText>dangqian_frqe,0x0A</ItemText>
</Ww>
<Ww>
<count>21</count>
<WinNumber>1</WinNumber>
- <ItemText>pos_state,0x0A</ItemText>
+ <ItemText>RX_Buffer</ItemText>
</Ww>
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
- <ItemText>ret</ItemText>
+ <ItemText>RX_Buffer</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
- <ItemText>successful_cnt,0x0A</ItemText>
+ <ItemText>wg_report_id</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>
+ <ItemText>wg_state</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
@@ -447,6 +367,11 @@
<WinNumber>2</WinNumber>
<ItemText>sleep_time_count,0x0A</ItemText>
</Ww>
+ <Ww>
+ <count>18</count>
+ <WinNumber>2</WinNumber>
+ <ItemText>maintime,0x0A</ItemText>
+ </Ww>
</WatchWindow2>
<MemoryWindow1>
<Mm>
@@ -462,7 +387,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
- <aLwin>1</aLwin>
+ <aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
@@ -1083,18 +1008,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
- <File>
- <GroupNumber>4</GroupNumber>
- <FileNumber>47</FileNumber>
- <FileType>1</FileType>
- <tvExp>0</tvExp>
- <tvExpOptDlg>0</tvExpOptDlg>
- <bDave2>0</bDave2>
- <PathWithFileName>.\lora_3029.c</PathWithFileName>
- <FilenameWithoutPath>lora_3029.c</FilenameWithoutPath>
- <RteFlg>0</RteFlg>
- <bShared>0</bShared>
- </File>
</Group>
<Group>
@@ -1105,7 +1018,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>48</FileNumber>
+ <FileNumber>47</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1117,7 +1030,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>49</FileNumber>
+ <FileNumber>48</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1129,7 +1042,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>50</FileNumber>
+ <FileNumber>49</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1141,7 +1054,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>51</FileNumber>
+ <FileNumber>50</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1153,7 +1066,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>52</FileNumber>
+ <FileNumber>51</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1165,7 +1078,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>53</FileNumber>
+ <FileNumber>52</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1177,7 +1090,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>54</FileNumber>
+ <FileNumber>53</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1189,7 +1102,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>55</FileNumber>
+ <FileNumber>54</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1201,7 +1114,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>56</FileNumber>
+ <FileNumber>55</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1213,7 +1126,7 @@
</File>
<File>
<GroupNumber>5</GroupNumber>
- <FileNumber>57</FileNumber>
+ <FileNumber>56</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1233,7 +1146,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>58</FileNumber>
+ <FileNumber>57</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1245,7 +1158,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>59</FileNumber>
+ <FileNumber>58</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1257,7 +1170,7 @@
</File>
<File>
<GroupNumber>6</GroupNumber>
- <FileNumber>60</FileNumber>
+ <FileNumber>59</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1285,7 +1198,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>61</FileNumber>
+ <FileNumber>60</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1297,7 +1210,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
- <FileNumber>62</FileNumber>
+ <FileNumber>61</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1317,7 +1230,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
- <FileNumber>63</FileNumber>
+ <FileNumber>62</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1331,13 +1244,13 @@
<Group>
<GroupName>Internet</GroupName>
- <tvExp>1</tvExp>
+ <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>64</FileNumber>
+ <FileNumber>63</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1349,7 +1262,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>65</FileNumber>
+ <FileNumber>64</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1361,7 +1274,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>66</FileNumber>
+ <FileNumber>65</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1373,7 +1286,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>67</FileNumber>
+ <FileNumber>66</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1385,7 +1298,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>68</FileNumber>
+ <FileNumber>67</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1397,7 +1310,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>69</FileNumber>
+ <FileNumber>68</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1409,7 +1322,7 @@
</File>
<File>
<GroupNumber>10</GroupNumber>
- <FileNumber>70</FileNumber>
+ <FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1429,7 +1342,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
- <FileNumber>71</FileNumber>
+ <FileNumber>70</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1439,27 +1352,83 @@
<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>11</GroupNumber>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>71</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\components\radio\crc.c</PathWithFileName>
+ <FilenameWithoutPath>crc.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
<FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_port.c</PathWithFileName>
- <FilenameWithoutPath>pan_port.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\components\radio\delay.c</PathWithFileName>
+ <FilenameWithoutPath>delay.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
- <GroupNumber>11</GroupNumber>
+ <GroupNumber>12</GroupNumber>
<FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
- <PathWithFileName>.\include\components\hal\pan_rf.c</PathWithFileName>
- <FilenameWithoutPath>pan_rf.c</FilenameWithoutPath>
+ <PathWithFileName>.\include\components\radio\Lora.c</PathWithFileName>
+ <FilenameWithoutPath>Lora.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>74</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\components\radio\radio.c</PathWithFileName>
+ <FilenameWithoutPath>radio.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>75</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\components\radio\sx126x.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x.c</FilenameWithoutPath>
+ <RteFlg>0</RteFlg>
+ <bShared>0</bShared>
+ </File>
+ <File>
+ <GroupNumber>12</GroupNumber>
+ <FileNumber>76</FileNumber>
+ <FileType>1</FileType>
+ <tvExp>0</tvExp>
+ <tvExpOptDlg>0</tvExpOptDlg>
+ <bDave2>0</bDave2>
+ <PathWithFileName>.\include\components\radio\sx126x-board.c</PathWithFileName>
+ <FilenameWithoutPath>sx126x-board.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
--
Gitblit v1.9.3