From 2bda5756b312bfd5e6e7633f1b94bad36f81559b Mon Sep 17 00:00:00 2001 From: 钟印成 <zhyinch@gmail.com> Date: 星期三, 26 三月 2025 23:05:26 +0800 Subject: [PATCH] 修改状态机不跑BUG --- keil/uwb_simple_example.uvoptx | 250 ++++++++++++++++++++++++++++--------------------- 1 files changed, 144 insertions(+), 106 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 3d76d57..7d50441 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -120,12 +120,12 @@ <SetRegEntry> <Number>0</Number> <Key>DLGUARM</Key> - <Name></Name> + <Name>d</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> <Key>JL2CM3</Key> - <Name>-U20090928 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name> + <Name>-U20090928 -O78 -S1 -ZTIFSpeedSel10000 -A0 -C0 -JU1 -JI127.0.0.1 -JP0 -RST0 -N00("ARM CoreSight SW-DP") -D00(0BB11477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8008 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -TB1 -TFE0 -FO15 -FD2020000 -FC8000 -FN1 -FF0MK800X_512K.FLM -FS00 -FL080000 -FP0($$Device:MK8000$Flash\MK800X_512K.FLM)</Name> </SetRegEntry> <SetRegEntry> <Number>0</Number> @@ -238,107 +238,37 @@ <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> - </Ww> - <Ww> - <count>24</count> - <WinNumber>1</WinNumber> - <ItemText>test31,0x0A</ItemText> - </Ww> - <Ww> - <count>25</count> - <WinNumber>1</WinNumber> - <ItemText>test41,0x0A</ItemText> - </Ww> - <Ww> - <count>26</count> - <WinNumber>1</WinNumber> - <ItemText>test51</ItemText> - </Ww> - <Ww> - <count>27</count> - <WinNumber>1</WinNumber> - <ItemText>flag_temp1</ItemText> - </Ww> - <Ww> - <count>28</count> - <WinNumber>1</WinNumber> - <ItemText>secondtask_count,0x0A</ItemText> - </Ww> - <Ww> - <count>29</count> - <WinNumber>1</WinNumber> - <ItemText>rxnum,0x0A</ItemText> - </Ww> - <Ww> - <count>30</count> - <WinNumber>1</WinNumber> - <ItemText>resp_tx_error,0x0A</ItemText> - </Ww> - <Ww> - <count>31</count> - <WinNumber>1</WinNumber> - <ItemText>flag_temp2</ItemText> - </Ww> - <Ww> - <count>32</count> - <WinNumber>1</WinNumber> - <ItemText>rxnumoknum</ItemText> - </Ww> - <Ww> - <count>33</count> - <WinNumber>1</WinNumber> - <ItemText>rxnumerrornum</ItemText> - </Ww> - <Ww> - <count>34</count> - <WinNumber>1</WinNumber> - <ItemText>temp_endcount1,0x0A</ItemText> - </Ww> - <Ww> - <count>35</count> - <WinNumber>1</WinNumber> - <ItemText>temp_count1,0x0A</ItemText> - </Ww> - <Ww> - <count>36</count> - <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> - </Ww> - <Ww> - <count>37</count> - <WinNumber>1</WinNumber> - <ItemText>resp_tx_num</ItemText> + <ItemText>url</ItemText> </Ww> </WatchWindow1> <WatchWindow2> @@ -371,8 +301,8 @@ <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> @@ -1027,6 +957,54 @@ <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> </Group> <Group> @@ -1037,7 +1015,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>5</GroupNumber> - <FileNumber>49</FileNumber> + <FileNumber>53</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1049,7 +1027,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>50</FileNumber> + <FileNumber>54</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1061,7 +1039,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>51</FileNumber> + <FileNumber>55</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1073,7 +1051,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>52</FileNumber> + <FileNumber>56</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1085,7 +1063,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>53</FileNumber> + <FileNumber>57</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1097,7 +1075,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>54</FileNumber> + <FileNumber>58</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1109,7 +1087,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>55</FileNumber> + <FileNumber>59</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1121,7 +1099,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>56</FileNumber> + <FileNumber>60</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1133,7 +1111,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>57</FileNumber> + <FileNumber>61</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1145,7 +1123,7 @@ </File> <File> <GroupNumber>5</GroupNumber> - <FileNumber>58</FileNumber> + <FileNumber>62</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1165,7 +1143,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>6</GroupNumber> - <FileNumber>59</FileNumber> + <FileNumber>63</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1177,7 +1155,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>60</FileNumber> + <FileNumber>64</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1189,7 +1167,7 @@ </File> <File> <GroupNumber>6</GroupNumber> - <FileNumber>61</FileNumber> + <FileNumber>65</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1217,7 +1195,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>8</GroupNumber> - <FileNumber>62</FileNumber> + <FileNumber>66</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1229,7 +1207,7 @@ </File> <File> <GroupNumber>8</GroupNumber> - <FileNumber>63</FileNumber> + <FileNumber>67</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1249,13 +1227,25 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>9</GroupNumber> - <FileNumber>64</FileNumber> + <FileNumber>68</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>69</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 +1259,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>10</GroupNumber> - <FileNumber>65</FileNumber> + <FileNumber>70</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1281,7 +1271,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>66</FileNumber> + <FileNumber>71</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1293,7 +1283,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>67</FileNumber> + <FileNumber>72</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1305,7 +1295,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>68</FileNumber> + <FileNumber>73</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1317,7 +1307,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>69</FileNumber> + <FileNumber>74</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1329,7 +1319,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>70</FileNumber> + <FileNumber>75</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1341,7 +1331,7 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>71</FileNumber> + <FileNumber>76</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> @@ -1353,13 +1343,61 @@ </File> <File> <GroupNumber>10</GroupNumber> - <FileNumber>72</FileNumber> + <FileNumber>77</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>78</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>79</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>80</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>81</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 +1411,7 @@ <RteFlg>0</RteFlg> <File> <GroupNumber>11</GroupNumber> - <FileNumber>73</FileNumber> + <FileNumber>82</FileNumber> <FileType>1</FileType> <tvExp>0</tvExp> <tvExpOptDlg>0</tvExpOptDlg> -- Gitblit v1.9.3