From 9667a85ddd12abcad4b4b5df85c7f624a66d3c1f Mon Sep 17 00:00:00 2001 From: zhangbo <zhangbo@qq.com> Date: 星期五, 04 七月 2025 17:48:04 +0800 Subject: [PATCH] V1.27修改休眠引脚的4G的唤醒脚,修改了静止休眠不进入,添加读取引脚电平逻辑 --- keil/uwb_simple_example.uvoptx | 280 ++++++++++++++++++++++++++++++++++++++++++------------- 1 files changed, 212 insertions(+), 68 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 3d76d57..82e82c1 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -238,141 +238,141 @@ <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>gpio_state111</ItemText> + <ItemText>stHost</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>uwbtasktimer</ItemText> + <ItemText>stPath</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>tagdist_list[taglist_pos]</ItemText> + <ItemText>testdata,0x10</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>taglist_num</ItemText> + <ItemText>l_stTTSQueue</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32</ItemText> + <ItemText>l_eOTAState</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>test11,0x0A</ItemText> + <ItemText>_pcUrl</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>test21,0x0A</ItemText> + <ItemText>url</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>test31,0x0A</ItemText> + <ItemText>current_state</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>test41,0x0A</ItemText> + <ItemText>userkey_state</ItemText> </Ww> <Ww> <count>26</count> <WinNumber>1</WinNumber> - <ItemText>test51</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>27</count> <WinNumber>1</WinNumber> - <ItemText>flag_temp1</ItemText> + <ItemText>elapsed_time_jibu,0x0A</ItemText> </Ww> <Ww> <count>28</count> <WinNumber>1</WinNumber> - <ItemText>secondtask_count,0x0A</ItemText> + <ItemText>uwb_time_count,0x0A</ItemText> </Ww> <Ww> <count>29</count> <WinNumber>1</WinNumber> - <ItemText>rxnum,0x0A</ItemText> + <ItemText>state_start_time,0x0A</ItemText> </Ww> <Ww> <count>30</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_error,0x0A</ItemText> + <ItemText>current_state</ItemText> </Ww> <Ww> <count>31</count> <WinNumber>1</WinNumber> - <ItemText>flag_temp2</ItemText> + <ItemText>bat_percent,0x0A</ItemText> </Ww> <Ww> <count>32</count> <WinNumber>1</WinNumber> - <ItemText>rxnumoknum</ItemText> + <ItemText>cnn</ItemText> </Ww> <Ww> <count>33</count> <WinNumber>1</WinNumber> - <ItemText>rxnumerrornum</ItemText> + <ItemText>drv_state</ItemText> </Ww> <Ww> <count>34</count> <WinNumber>1</WinNumber> - <ItemText>temp_endcount1,0x0A</ItemText> + <ItemText>Height</ItemText> </Ww> <Ww> <count>35</count> <WinNumber>1</WinNumber> - <ItemText>temp_count1,0x0A</ItemText> + <ItemText>gaodu,0x0A</ItemText> </Ww> <Ww> <count>36</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>pressure</ItemText> </Ww> <Ww> <count>37</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_num</ItemText> + <ItemText>temperature</ItemText> </Ww> </WatchWindow1> <WatchWindow2> <Ww> <count>0</count> <WinNumber>2</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>g_com_map</ItemText> </Ww> <Ww> <count>1</count> <WinNumber>2</WinNumber> - <ItemText>rec_ancdistlist[1]</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> <Ww> <count>2</count> <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[0]</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> <Ww> <count>3</count> <WinNumber>2</WinNumber> - <ItemText>tagofflinetime[1]</ItemText> + <ItemText>apcSplitStr</ItemText> </Ww> <Ww> <count>4</count> <WinNumber>2</WinNumber> - <ItemText>tag_id_recv</ItemText> + <ItemText>g_com_map</ItemText> </Ww> </WatchWindow2> <MemoryWindow1> <Mm> <WinNumber>1</WinNumber> - <SubType>8</SubType> - <ItemText>\\uwb_simple_example\include/drivers/Usart.c\m_EUART_DMA_RXBuf</ItemText> + <SubType>0</SubType> + <ItemText>0x0402f000</ItemText> <AccSizeX>0</AccSizeX> </Mm> </MemoryWindow1> @@ -499,7 +499,7 @@ <Group> <GroupName>Driver</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> @@ -890,8 +890,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\dw_tag.c</PathWithFileName> - <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath> + <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> + <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -902,8 +902,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\dw_app_anchor.c</PathWithFileName> - <FilenameWithoutPath>dw_app_anchor.c</FilenameWithoutPath> + <PathWithFileName>.\dw_tag.c</PathWithFileName> + <FilenameWithoutPath>dw_tag.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -974,8 +974,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\include\src\TCPClient.c</PathWithFileName> - <FilenameWithoutPath>TCPClient.c</FilenameWithoutPath> + <PathWithFileName>.\uwb_app.c</PathWithFileName> + <FilenameWithoutPath>uwb_app.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -986,8 +986,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> @@ -998,8 +998,8 @@ <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> - <PathWithFileName>.\uwb_tag.c</PathWithFileName> - <FilenameWithoutPath>uwb_tag.c</FilenameWithoutPath> + <PathWithFileName>.\include\src\TCPClient.c</PathWithFileName> + <FilenameWithoutPath>TCPClient.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1027,17 +1027,101 @@ <RteFlg>0</RteFlg> <bShared>0</bShared> </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>49</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\DBG.c</PathWithFileName> + <FilenameWithoutPath>DBG.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>50</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\Shell.c</PathWithFileName> + <FilenameWithoutPath>Shell.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>51</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\TCPClient_1.c</PathWithFileName> + <FilenameWithoutPath>TCPClient_1.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>52</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\OTA.c</PathWithFileName> + <FilenameWithoutPath>OTA.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>53</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\src\SPIV1.07.c</PathWithFileName> + <FilenameWithoutPath>SPIV1.07.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>54</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps310.c</PathWithFileName> + <FilenameWithoutPath>dps310.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>4</GroupNumber> + <FileNumber>55</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\drivers\dps368_test.c</PathWithFileName> + <FilenameWithoutPath>dps368_test.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> </Group> <Group> <GroupName>OS</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1049,7 +1133,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1061,7 +1145,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1073,7 +1157,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1085,7 +1169,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1097,7 +1181,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1109,7 +1193,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1121,7 +1205,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1133,7 +1217,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1145,7 +1229,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1159,13 +1243,13 @@ <Group> <GroupName>Platform</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1177,7 +1261,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1189,7 +1273,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>68</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1211,13 +1295,13 @@ <Group> <GroupName>Utility</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>69</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1229,7 +1313,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1243,19 +1327,31 @@ <Group> <GroupName>HidoLib</GroupName> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <cbSel>0</cbSel> <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>71</FileNumber> <FileType>4</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\components\hido\hido.lib</PathWithFileName> <FilenameWithoutPath>hido.lib</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>9</GroupNumber> + <FileNumber>72</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\hido\HIDO_Base64.c</PathWithFileName> + <FilenameWithoutPath>HIDO_Base64.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1269,7 +1365,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>73</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1281,7 +1377,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1293,7 +1389,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>75</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1305,7 +1401,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1317,7 +1413,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>77</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1329,7 +1425,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>78</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1341,7 +1437,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>79</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1353,13 +1449,61 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>72</FileNumber> + <FileNumber>80</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\components\internet\src\NTRIPClient.c</PathWithFileName> <FilenameWithoutPath>NTRIPClient.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>81</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\internet\src\HTTPClient.c</PathWithFileName> + <FilenameWithoutPath>HTTPClient.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>82</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\internet\src\Audio.c</PathWithFileName> + <FilenameWithoutPath>Audio.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>83</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\internet\src\TONE.c</PathWithFileName> + <FilenameWithoutPath>TONE.c</FilenameWithoutPath> + <RteFlg>0</RteFlg> + <bShared>0</bShared> + </File> + <File> + <GroupNumber>10</GroupNumber> + <FileNumber>84</FileNumber> + <FileType>1</FileType> + <tvExp>0</tvExp> + <tvExpOptDlg>0</tvExpOptDlg> + <bDave2>0</bDave2> + <PathWithFileName>.\include\components\internet\src\TTS.c</PathWithFileName> + <FilenameWithoutPath>TTS.c</FilenameWithoutPath> <RteFlg>0</RteFlg> <bShared>0</bShared> </File> @@ -1373,7 +1517,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>73</FileNumber> + <FileNumber>85</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3