From aac57c50c24aed1776566048819ad6945834be00 Mon Sep 17 00:00:00 2001 From: chen <15335560115@163.com> Date: 星期四, 14 十一月 2024 16:12:27 +0800 Subject: [PATCH] MK_GPS_4G定位手环V1.0版本,增加多数据读取功能,修改部分4G回复逻辑,修改部分充电保护4G重连逻辑 --- keil/uwb_simple_example.uvoptx | 317 ++++++++-------------------------------------------- 1 files changed, 53 insertions(+), 264 deletions(-) diff --git a/keil/uwb_simple_example.uvoptx b/keil/uwb_simple_example.uvoptx index 7ec7e5e..94ddf14 100644 --- a/keil/uwb_simple_example.uvoptx +++ b/keil/uwb_simple_example.uvoptx @@ -119,6 +119,10 @@ <TargetDriverDllRegistry> <SetRegEntry> <Number>0</Number> + <Key>DLGUARM</Key> + <Name> </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> </SetRegEntry> @@ -203,212 +207,212 @@ <Ww> <count>11</count> <WinNumber>1</WinNumber> - <ItemText>mUsart2ReceivePack</ItemText> + <ItemText>rec_ancdistlist</ItemText> </Ww> <Ww> <count>12</count> <WinNumber>1</WinNumber> - <ItemText>gps_power_state</ItemText> + <ItemText>poll_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>13</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist</ItemText> + <ItemText>resp_rx_ts_i64,0x0A</ItemText> </Ww> <Ww> <count>14</count> <WinNumber>1</WinNumber> - <ItemText>poll_tx_en_start_u32,0x0A</ItemText> + <ItemText>tof_f,0x0A</ItemText> </Ww> <Ww> <count>15</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_ts_i64,0x0A</ItemText> + <ItemText>distance_tag,0x0A</ItemText> </Ww> <Ww> <count>16</count> <WinNumber>1</WinNumber> - <ItemText>tof_f,0x0A</ItemText> + <ItemText>tround</ItemText> </Ww> <Ww> <count>17</count> <WinNumber>1</WinNumber> - <ItemText>distance_tag,0x0A</ItemText> + <ItemText>treply</ItemText> </Ww> <Ww> <count>18</count> <WinNumber>1</WinNumber> - <ItemText>tround</ItemText> + <ItemText>tround_temp,0x10</ItemText> </Ww> <Ww> <count>19</count> <WinNumber>1</WinNumber> - <ItemText>treply</ItemText> + <ItemText>treply_temp,0x10</ItemText> </Ww> <Ww> <count>20</count> <WinNumber>1</WinNumber> - <ItemText>tround_temp,0x10</ItemText> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>21</count> <WinNumber>1</WinNumber> - <ItemText>treply_temp,0x10</ItemText> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>22</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>resp_rx_timestamp</ItemText> </Ww> <Ww> <count>23</count> <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>poll_tx_timestamp</ItemText> </Ww> <Ww> <count>24</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_timestamp</ItemText> + <ItemText>resp_rx_ts_i64</ItemText> </Ww> <Ww> <count>25</count> <WinNumber>1</WinNumber> - <ItemText>poll_tx_timestamp</ItemText> + <ItemText>tt,0x0A</ItemText> </Ww> <Ww> <count>26</count> <WinNumber>1</WinNumber> - <ItemText>resp_rx_ts_i64</ItemText> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> </Ww> <Ww> <count>27</count> <WinNumber>1</WinNumber> - <ItemText>tt,0x0A</ItemText> + <ItemText>distance,0x0A</ItemText> </Ww> <Ww> <count>28</count> <WinNumber>1</WinNumber> - <ItemText>g_com_map,0x0A</ItemText> + <ItemText>dist_after_offset</ItemText> </Ww> <Ww> <count>29</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>tempflag</ItemText> </Ww> <Ww> <count>30</count> <WinNumber>1</WinNumber> - <ItemText>distance,0x0A</ItemText> + <ItemText>flag_temp2</ItemText> </Ww> <Ww> <count>31</count> <WinNumber>1</WinNumber> - <ItemText>dist_after_offset</ItemText> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> </Ww> <Ww> <count>32</count> <WinNumber>1</WinNumber> - <ItemText>tempflag</ItemText> + <ItemText>range_timeout_us,0x0A</ItemText> </Ww> <Ww> <count>33</count> <WinNumber>1</WinNumber> - <ItemText>flag_temp2</ItemText> + <ItemText>index1</ItemText> </Ww> <Ww> <count>34</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>index2</ItemText> </Ww> <Ww> <count>35</count> <WinNumber>1</WinNumber> - <ItemText>range_timeout_us,0x0A</ItemText> + <ItemText>index3</ItemText> </Ww> <Ww> <count>36</count> <WinNumber>1</WinNumber> - <ItemText>gps_need_data_flag</ItemText> + <ItemText>flag_4guart_needinit</ItemText> </Ww> <Ww> <count>37</count> <WinNumber>1</WinNumber> - <ItemText>delaysleep_count</ItemText> + <ItemText>tt2,0x0A</ItemText> </Ww> <Ww> <count>38</count> <WinNumber>1</WinNumber> - <ItemText>gps_wait_count,0x0A</ItemText> + <ItemText>resp_tx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>39</count> <WinNumber>1</WinNumber> - <ItemText>index1</ItemText> + <ItemText>temp_count1,0x0A</ItemText> </Ww> <Ww> <count>40</count> <WinNumber>1</WinNumber> - <ItemText>index2</ItemText> + <ItemText>rx_buf,0x10</ItemText> </Ww> <Ww> <count>41</count> <WinNumber>1</WinNumber> - <ItemText>index3</ItemText> + <ItemText>poll_rx_en_start_u32,0x0A</ItemText> </Ww> <Ww> <count>42</count> <WinNumber>1</WinNumber> - <ItemText>air780_power_state</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>43</count> <WinNumber>1</WinNumber> - <ItemText>gps_power_state</ItemText> + <ItemText>rec_ancdistlist[0],0x0A</ItemText> </Ww> <Ww> <count>44</count> <WinNumber>1</WinNumber> - <ItemText>flag_4guart_needinit</ItemText> + <ItemText>temp_recdist_before_offset,0x0A</ItemText> </Ww> <Ww> <count>45</count> <WinNumber>1</WinNumber> - <ItemText>gps_uwb_flag</ItemText> + <ItemText>dist</ItemText> </Ww> <Ww> <count>46</count> <WinNumber>1</WinNumber> - <ItemText>gps_4g_flag</ItemText> + <ItemText>anchordata_dist[0]</ItemText> </Ww> <Ww> <count>47</count> <WinNumber>1</WinNumber> - <ItemText>mUsart2ReceivePack</ItemText> + <ItemText>dist_temp,0x0A</ItemText> </Ww> <Ww> <count>48</count> <WinNumber>1</WinNumber> - <ItemText>tt2,0x0A</ItemText> + <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> </Ww> <Ww> <count>49</count> <WinNumber>1</WinNumber> - <ItemText>resp_tx_en_start_u32,0x0A</ItemText> + <ItemText>rx_buf[FZ_NEARBASENUM_INDEX]</ItemText> </Ww> <Ww> <count>50</count> <WinNumber>1</WinNumber> - <ItemText>temp_count1,0x0A</ItemText> + <ItemText>rec_nearbase_num</ItemText> </Ww> <Ww> <count>51</count> <WinNumber>1</WinNumber> - <ItemText>rx_buf,0x10</ItemText> + <ItemText>motor_open_air_flag</ItemText> </Ww> <Ww> <count>52</count> <WinNumber>1</WinNumber> - <ItemText>poll_rx_en_start_u32,0x0A</ItemText> + <ItemText>flag_temp2</ItemText> </Ww> <Ww> <count>53</count> @@ -418,247 +422,32 @@ <Ww> <count>54</count> <WinNumber>1</WinNumber> - <ItemText>rec_ancdistlist[0],0x0A</ItemText> + <ItemText>deep_sleep_flag</ItemText> </Ww> <Ww> <count>55</count> <WinNumber>1</WinNumber> - <ItemText>temp_recdist_before_offset,0x0A</ItemText> + <ItemText>data</ItemText> </Ww> <Ww> <count>56</count> <WinNumber>1</WinNumber> - <ItemText>dist</ItemText> + <ItemText>Voltage_input,0x0A</ItemText> </Ww> <Ww> <count>57</count> <WinNumber>1</WinNumber> - <ItemText>anchordata_dist[0]</ItemText> + <ItemText>fVoltage_mv,0x0A</ItemText> </Ww> <Ww> <count>58</count> <WinNumber>1</WinNumber> - <ItemText>dist_temp,0x0A</ItemText> + <ItemText>g_com_map[27],0x0A</ItemText> </Ww> <Ww> <count>59</count> <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\../keil/uwb_app.c\distance,0x0A</ItemText> - </Ww> - <Ww> - <count>60</count> - <WinNumber>1</WinNumber> - <ItemText>rx_buf[FZ_NEARBASENUM_INDEX]</ItemText> - </Ww> - <Ww> - <count>61</count> - <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> - </Ww> - <Ww> - <count>62</count> - <WinNumber>1</WinNumber> - <ItemText>test4</ItemText> - </Ww> - <Ww> - <count>63</count> - <WinNumber>1</WinNumber> - <ItemText>moter_open_uwb_flag</ItemText> - </Ww> - <Ww> - <count>64</count> - <WinNumber>1</WinNumber> - <ItemText>motor_open_air_flag</ItemText> - </Ww> - <Ww> - <count>65</count> - <WinNumber>1</WinNumber> - <ItemText>motor_power_state</ItemText> - </Ww> - <Ww> - <count>66</count> - <WinNumber>1</WinNumber> - <ItemText>gps_power_state</ItemText> - </Ww> - <Ww> - <count>67</count> - <WinNumber>1</WinNumber> - <ItemText>gps_uwb_flag</ItemText> - </Ww> - <Ww> - <count>68</count> - <WinNumber>1</WinNumber> - <ItemText>gps_4g_flag</ItemText> - </Ww> - <Ww> - <count>69</count> - <WinNumber>1</WinNumber> - <ItemText>gps_need_data_flag</ItemText> - </Ww> - <Ww> - <count>70</count> - <WinNumber>1</WinNumber> - <ItemText>mUsart2ReceivePack</ItemText> - </Ww> - <Ww> - <count>71</count> - <WinNumber>1</WinNumber> - <ItemText>gps_timeout_flag</ItemText> - </Ww> - <Ww> - <count>72</count> - <WinNumber>1</WinNumber> - <ItemText>flag_temp2</ItemText> - </Ww> - <Ww> - <count>73</count> - <WinNumber>1</WinNumber> - <ItemText>rec_nearbase_num</ItemText> - </Ww> - <Ww> - <count>74</count> - <WinNumber>1</WinNumber> - <ItemText>air780_success_state</ItemText> - </Ww> - <Ww> - <count>75</count> - <WinNumber>1</WinNumber> - <ItemText>UWB_work_state</ItemText> - </Ww> - <Ww> - <count>76</count> - <WinNumber>1</WinNumber> - <ItemText>flag_secondtask</ItemText> - </Ww> - <Ww> - <count>77</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[14],0x0A</ItemText> - </Ww> - <Ww> - <count>78</count> - <WinNumber>1</WinNumber> - <ItemText>pos_state</ItemText> - </Ww> - <Ww> - <count>79</count> - <WinNumber>1</WinNumber> - <ItemText>userkey_state</ItemText> - </Ww> - <Ww> - <count>80</count> - <WinNumber>1</WinNumber> - <ItemText>test4</ItemText> - </Ww> - <Ww> - <count>81</count> - <WinNumber>1</WinNumber> - <ItemText>keystarttime,0x0A</ItemText> - </Ww> - <Ww> - <count>82</count> - <WinNumber>1</WinNumber> - <ItemText>keystarttime2,0x0A</ItemText> - </Ww> - <Ww> - <count>83</count> - <WinNumber>1</WinNumber> - <ItemText>gps_open_flag</ItemText> - </Ww> - <Ww> - <count>84</count> - <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\include/src/gps.c\gps_power_state</ItemText> - </Ww> - <Ww> - <count>85</count> - <WinNumber>1</WinNumber> - <ItemText>\\uwb_simple_example\include/src/gps.c\gps_need_data_flag</ItemText> - </Ww> - <Ww> - <count>86</count> - <WinNumber>1</WinNumber> - <ItemText>GPS_GGAmessage</ItemText> - </Ww> - <Ww> - <count>87</count> - <WinNumber>1</WinNumber> - <ItemText>gps_wait_count,0x0A</ItemText> - </Ww> - <Ww> - <count>88</count> - <WinNumber>1</WinNumber> - <ItemText>nomove_count</ItemText> - </Ww> - <Ww> - <count>89</count> - <WinNumber>1</WinNumber> - <ItemText>bat_percent,0x0A</ItemText> - </Ww> - <Ww> - <count>90</count> - <WinNumber>1</WinNumber> - <ItemText>fVoltage_mv,0x0A</ItemText> - </Ww> - <Ww> - <count>91</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map,0x0A</ItemText> - </Ww> - <Ww> - <count>92</count> - <WinNumber>1</WinNumber> - <ItemText>deep_sleep_flag</ItemText> - </Ww> - <Ww> - <count>93</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[29],0x0A</ItemText> - </Ww> - <Ww> - <count>94</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[27],0x0A</ItemText> - </Ww> - <Ww> - <count>95</count> - <WinNumber>1</WinNumber> - <ItemText>Voltage_input,0x0A</ItemText> - </Ww> - <Ww> - <count>96</count> - <WinNumber>1</WinNumber> - <ItemText>g_com_map[31]</ItemText> - </Ww> - <Ww> - <count>97</count> - <WinNumber>1</WinNumber> - <ItemText>power_low_flag</ItemText> - </Ww> - <Ww> - <count>98</count> - <WinNumber>1</WinNumber> - <ItemText>enbale_blink_flag</ItemText> - </Ww> - <Ww> - <count>99</count> - <WinNumber>1</WinNumber> - <ItemText>data</ItemText> - </Ww> - <Ww> - <count>100</count> - <WinNumber>1</WinNumber> - <ItemText>data_temp,0x0A</ItemText> - </Ww> - <Ww> - <count>101</count> - <WinNumber>1</WinNumber> - <ItemText>temp_bit</ItemText> - </Ww> - <Ww> - <count>102</count> - <WinNumber>1</WinNumber> - <ItemText>gps_success_state</ItemText> + <ItemText>g_com_map[28]</ItemText> </Ww> </WatchWindow1> <MemoryWindow1> @@ -1156,7 +945,7 @@ <GroupNumber>4</GroupNumber> <FileNumber>35</FileNumber> <FileType>1</FileType> - <tvExp>0</tvExp> + <tvExp>1</tvExp> <tvExpOptDlg>0</tvExpOptDlg> <bDave2>0</bDave2> <PathWithFileName>.\include\drivers\global_param.c</PathWithFileName> -- Gitblit v1.9.3